Merge pull request #741 from TimRudy/PR740-1

PR741 Finish translation code changes, make fixes, add tooltips
FPGAwars · May 17, 2024 · e1cbb4c · e1cbb4c
2 parents 27f3930 + 7c041d2
commit e1cbb4c
Show file tree

Hide file tree

Showing 24 changed files with 2,137 additions and 1,955 deletions.
diff --git a/app/resources/locale/ca_ES/ca_ES.po b/app/resources/locale/ca_ES/ca_ES.po
diff --git a/app/resources/locale/cs_CZ/cs_CZ.po b/app/resources/locale/cs_CZ/cs_CZ.po
diff --git a/app/resources/locale/de_DE/de_DE.po b/app/resources/locale/de_DE/de_DE.po
diff --git a/app/resources/locale/el_GR/el_GR.po b/app/resources/locale/el_GR/el_GR.po
diff --git a/app/resources/locale/en/en.po b/app/resources/locale/en/en.po
diff --git a/app/resources/locale/es_ES/es_ES.po b/app/resources/locale/es_ES/es_ES.po
diff --git a/app/resources/locale/eu_ES/eu_ES.po b/app/resources/locale/eu_ES/eu_ES.po
diff --git a/app/resources/locale/fr_FR/fr_FR.po b/app/resources/locale/fr_FR/fr_FR.po
diff --git a/app/resources/locale/gl_ES/gl_ES.po b/app/resources/locale/gl_ES/gl_ES.po
diff --git a/app/resources/locale/it_IT/it_IT.po b/app/resources/locale/it_IT/it_IT.po
diff --git a/app/resources/locale/ja_JP/ja_JP.po b/app/resources/locale/ja_JP/ja_JP.po
diff --git a/app/resources/locale/ko_KR/ko_KR.po b/app/resources/locale/ko_KR/ko_KR.po
diff --git a/app/resources/locale/nl_NL/nl_NL.po b/app/resources/locale/nl_NL/nl_NL.po
diff --git a/app/resources/locale/ru_RU/ru_RU.po b/app/resources/locale/ru_RU/ru_RU.po
diff --git a/app/resources/locale/template.pot b/app/resources/locale/template.pot
diff --git a/app/resources/locale/tr_TR/tr_TR.po b/app/resources/locale/tr_TR/tr_TR.po
diff --git a/app/resources/locale/zh_CN/zh_CN.po b/app/resources/locale/zh_CN/zh_CN.po
diff --git a/app/resources/locale/zh_TW/zh_TW.po b/app/resources/locale/zh_TW/zh_TW.po
diff --git a/app/resources/viewers/system/system.html b/app/resources/viewers/system/system.html
@@ -5,14 +5,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="css/style.css">
-    <script src="js/system.js" defer></script>  
+    <script src="js/system.js" defer></script>
 </head>
 <body>
     <h3>Icestudio version: <span id="disp_version"></span></h3>
     <h3>Computer:</h3>
     <ul>
-        <li>Architecture:  <span id="disp_arch"></span> </li>   
-        <li>Platform: <span id="disp_platform"></span></li>  
+        <li>Architecture: <span id="disp_arch"></span> </li>
+        <li>Platform: <span id="disp_platform"></span></li>
     </ul>
 
     <h3>PATHs:</h3>

