Fix i18n

following.html

@@ -117,13 +117,13 @@
           <!-- THEME NIN added user menu (mentions, messages and edit profile) -->
           <ul class="mini-profile-indicators selectable_theme theme_nin">
             <li class="userMenu-connections">
-              <a href="#" title="Mentions"><span class="messages-qtd" style="display:none;">0</span>Mentions</a>
+              <a href="#" title="Mentions"><span class="messages-qtd" style="display:none;">0</span><span>Mentions</span></a>
             </li>
             <li class="userMenu-messages">
-              <a href="#" title="Direct Messages"><span class="messages-qtd" style="display:none;">0</span>Messages</a>
+              <a href="#" title="Direct Messages"><span class="messages-qtd" style="display:none;">0</span><span>Messages</span></a>
             </li>
             <li class="userMenu-user">
-              <a href="profile-edit.html" title="Edit profile">Edit profile</a>
+              <a href="profile-edit.html" title="Edit profile"><span>Edit profile</span></a>
             </li>
           </ul>
 

home.html

@@ -118,13 +118,13 @@
           <!-- THEME NIN added sub-menu (mentions, messages and edit profile) -->
           <ul class="mini-profile-indicators selectable_theme theme_nin">
             <li class="userMenu-connections">
-              <a href="#" title="Mentions"><span class="messages-qtd" style="display:none;">0</span>Mentions</a>
+              <a href="#" title="Mentions"><span class="messages-qtd" style="display:none;">0</span><span>Mentions</span></a>
             </li>
             <li class="userMenu-messages">
-              <a href="#" title="Direct Messages"><span class="messages-qtd" style="display:none;">0</span>Messages</a>
+              <a href="#" title="Direct Messages"><span class="messages-qtd" style="display:none;">0</span><span>Messages</span></a>
             </li>
             <li class="userMenu-user">
-              <a href="profile-edit.html" title="Edit profile">Edit profile</a>
+              <a href="profile-edit.html" title="Edit profile"><span>Edit profile</span></a>
             </li>
           </ul>
           <!--/sub-menu -->
@@ -166,7 +166,7 @@
 
       <!-- WHO TO FOLLOW MODULE INIT -->
       <div class="module toptrends">
-        <h3>Top Trends</h3>
+        <h3><span>Top Trends</span></h3>
         <ol class="toptrends-list">
           <!-- use "follow-suggestion-template" here -->
         </ol>
@@ -185,8 +185,8 @@
       </h2>
       <!-- Tabs to switch between promoted post and normal posts-->
       <ul class="promoted-posts-only promoted selectable_theme theme_nin">
-        <li class="normal-posts active">Normal posts</li>
-        <li class="promoted-posts disabled">Promoted posts</li>
+        <li class="normal-posts active"><span>Normal posts</span></li>
+        <li class="promoted-posts disabled"><span>Promoted posts</span></li>
       </ul>
       <!-- Post area on top of postboard --> 
       <div id="postboard-top" class=" selectable_theme theme_nin">

js/interface_common.js

@@ -125,6 +125,9 @@ function openProfileModal(e)
             unfollow(username);
         });
     };
