From 203dcbbd0e8d7c8734925fade71f21d9ddc25232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=A4ngel?= <m.maengel@inopiae.de>
Date: Sun, 28 Oct 2012 12:55:42 +0100
Subject: bug 1080: Fix link for 2 letter ISO country code list

Signed-off-by: Benny Baumann <BenBE@cacert.org>
---
 pages/account/24.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pages/account')

diff --git a/pages/account/24.php b/pages/account/24.php
index 7f56023..71dcd52 100644
--- a/pages/account/24.php
+++ b/pages/account/24.php
@@ -48,7 +48,7 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Country")?>:</td>
-    <td class="DataTD"><input type="text" name="C" value="" size="5">(2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td>
+    <td class="DataTD"><input type="text" name="C" value="" size="5">(2 letter <a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">ISO code</a>)</td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-- 
cgit v1.2.1


From 50dd7f9b8bcf4e2da1b365e194bc74295ce4c359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Tue, 30 Oct 2012 22:25:12 +0100
Subject: bug 1080: allow translations of the explanation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/24.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pages/account')

diff --git a/pages/account/24.php b/pages/account/24.php
index 71dcd52..27583ab 100644
--- a/pages/account/24.php
+++ b/pages/account/24.php
@@ -48,7 +48,11 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Country")?>:</td>
-    <td class="DataTD"><input type="text" name="C" value="" size="5">(2 letter <a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">ISO code</a>)</td>
+    <td class="DataTD"><input type="text" name="C" value="" size="5">
+        <?php printf("(2 letter %s ISO code %s )",
+            "<a href='http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm'>",
+            "</a>")?>
+    </td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-- 
cgit v1.2.1


From 9e2d28ad1d563f805faa3e303aab9b2581514402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Tue, 30 Oct 2012 23:01:56 +0100
Subject: bug 1080: doh, actually send the string through gettext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/24.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pages/account')

diff --git a/pages/account/24.php b/pages/account/24.php
index 27583ab..14a47c0 100644
--- a/pages/account/24.php
+++ b/pages/account/24.php
@@ -49,9 +49,9 @@
   <tr>
     <td class="DataTD"><?=_("Country")?>:</td>
     <td class="DataTD"><input type="text" name="C" value="" size="5">
-        <?php printf("(2 letter %s ISO code %s )",
-            "<a href='http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm'>",
-            "</a>")?>
+        <?php printf(_('(2 letter %s ISO code %s )'),
+            '<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">',
+            '</a>')?>
     </td>
   </tr>
   <tr>
-- 
cgit v1.2.1


From 304b385fb87e0b4b9be33c95f487f5680b708d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 31 Oct 2012 01:05:39 +0100
Subject: bug 1080: Port changes to "Edit Org" page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 pages/account/27.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pages/account')

diff --git a/pages/account/27.php b/pages/account/27.php
index 9524620..a1086d4 100644
--- a/pages/account/27.php
+++ b/pages/account/27.php
@@ -41,7 +41,11 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Country")?>:</td>
-    <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>" size="5"> (2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td>
+    <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>" size="5">
+        <?php printf(_('(2 letter %s ISO code %s )'),
+            '<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">',
+            '</a>')?>
+    </td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-- 
cgit v1.2.1