From 477396f8200354cdc2de1bcb2f2e0082cedef282 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 26 May 2017 22:28:35 +0100 Subject: [PATCH 1/2] Use first language preference, not last --- src/languageHandler.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/languageHandler.js b/src/languageHandler.js index cddc70da56..584a4ef82b 100644 --- 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) { From 81704a5b5e96260663cdb51de6a281b9551bd4ce Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 27 May 2017 00:13:04 +0100 Subject: [PATCH 2/2] s/username/User name/ --- src/components/views/login/PasswordLogin.js | 2 +- src/i18n/strings/de_DE.json | 2 +- src/i18n/strings/en_EN.json | 2 +- src/i18n/strings/pt.json | 2 +- src/i18n/strings/pt_BR.json | 2 +- src/i18n/strings/ru.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js index fcaf05a8c8..8e5229c63d 100644 --- 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 index f496a1ec8f..5ec137fc9d 100644 --- 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 index 73ae8c5515..f317c6a08a 100644 --- 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 index 5beb530768..356510a94a 100644 --- 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 index 5722997165..8f9bb015a0 100644 --- 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 index 3b86b06b36..82286f06f9 100644 --- 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": "Ожидание проверки",