+    
+    $(".tox-ctc").attr("title", polyglot.t("Copy to clipboard"));
+    $(".bitmessage-ctc").attr("title", polyglot.t("Copy to clipboard"));
 }
 
 function newHashtagModal(hashtag) {
@@ -1111,7 +1114,7 @@ function convert2Unicodes(s, ta) {
 
     if (unicodeConversionStack.length > 0){
         var ub = ta.closest(".post-area-new").find(".undo-unicode");
-        ub.text("undo: " + unicodeConversionStack[0].u);
+        ub.text(polyglot.t("undo") + ": " + unicodeConversionStack[0].u);
         $.MAL.enableButton(ub);
     } else {
         $.MAL.disableButton(ta.closest(".post-area-new").find(".undo-unicode"));
@@ -1144,7 +1147,7 @@ function undoLastUnicode(e) {
     }
 
     if (unicodeConversionStack.length > 0)
-        $(this).text("undo: " + unicodeConversionStack[0].u);
+        $(this).text(polyglot.t("undo") + ": " + unicodeConversionStack[0].u);
     else
         $.MAL.disableButton($(this));
 

js/interface_localization.js

@@ -226,11 +226,31 @@ if(preferredLanguage == "en"){
       "follows you": "follows you",
       "Show conversation": "Show conversation",
       "Mark all as read": "Mark all as read",
-      "show_more_count": "%{count} more...",
+      "show_more_count": "%{smart_count} more...",
       "hide": "hide",
       "Show more in this conversation...": "Show more in this conversation...",
       "conversation_title": "Conversation of @%{username}",
-      "copy_to_clipboard": "Press Ctrl/Cmd+C to copy then Enter to close"
+      "copy_to_clipboard": "Press Ctrl/Cmd+C to copy then Enter to close",
+      "Normal posts": "Normal posts",
+      "Promoted posts": "Promoted posts",
+      "Messages": "Messages",
+      "Edit profile": "Edit profile",
+      "Top Trends": "Top Trends",
+      "twisted again by": "twisted again by",
+      "undo": "undo",
+      "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
+      "Daemon exited...": "Daemon exited...",
+      "Secret Key": "Secret Key",
+      "Copy to clipboard": "Copy to clipboard",
+      "Full name here": "Full name here",
+      "Describe yourself": "Describe yourself",
+      "Location": "Location",
+      "website": "website",
+      "Tox address": "Tox address",
+      "Bitmessage address": "Bitmessage address",
+      "Language": "Language",
+      "Sound": "Sound",
+      "Users": "Users",
     };
 }
 if(preferredLanguage == "es"){
@@ -1875,7 +1895,7 @@ if(preferredLanguage == "tr"){
       "follows you": "seni takip ediyor",
       "Show conversation": "Sohbeti göster",
       "Mark all as read": "hepsini okundu olarak işaretle",
-      "show_more_count": "%{count} tane daha...",
+      "show_more_count": "%{smart_count} tane daha...",
       "hide": "gizle",
       "Show more in this conversation...": "Sohbetin tamamını göster...",
       "conversation_title": "@%{username} kullanıcısının bir sohbeti",

js/interface_profile-edit.js

@@ -103,18 +103,22 @@ function verifyUserAlreadyInBlockchain()
                         });
                     } else {
                         if( !newUserWarnDisplayed ) {
-                            alert("Other peers have not yet accepted this new user.\n" +
-                                  "Unfortunately it is not possible to save profile\n" +
-                                  "or send any posts in this state.\n\n" +
-                                  "Please wait a few minutes to continue.\n\n" +
-                                  "The 'Save Changes' will be automatically enabled\n" +
-                                  "when the process completes. (I promise this is\n"+
-                                  "the last time you will have to wait before using\n" +
-                                  "twister).\n\n" +
-                                  "Tip: choose your avatar in the meantime!");
+                            alert(polyglot.t("user_not_yet_accepted"));
                             newUserWarnDisplayed = true;
                         }
                         setTimeout("verifyUserAlreadyInBlockchain()", 5000);
                     }
                 }, {} );
 }
+
+function localizePlaceholders()
+{
+    $(".input-name").attr("placeholder",polyglot.t("Full name here"));
+    $(".input-description").attr("placeholder",polyglot.t("Describe yourself"));
+    $(".input-city").attr("placeholder",polyglot.t("Location"));
+    $(".input-website").attr("placeholder",polyglot.t("website"));
+    $(".input-tox").attr("placeholder",polyglot.t("Tox address"));
+    $(".input-bitmessage").attr("placeholder",polyglot.t("Bitmessage address"));
+}
+
+$(document).ready(localizePlaceholders);

js/mobile_abstract.js