diff --git a/app/scripts/services/forms.js b/app/scripts/services/forms.js
@@ -986,7 +986,7 @@ angular.module('icestudio')
         constructor(name = '', virtual = false, clock = false, disabled = false, inoutValue = undefined) {
 
           //-- Create a blank BasicPortForm (calling the upper Class)
-          super(gettextCatalog.getString('Input port name:'),
+          super(gettextCatalog.getString('Input port name'),
             name,
             virtual,
             disabled);
@@ -1010,7 +1010,7 @@ angular.module('icestudio')
           //-- Field 3: Checkbox for configuring the pin as inout
           if (inoutValue !== undefined) {
             let field3 = new CheckboxField(
-              gettextCatalog.getString('InOut pin'),
+              gettextCatalog.getString('\"Inout\" pin'),
               inoutValue,  //-- Default value
               3            //-- Field id
             );
@@ -1145,7 +1145,7 @@ angular.module('icestudio')
           //-- Field 2: Checkbox for configuring the pin as inout
           if (inoutValue !== undefined) {
             let field2 = new CheckboxField(
-              gettextCatalog.getString('InOut pin'),
+              gettextCatalog.getString('\"Inout\" pin'),
               inoutValue,  //-- Default value
               2            //-- Field id
             );
@@ -1642,7 +1642,7 @@ angular.module('icestudio')
           //-- Field 3: InputOutput port names at the left
           if (portsInOutLeft !== undefined) {
             field3 = new TextField(
-              gettextCatalog.getString('InOut Left ports'), //-- Top message
+              gettextCatalog.getString('\"Inout\" Left ports'), //-- Top message
               portsInOutLeft,   //-- Default InputOutput port names at the left
               3                 //-- Field id
             );
@@ -1654,7 +1654,7 @@ angular.module('icestudio')
           //-- Field 4: InputOutput port names at the right
           if (portsInOutRight !== undefined) {
             field4 = new TextField(
-              gettextCatalog.getString('InOut Right ports'), //-- Top message
+              gettextCatalog.getString('\"Inout\" Right ports'), //-- Top message
               portsInOutRight,  //-- Default InputOutput port names at the right
               4                 //-- Field id
             );
@@ -1814,7 +1814,9 @@ angular.module('icestudio')
                 //-- Show an error and return
                 evt.cancel = true;
                 this.resultAlert = alertify.warning(
-                  gettextCatalog.getString('Duplicate port name:') + ' ' + portInfo.name
+                  gettextCatalog.getString('Duplicate port name: {{name}}', {
+                    name: portInfo.name,
+                  })
                 );
                 return;
               }

diff --git a/app/scripts/services/tools.js b/app/scripts/services/tools.js
@@ -168,7 +168,7 @@ angular
                 } else {
 
                   alertify.error(
-                    gettextCatalog.getString("Bitstream not found: build your project first"),
+                    gettextCatalog.getString("Bitstream not found: Build your project first"),
                     30
                   );
                   utils.endBlockingTask();
@@ -1387,7 +1387,7 @@ angular
         const content = [
           '<div>',
           '  <p id="progress-message">' +
-          gettextCatalog.getString("Installing") + ' ' + utils.printApioVersion(version) +
+          gettextCatalog.getString("Installing {{version}}", { version: utils.printApioVersion(version) }) +
           '  </p>',
           '  <br>',
           '  <div class="progress">',
@@ -1578,7 +1578,9 @@ angular
           pkgName += ("@" + common.APIO_PKG_OSS_CAD_SUITE_VERSION);
         }
 
-        updateProgress(gettextCatalog.getString("Apio install") + " " + pkgName, 60);
+        updateProgress(gettextCatalog.getString("Apio install {{name}}", {
+          name: pkgName
+        }), 60);
         utils.apioInstall(pkgName, callback);
       }
 

diff --git a/app/scripts/services/utils.js b/app/scripts/services/utils.js
@@ -460,7 +460,9 @@ angular.module('icestudio')
 
         if (!this.toolchainDisabled) {
           // Show message only on start
-          alertify.message(gettextCatalog.getString('Using external Apio:') + ' ' + candidateApio, 5);
+          alertify.message(gettextCatalog.getString('Using external Apio: {{name}}', {
+            name: candidateApio
+          }), 5);
         }
         this.toolchainDisabled = true;
         return coverPath(candidateApio);

diff --git a/app/views/design.html b/app/views/design.html
@@ -51,10 +51,10 @@
     <div class="lFinder-advanced--toggle"></div>
 
     <!-- Case sensitive option on/off -->
-    <div class="lFinder-case--option"></div>
+    <div class="lFinder-case--option" title="{{'Case sensitive' | translate}}"></div>
 
     <!-- Exact match option on/off -->
-    <div class="lFinder-exact--option"></div>
+    <div class="lFinder-exact--option" title="{{'Exact match' | translate}}"></div>
 
     <!-- Input text field -->
     <input type="text" class="lFinder-field">
@@ -77,7 +77,7 @@
     <div class="lFinder-advanced">
 
       <!-- New name text entry -->
-      <span class="lFinder-name" translate>New Name</span>
+      <span class="lFinder-name" translate>New Name:</span>
       <input class="lFinder-name--field"></input>
 
       <!-- Replace one button -->
@@ -270,9 +270,11 @@
   <!-- Basic Toolbox Pop up                                               -->
   <!------------------------------------------------------------------------>
   <div id="iceToolbox">
-    <ul  class="dropdown-menu">
-    <div class="title-bar">Basic Toolbox</div>
-    <div class="closeToolbox-button"></div>
+    <ul class="dropdown-menu">
+      <div class="title-bar">
+        {{'Basic Toolbox' | translate}}
+      </div>
+      <div class="closeToolbox-button"></div>
       <li>
         <a href="" class="iceToolbox--item js-shortcut--action" data-item="input">
           <div class="marker marker-blue"></div>

diff --git a/app/views/menu.html b/app/views/menu.html
@@ -325,7 +325,7 @@
               <!-- Label-Finder -->
               <li>
                 <a href ng-click="showLabelFinder()">
-                  {{ 'Label Finder' | translate }}
+                  {{ 'Label finder' | translate }}
                   <span class="shortcut">
                     {{ 'showLabelFinder' | shortcut }}
                   </span>
@@ -474,7 +474,7 @@
               <!-- View/System Info -->
               <li>
                 <a href ng-click="showSystemInfo()">
-                   {{ 'System Info' | translate }}</a>
+                   {{ 'System info' | translate }}</a>
               </li>
 
               <!-- Divisor line between sections of the menu -->