From b55503e67f79cf7de9a07ad9caf367f2c1f570ed Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:27:57 +0100 Subject: [PATCH 1/8] i18n the forwarding aux panel Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/ForwardMessage.js | 3 ++- src/i18n/strings/en_EN.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js index 0ebcdf1e4a..33df201d7c 100644 --- a/src/components/views/rooms/ForwardMessage.js +++ b/src/components/views/rooms/ForwardMessage.js @@ -16,6 +16,7 @@ */ import React from 'react'; +import { _t } from '../../../languageHandler'; import MatrixClientPeg from '../../../MatrixClientPeg'; import dis from '../../../dispatcher'; import KeyCode from '../../../KeyCode'; @@ -88,7 +89,7 @@ module.exports = React.createClass({ render: function() { return (
-

Please select the destination room for this message

+

{_t('Please select the destination room for this message')}

); }, diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4105594058..c86d124ef3 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -678,5 +678,6 @@ "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)schanged their avatar %(repeats)s times", "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)schanged their avatar %(repeats)s times", "%(severalUsers)schanged their avatar": "%(severalUsers)schanged their avatar", - "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar" + "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar", + "Please select the destination room for this message": "Please select the destination room for this message" } From c8732582d3fda8c4ca4859d1feac5bac9461d7a5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:35:30 +0100 Subject: [PATCH 2/8] remove most duplicate keys in en_EN Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c86d124ef3..8b116109e1 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -285,7 +285,6 @@ "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.", "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat", "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload", - "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.", "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.", "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.", "had": "had", @@ -371,7 +370,6 @@ "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below", "Only people who have been invited": "Only people who have been invited", "Operation failed": "Operation failed", - "or": "or", "Password": "Password", "Passwords can't be empty": "Passwords can't be empty", "People": "People", @@ -604,8 +602,6 @@ "Encrypt room": "Encrypt room", "There are no visible files in this room": "There are no visible files in this room", "Room": "Room", - "Room name (optional)": "Room name (optional)", - "Who would you like to add to this room?": "Who would you like to add to this room?", "Connectivity to the server has been lost.": "Connectivity to the server has been lost.", "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.", "Auto-complete": "Auto-complete", From 8d64bf27af660dfc72870fc9217eafbc3aa9acbc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:38:37 +0100 Subject: [PATCH 3/8] fix weird mangled key vals (and dups) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 8b116109e1..dcd35bdaef 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -80,7 +80,6 @@ "ja":"Japanese", "ji":"Yiddish", "ko":"Korean", - "ko":"Korean (Johab)", "lt":"Lithuanian", "lv":"Latvian", "mk":"Macedonian (FYROM)", @@ -101,8 +100,7 @@ "sk":"Slovak", "sl":"Slovenian", "sq":"Albanian", - "sr":"Serbian (Cyrillic)", - "sr":"Serbian (Latin)", + "sr":"Serbian", "sv-fi":"Swedish (Finland)", "sv":"Swedish", "sx":"Sutu", From 3a8288bf345419a90b0c9924ff880bc344cf5dd2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:43:44 +0100 Subject: [PATCH 4/8] remove identical duplicates in fr Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/fr.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 53d24d484b..8849ade021 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -196,7 +196,6 @@ "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper", "An email has been sent to": "Un e-mail a été envoyé à", "A new password must be entered.": "Un nouveau mot de passe doit être entré.", - "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.", "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les invités", "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les invités", "Are you sure?": "Êtes-vous sûr ?", @@ -281,7 +280,6 @@ "Authentication": "Authentification", "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.", "An error has occurred.": "Une erreur est survenue.", - "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.", "Email": "E-mail", "Failed to send request.": "Erreur lors de l'envoi de la requête.", "Failed to unban": "Échec de l'amnistie", From 3ecd9964ec3a705bc7dd293f542fc8049a70fea6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 20:24:33 +0100 Subject: [PATCH 5/8] fix vector-im/riot-web#4059 - missed it in code review :( Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/SlashCommands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index d2c0eda3ff..ae619a1359 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -144,7 +144,7 @@ const commands = { dis.dispatch({ action: 'view_room', - roomAlias: roomAlias, + room_alias: roomAlias, auto_join: true, }); From 67323e3690a7427627f8b0397e83f37ecda9d878 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 28 May 2017 21:28:03 +0100 Subject: [PATCH 6/8] fix vars in RU translation (how did i not commit this yesterday?) --- src/i18n/strings/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index cdebc47160..b4c5003336 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -560,7 +560,7 @@ "Sender device information": "Информация об устройстве отправителя", "Send Invites": "Отправить приглашения", "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил изображение.", - "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderDisplayName)s отправил приглашение для %(targetDisplayName)s войти в комнату.", + "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s отправил приглашение для %(targetDisplayName)s войти в комнату.", "sent a video": "отправил видео", "Show panel": "Показать панель", "Sign in": "Войти", From 85f830db7147a8e4f5e6b64483a2af3e10354716 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 28 May 2017 21:28:11 +0100 Subject: [PATCH 7/8] warn for duplicate translation keys --- scripts/check-i18n.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl index 55499b0570..0ace98d0fc 100755 --- a/scripts/check-i18n.pl +++ b/scripts/check-i18n.pl @@ -141,6 +141,8 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files) sub read_i18n { my $path = shift; my $map = {}; + $path =~ /.*\/(.*)$/; + my $lang = $1; open(FILE, "<", $path) || die $!; while() { @@ -148,6 +150,10 @@ sub read_i18n { my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5); $src =~ s/\\"/"/g; $dst =~ s/\\"/"/g; + + if ($map->{$src}) { + printf ("%10s %24s\t%s\n", $lang, "Duplicate translation!", $src); + } $map->{$src} = $dst; } } From 51c3c121d43177170f8b09b69ebe6a5ac65515f5 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 28 May 2017 21:32:24 +0100 Subject: [PATCH 8/8] fix dup i18n keys found by check-i18n.pl --- src/i18n/strings/fr.json | 1 - src/i18n/strings/pt.json | 2 -- src/i18n/strings/pt_BR.json | 2 -- src/i18n/strings/ru.json | 3 +-- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 8849ade021..598b25b3fb 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -174,7 +174,6 @@ "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un message texte a été envoyé à +%(msisdn)s. Merci d'entrer le code de vérification qu'il contient", "accept": "Accepter", "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.", - "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté une invitation de %(displayName)s.", "Account": "Compte", "Add email address": "Ajouter une adresse e-mail", "Add phone number": "Ajouter un numéro de téléphone", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index e636eb54d7..44fc335a2c 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -16,7 +16,6 @@ "An email has been sent to": "Um email foi enviado para", "A new password must be entered.": "Uma nova senha precisa ser informada.", "answered the call.": "respondeu à chamada.", - "anyone": "qualquer um", "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes", "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes", "Are you sure you want to leave the room?": "Você tem certeza que deseja sair da sala?", @@ -354,7 +353,6 @@ "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.", "Press": "Aperte", "Reason": "Razão", - "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a", "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.", "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).", "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index fa9f3bc4da..d2447e8ea3 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -17,7 +17,6 @@ "New passwords don't match": "As novas senhas não conferem", "A new password must be entered.": "Uma nova senha precisa ser informada.", "answered the call.": "respondeu à chamada.", - "anyone": "qualquer um", "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes", "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes", "Are you sure you want to leave the room?": "Você tem certeza que deseja sair da sala?", @@ -358,7 +357,6 @@ "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.", "Press": "Aperte", "Reason": "Razão", - "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a", "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.", "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).", "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index b4c5003336..c800087370 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -251,7 +251,7 @@ "click to reveal": "нажать для открытия", "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.", "%(displayName)s is typing": "%(displayName)s вводит текст", - "%(targetName)s joined the room.": "%(targetName)s присоединенный к комнате.", + "%(targetName)s joined the room.": "%(targetName)s присоединенный к комнате.", "%(senderName)s kicked %(targetName)s.": "%(senderName)s выкинул %(targetName)s.", "%(targetName)s left the room.": "%(targetName)s покинул комнату.", "%(senderName)s made future room history visible to": "%(senderName)s история сделаной будущей комнаты, видимая для", @@ -508,7 +508,6 @@ "'%(alias)s' is not a valid format for an address": "'%(alias)s' неверный формат для адреса", "'%(alias)s' is not a valid format for an alias": "'%(alias)s' неверный формат для привязки", "Join Room": "Войти в комнату", - "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.", "Kick": "Выгнать", "Level": "Уровень", "Local addresses for this room:": "Местный адрес этой комнаты:",