@@ -98,7 +98,7 @@ var MAL = function()
             var newTweetsBarMenu = $(".userMenu").find(".menu-news"); // added for home menu entry
             if( newPosts ) {
                 document.title = "(" + String(newPosts) + ") twister";
-                newTweetsBar.text(String(newPosts) + " new posts");
+                newTweetsBar.text(polyglot.t("new_posts", newPosts));
                 newTweetsBar.fadeIn("slow");
                 newTweetsBarMenu.text(String(newPosts));
                 newTweetsBarMenu.addClass("show");

js/options.js

@@ -105,6 +105,7 @@ var TwisterOptions = function()
         $('#language').val($.Options.getOption('locLang','auto'))
         $('#language').on('change', function(){
             $.Options.setOption('locLang', $(this).val());
+            location.reload();
         })
     }
     
@@ -347,3 +348,14 @@ var TwisterOptions = function()
 
 jQuery.Options = new TwisterOptions;
 
+function localizeLabels()
+{
+    $("label[for=tab_language]").text(polyglot.t("Language"));
+    $("label[for=t-2]").text(polyglot.t("Theme"));
+    $("label[for=t-3]").text(polyglot.t("Sound"));
+    $("label[for=t-4]").text(polyglot.t("Keys"));
+    $("label[for=t-5]").text(polyglot.t("Postboard"));
+    $("label[for=t-6]").text(polyglot.t("Users"));
+}
+
+$(document).ready(localizeLabels);

js/twister_following.js

@@ -477,7 +477,7 @@ function getWhoFollows(username, item) {
     fillWhoFollows(list, item, 0, (list.length > 5 ? 5 : list.length));
 
     if (list.length > 5) {
-        var more_link = $('<a class="show-more-followers">' + polyglot.t('show_more_count', {'count': list.length - 5}) + '</a>');
+        var more_link = $('<a class="show-more-followers">' + polyglot.t('show_more_count', {'smart_count': list.length - 5}) + '</a>');
         more_link.on('click', function() {
             fillWhoFollows(list, item, 5, list.length - 5);
 

js/twister_network.js

@@ -222,7 +222,7 @@ function setSpamMsg() {
 }
 
 function exitDaemon() {
-  if (confirm('Are you sure you want to exit the daemon?\nThe Twister client will stop working.')) {
+  if (confirm(polyglot.t("Are you sure you want to exit the daemon?\nThe Twister client will stop working."))) {
     $( ".terminate-daemon").text("Exiting...");
     $( ".terminate-daemon").addClass("disabled");
     $.MAL.disableButton( $( ".terminate-daemon") );

login.html

@@ -55,7 +55,7 @@
       <h2> twister login </h2>
 
       <div class="module">
-        <p> Existing local users </p>
+        <p> <span>Existing local users</span> </p>
         <div>
             <select class="local-usernames login-user">
             </select>
@@ -66,7 +66,7 @@
      <!--  <span> Or... </span> -->
 
       <div class="module">
-        <p> Create a new user </p>
+        <p> <span>Create a new user</span> </p>
         <div>
             <input class="new-username" type="textbox" placeholder="Type nickname here" cols="16" rows="1"></input>
             <button class="check-availability">Check availability</button>
@@ -81,11 +81,11 @@
 
       <div class="module">
         <div>
-            <p> Import secret key </p>
+            <p> <span>Import secret key</span> </p>
             <input class="secret-key-import" type="textbox" placeholder="52-characters secret" size="52" rows="1"></input>
         </div>
         <div>
-            <p class="with-nickname"> With nickname </p>
+            <p class="with-nickname"> <span>With nickname</span> </p>
             <input class="username-import" type="textbox" placeholder="Type nickname here" size="16" rows="1"></input>
         </div>
         <div>

options.html

@@ -185,7 +185,7 @@
             <p class="label"> Posts display </p>
             <div>
               <form action="" id="lineFeedsOpt">
-                <p>Line feeds</p>
+                <p class="label">Line feeds</p>
                 <select name="" id="displayLineFeeds">
                   <option value="disable">Ignore</option>
                   <option value="enable">Display</option>