fix: make some more text localizable

Change-Id: I79cadbf4df2027a76e1c6174fdf41c467768b5a2

diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index 259ff4f39de32913251ad93a743707ab77fa88b2..26ce9206e4c3c73e4d7fed2fe7d569726c5f5bd1 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -23,12 +23,12 @@
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-nav" aria-expanded="false">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-nav" aria-expanded="false">

-        <span class="sr-only">Toggle navigation</span>
+        <span class="sr-only"><?=_Toggle navigation?></span>

         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>

-      <a class="navbar-brand" href="/">SomeCA Frontend</a>
+      <a class="navbar-brand" href="/"><?=_SomeCA Frontend?></a>

     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
index 7e36c29eac3c9069e844490b64690d93f87e08f4..89ba9e0bd848eab44725c45c680da15d602f35f9 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
@@ -7,7 +7,7 @@
   <tr>
     <td></td>
     <td class='radio'>
   <tr>
     <td></td>
     <td class='radio'>

-        Select the destination mail address:<br/>
+        <?=_Select the destination mail address:?><br/>

         <? foreach($authEmails) { ?>
         <input type="radio" id="email_<?=$i?>" name="email" value="<?=$i?>"<?=$!checked?>/>
         <label for="email_<?=$i?>"><span class='name'><?=$email?>@<span class='exampleDomain'>example.org</span></span></label><div class='elements'></div>
         <? foreach($authEmails) { ?>
         <input type="radio" id="email_<?=$i?>" name="email" value="<?=$i?>"<?=$!checked?>/>
         <label for="email_<?=$i?>"><span class='name'><?=$email?>@<span class='exampleDomain'>example.org</span></span></label><div class='elements'></div>


@@ -22,7 +22,7 @@
   <tr>
     <td></td>
     <td>
   <tr>
     <td></td>
     <td>

-        Please insert the following DNS TXT entry into the Zone-file of your domain:<br/>
+        <?=_Please insert the following DNS TXT entry into the Zone-file of your domain:?><br/>

         <pre>
         <?=$tokenName?>._cacert._auth IN TXT <?=$tokenValue?>
         </pre>
         <pre>
         <?=$tokenName?>._cacert._auth IN TXT <?=$tokenValue?>
         </pre>

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index c082a1be509743ab9b09963a0c2104a0966d0b69..4e00bbd367d3747aa69b7a0ec4508c88fa394d83 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -78,9 +78,9 @@ public class MailManagementForm extends Form {
                     vars.put("default", "");
                 }
                 if (emailAddress.isVerified()) {
                     vars.put("default", "");
                 }
                 if (emailAddress.isVerified()) {

-                    vars.put("verification", "Verified");
+                    vars.put("verification", l.getTranslation("Verified"));

                 } else {
                 } else {

-                    vars.put("verification", "Unverified");
+                    vars.put("verification", l.getTranslation("Unverified"));

                 }
                 if (target.getEmail().equals(emailAddress.getAddress())) {
                     vars.put("delete", "N/A");
                 }
                 if (target.getEmail().equals(emailAddress.getAddress())) {
                     vars.put("delete", "N/A");