Merge pull request #1213 from Hirobreak/settings-lokalise

supporting languages with lokalize

Author: Erika Perugachi

electron_app/src/lang/index.js

@@ -1,5 +1,8 @@
 const en = require('./en.json');
 const es = require('./es.json');
+const de = require('./de.json');
+const fr = require('./fr.json');
+const ru = require('./ru.json');
 const mySettings = require('./../Settings');
 
 const languageSettings = {
@@ -16,6 +19,18 @@ const languageSettings = {
         this.currentLanguage = 'es';
         this.strings = es;
         return;
+      case 'de':
+        this.currentLanguage = 'de';
+        this.strings = de;
+        return;
+      case 'fr':
+        this.currentLanguage = 'fr';
+        this.strings = fr;
+        return;
+      case 'ru':
+        this.currentLanguage = 'ru';
+        this.strings = ru;
+        return;
       default:
         this.currentLanguage = 'en';
         this.strings = en;

email_composer/src/app.scss

@@ -177,14 +177,14 @@ TABLE OF CONTENTS
 
 @font-face {
   font-family: "Roboto";
-  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Thin.ttf) format("truetype");
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Regular.ttf) format("truetype");
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: "Roboto";
-  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-ThinItalic.ttf) format("truetype");
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Italic.ttf) format("truetype");
   font-weight: normal;
   font-style: italic;
 }

email_composer/src/lang/index.js

@@ -2,10 +2,16 @@ import LocalizedStrings from 'react-localization';
 import { mySettings } from '../utils/electronInterface';
 import en from './en.json';
 import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
 
 const string = new LocalizedStrings({
   en,
-  es
+  es,
+  de,
+  fr,
+  ru
 });
 
 string.setLanguage(mySettings.language);

email_loading/src/lang/index.js

@@ -2,10 +2,16 @@ import LocalizedStrings from 'react-localization';
 import { mySettings } from '../utils/electronInterface';
 import en from './en.json';
 import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
 
 const string = new LocalizedStrings({
   en,
-  es
+  es,
+  de,
+  fr,
+  ru
 });
 
 string.setLanguage(mySettings.language);

email_login/src/lang/index.js

@@ -2,10 +2,16 @@ import LocalizedStrings from 'react-localization';
 import { mySettings } from '../utils/electronInterface.js';
 import en from './en.json';
 import es from './es.json';
+import de from './de.json';
+import fr from './fr.json';
+import ru from './ru.json';
 
 const string = new LocalizedStrings({
   en,
-  es
+  es,
+  de,
+  fr,
+  ru
 });
 
 string.setLanguage(mySettings.language);

email_mailbox/src/app.scss

@@ -181,14 +181,14 @@ TABLE OF CONTENTS
 
 @font-face {
   font-family: "Roboto";
-  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Thin.ttf) format("truetype");
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Regular.ttf) format("truetype");
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: "Roboto";
-  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-ThinItalic.ttf) format("truetype");
+  src:url(#{$_PATH_TO_FONTS}/roboto/Roboto-Italic.ttf) format("truetype");
   font-weight: normal;
   font-style: italic;
 }

email_mailbox/src/components/ActivityPanel.js

@@ -108,8 +108,8 @@ class ActivityPanel extends Component {
       <div className="empty-container empty-activity-container">
         <div className="empty-content">
           <div className="empty-icon" />
-          <div className="header-text">There&#39;s nothing new yet</div>
-          <div className="subheader-text">Enjoy your day</div>
+          <div className="header-text">{string.activity.empty_title}</div>
+          <div className="subheader-text">{string.activity.empty_message}</div>
         </div>
       </div>
     );

email_mailbox/src/components/labeladd.scss

@@ -1,6 +1,7 @@
 li{
   &.nav-item-label-add{
     color: #0091ff;
+    white-space: nowrap;
 
     div{
       align-items: center;

email_mailbox/src/lang/de.json

@@ -3,6 +3,8 @@
     "activity_feed": "Aktivitäten-Feed",
     "deleted": "Gelöscht",
     "downloaded": "heruntergeladen",
+    "empty_message": "Genießt dein Tag",
+    "empty_title": "Bis jetzt nichts neues",
     "new": "neu",
     "older": "älter",
     "opened": "geöffnet",
@@ -677,7 +679,7 @@
     "show_in_label_list": "In der Labelliste anzeigen",
     "signature": "Unterschrift",
     "sign_footer": {
-      "description": "Fußzeile \"Gesendet mit Criptext\" anzeigen"
+      "description": "\"Gesendet mit Criptext\" anzeigen"
     },
     "system_labels": "Systemlabels",
     "theme": {

email_mailbox/src/lang/en.json

@@ -3,6 +3,8 @@
     "activity_feed": "Activity Feed",
     "deleted": "Deleted",
     "downloaded": "downloaded",
+    "empty_message": "Enjoy your day",
+    "empty_title": "There's nothing new yet",
     "new": "new",
     "older": "older",
     "opened": "opened",