Merge remote-tracking branch 'origin/develop' into develop

matrix-org · May 26, 2017 · 59cb7ad · 59cb7ad
2 parents 5d08393 + 81704a5
commit 59cb7ad
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
@@ -128,7 +128,7 @@ class PasswordLogin extends React.Component {
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
                     onChange={this.onUsernameChanged}
-                    placeholder={_t('username')}
+                    placeholder={_t('User name')}
                     value={this.state.username}
                     autoFocus
                 />;

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
@@ -252,7 +252,7 @@
     "Upload Files": "Dateien hochladen",
     "Upload file": "Datei hochladen",
     "User Interface": "Nutzerschnittstelle",
-    "username": "Nutzername",
+    "User name": "Nutzername",
     "Users": "Nutzer",
     "User": "Nutzer",
     "Verification Pending": "Verifizierung ausstehend",

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -508,7 +508,7 @@
   "Use with caution": "Use with caution",
   "User ID": "User ID",
   "User Interface": "User Interface",
-  "username": "username",
+  "User name": "User name",
   "Users": "Users",
   "User": "User",
   "Verification Pending": "Verification Pending",

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
@@ -246,7 +246,7 @@
     "Upload file": "Enviar arquivo",
     "User ID": "Identificador de Usuário",
     "User Interface": "Interface de usuário",
-    "username": "Nome de usuária/o",
+    "User name": "Nome de usuária/o",
     "Users": "Usuários",
     "User": "Usuária/o",
     "Verification Pending": "Verificação pendente",

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
@@ -251,7 +251,7 @@
     "Upload file": "Enviar arquivo",
     "User ID": "Identificador de Usuário",
     "User Interface": "Interface de usuário",
-    "username": "Nome de usuária/o",
+    "User name": "Nome de usuária/o",
     "Users": "Usuários",
     "User": "Usuária/o",
     "Verification Pending": "Verificação pendente",

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
@@ -180,7 +180,7 @@
     "Upload file": "Загрузка файла",
     "User ID": "ID пользователя",
     "User Interface": "Пользовательский интерфейс",
-    "username": "Имя пользователя",
+    "User name": "Имя пользователя",
     "Users": "Пользователи",
     "User": "Пользователь",
     "Verification Pending": "Ожидание проверки",

diff --git a/src/languageHandler.js b/src/languageHandler.js
@@ -57,6 +57,7 @@ export function setLanguage(preferredLangs) {
         for (let i = 0; i < preferredLangs.length; ++i) {
             if (availLangs.hasOwnProperty(preferredLangs[i])) {
                 langToUse = preferredLangs[i];
+                break;
             }
         }
         if (!langToUse) {