From 5719259825855243e408e1a40693696954ad6ee2 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Sat, 14 May 2016 11:41:32 +0300 Subject: [PATCH] Russian translation for profile index page --- scripts/i18n-collect.js | 10 ++-- src/components/profile/Profile.intl.json | 13 +++++ src/components/profile/Profile.jsx | 2 +- src/components/profile/Profile.messages.js | 59 ---------------------- src/i18n/en.json | 26 ++++++---- src/i18n/ru.json | 26 ++++++---- 6 files changed, 49 insertions(+), 87 deletions(-) create mode 100644 src/components/profile/Profile.intl.json delete mode 100644 src/components/profile/Profile.messages.js diff --git a/scripts/i18n-collect.js b/scripts/i18n-collect.js index b0a22b3..00f9ec0 100644 --- a/scripts/i18n-collect.js +++ b/scripts/i18n-collect.js @@ -57,8 +57,8 @@ try { keysToUpdate = Object.entries(prevMessages).reduce((acc, [key, message]) => acc.concat(defaultMessages[key] && defaultMessages[key] !== message ? key : []) , []); -} catch(e) { - console.log(chalk.yellow(`Can not read ${defaultMessagesPath}. The new file will be created.`), e); +} catch(err) { + console.log(chalk.yellow(`Can not read ${defaultMessagesPath}. The new file will be created.`), err); } if (!keysToAdd.length && !keysToRemove.length && !keysToUpdate.length) { @@ -114,9 +114,9 @@ function buildLocales() { let newMessages = {}; try { - newMessages = JSON.parse(fs.readFileSync(defaultMessagesPath, 'utf8')); - } catch (e) { - console.log(chalk.yellow(`Can not read ${defaultMessagesPath}. The new file will be created.`), e); + newMessages = JSON.parse(fs.readFileSync(destPath, 'utf8')); + } catch (err) { + console.log(chalk.yellow(`Can not read ${destPath}. The new file will be created.`), err); } keysToRemove.forEach((key) => { diff --git a/src/components/profile/Profile.intl.json b/src/components/profile/Profile.intl.json new file mode 100644 index 0000000..e4639cc --- /dev/null +++ b/src/components/profile/Profile.intl.json @@ -0,0 +1,13 @@ +{ + "accountPreferencesTitle": "Ely.by account preferences", + "personalData": "Personal data", + "accountDescription": "Ely.by account allows you to get access to many Minecraft resources. Please, take care of your account safety. Use secure password and change it regularly.", + "preferencesDescription": "Here you can change the key preferences of your account. Please note that all actions must be confirmed by entering a password.", + "mojangPriorityWarning": "A Mojang account with the same nickname was found. According to project rules, account owner has the right to demand the restoration of control over nickname.", + "oldHashingAlgoWarning": "Your was hashed with an old hashing algorithm.
Please, change password.", + "changedAt": "Changed {at}", + "disabled": "Disabled", + "nickname": "Nickname", + "password": "Password", + "twoFactorAuth": "Two factor auth" +} diff --git a/src/components/profile/Profile.jsx b/src/components/profile/Profile.jsx index 1412d88..7c81b34 100644 --- a/src/components/profile/Profile.jsx +++ b/src/components/profile/Profile.jsx @@ -8,7 +8,7 @@ import { userShape } from 'components/user/User'; import ProfileField from './ProfileField'; import styles from './profile.scss'; import profileForm from './profileForm.scss'; -import messages from './Profile.messages'; +import messages from './Profile.intl.json'; export default class Profile extends Component { static displayName = 'Profile'; diff --git a/src/components/profile/Profile.messages.js b/src/components/profile/Profile.messages.js deleted file mode 100644 index 0ea6452..0000000 --- a/src/components/profile/Profile.messages.js +++ /dev/null @@ -1,59 +0,0 @@ -import { defineMessages } from 'react-intl'; - -export default defineMessages({ - accountPreferencesTitle: { - id: 'accountPreferencesTitle', - defaultMessage: 'Ely.by account preferences' - // defaultMessage: 'Настройки аккаунта Ely.by' - }, - personalData: { - id: 'personalData', - defaultMessage: 'Personal data' - // defaultMessage: 'Персональные данные' - }, - accountDescription: { - id: 'accountDescription', - defaultMessage: 'Ely.by account allows you to get access to many Minecraft resources. Please, take care of your account safety. Use secure password and change it regularly.' - // defaultMessage: 'Благодаря аккаунту Ely.by вы можете получить доступ ко многим ресурсам, связанным с Minecraft. Берегите свой аккаунт, используйте надёжный пароль и регулярно его меняйте.' - }, - preferencesDescription: { - id: 'preferencesDescription', - defaultMessage: 'Here you can change the key preferences of your account. Please note that all actions must be confirmed by entering a password.' - // defaultMessage: 'Здесь вы можете сменить ключевые параметры вашего аккаунта. Обратите внимание, что для всех действий необходимо подтверждение при помощи ввода пароля.' - }, - mojangPriorityWarning: { - id: 'mojangPriorityWarning', - defaultMessage: 'A Mojang account with the same nickname was found. According to project rules, account owner has the right to demand the restoration of control over nickname.' - // defaultMessage: 'Найден аккаунт Mojang с таким же ником и, по правилам проекта, его владелец вправе потребовать восстановления контроля над ником.' - }, - oldHashingAlgoWarning: { - id: 'oldHashingAlgoWarning', - defaultMessage: 'Your was hashed with an old hashing algorithm.
Please, change password.' - // defaultMessage: 'Для пароля применяется старый алгоритм хэширования
Пожалуйста, смените пароль.' - }, - changedAt: { - id: 'changedAt', - defaultMessage: 'Changed {at}' - // defaultMessage: 'Изменен {at}' - }, - disabled: { - id: 'disabled', - defaultMessage: 'Disabled' - // defaultMessage: 'Не включена' - }, - nickname: { - id: 'nickname', - defaultMessage: 'Nickname' - // defaultMessage: 'Ник' - }, - password: { - id: 'password', - defaultMessage: 'Password' - // defaultMessage: 'Пароль' - }, - twoFactorAuth: { - id: 'twoFactorAuth', - defaultMessage: 'Two factor auth' - // defaultMessage: 'Двухфакторная аутентификация' - } -}); diff --git a/src/i18n/en.json b/src/i18n/en.json index 0b627b1..197bae1 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1,10 +1,8 @@ { "acceptRules": "I agree with {link}", "accountActivationTitle": "Account activation", - "accountDescription": "Ely.by account allows you to get access to many Minecraft resources. Please, take care of your account safety. Use secure password and change it regularly.", "accountEmail": "Enter account E-mail", "accountPassword": "Account password", - "accountPreferencesTitle": "Ely.by account preferences", "activationMailWasSent": "Please check {email} for the message with the last registration step", "alreadyReceivedCode": "Already received code", "approve": "Approve", @@ -19,7 +17,6 @@ "changeUsernameDescription": "You can change your nickname to any arbitrary value. Remember that it is not recommended to take a nickname of already existing Mojang account.", "changeUsernameTitle": "Change nickname", "changeUsernameWarning": "Be careful: if you playing on the server with nickname binding, then after changing nickname you may lose all your progress.", - "changedAt": "Changed {at}", "codePlaceholder": "Paste the code here", "components.auth.password.accountPassword": "Account password", "components.auth.password.forgotPassword": "Forgot password", @@ -29,6 +26,8 @@ "components.auth.password.rememberMe": "Remember me on this device", "components.auth.password.signInButton": "Sign in", "components.auth.password.suggestResetPassword": "Are you have {link}?", + "components.profile.accountDescription": "Ely.by account allows you to get access to many Minecraft resources. Please, take care of your account safety. Use secure password and change it regularly.", + "components.profile.accountPreferencesTitle": "Ely.by account preferences", "components.profile.changePassword.achievementLossWarning": "Are you cherish your game achievements, right?", "components.profile.changePassword.changePasswordButton": "Change password", "components.profile.changePassword.changePasswordDescription": "Please take a password, that will be different from your passwords on the other sites and will not be the same you are using to enter Minecraft game servers you are playing.", @@ -37,6 +36,15 @@ "components.profile.changePassword.newPasswordLabel": "New password:", "components.profile.changePassword.passwordRequirements": "Password must contain at least 8 characters. It can be any symbols — do not limit yourself, create an unpredictable password!", "components.profile.changePassword.repeatNewPasswordLabel": "Repeat the password:", + "components.profile.changedAt": "Changed {at}", + "components.profile.disabled": "Disabled", + "components.profile.mojangPriorityWarning": "A Mojang account with the same nickname was found. According to project rules, account owner has the right to demand the restoration of control over nickname.", + "components.profile.nickname": "Nickname", + "components.profile.oldHashingAlgoWarning": "Your was hashed with an old hashing algorithm.
Please, change password.", + "components.profile.password": "Password", + "components.profile.personalData": "Personal data", + "components.profile.preferencesDescription": "Here you can change the key preferences of your account. Please note that all actions must be confirmed by entering a password.", + "components.profile.twoFactorAuth": "Two factor auth", "confirmEmail": "Confirm E-mail", "contactSupport": "Contact support", "copy": "Copy", @@ -44,12 +52,12 @@ "currentPassword": "Enter current password", "decline": "Decline", "didNotReceivedEmail": "Did not received E-mail?", - "disabled": "Disabled", "emailInvalid": "Email is invalid", "emailIsTempmail": "Tempmail E-mail addresses is not allowed", "emailNotAvailable": "This email is already registered.", "emailOrUsername": "E-mail or username", "emailRequired": "Email is required", + "emailToLong": "Email is too long", "enterFinalizationCode": "The E-mail change confirmation code was sent to {email}. Please enter the code received into the field below:", "enterInitializationCode": "The E-mail with an initialization code for E-mail change procedure was sent to {email}. Please enter the code into the field below:", "enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.", @@ -65,25 +73,19 @@ "loginRequired": "Please enter email or username", "loginTitle": "Sign in", "logout": "Logout", - "mojangPriorityWarning": "A Mojang account with the same nickname was found. According to project rules, account owner has the right to demand the restoration of control over nickname.", "newEmailPlaceholder": "Enter new E-mail", "newPassword": "Enter new password", "newPasswordRequired": "Please enter new password", "newRePassword": "Repeat new password", "newRePasswordRequired": "Please repeat new password", "next": "Next", - "nickname": "Nickname", - "oldHashingAlgoWarning": "Your was hashed with an old hashing algorithm.
Please, change password.", "passCodeToApp": "To complete authorization process, please, provide the following code to {appName}", - "password": "Password", "passwordChangeMessage": "To enhance the security of your account, please change your password.", "passwordRequired": "Please enter password", "passwordTooShort": "Your password is too short", "passwordsDoesNotMatch": "The passwords does not match", "permissionsTitle": "Application permissions", - "personalData": "Personal data", "pleaseEnterPassword": "Please, enter your current password", - "preferencesDescription": "Here you can change the key preferences of your account. Please note that all actions must be confirmed by entering a password.", "pressButtonToStart": "Press the button below to send a message with the code for E-mail change initialization.", "rePasswordRequired": "Please retype your password", "register": "Join", @@ -101,8 +103,10 @@ "theAppNeedsAccess1": "This application needs access", "theAppNeedsAccess2": "to your data", "title": "Confirm your action", - "twoFactorAuth": "Two factor auth", + "usernameInvalid": "Username is invalid", "usernameRequired": "Username is required", + "usernameTooLong": "Username is too long", + "usernameTooShort": "Username is too short", "usernameUnavailable": "This username is already taken", "waitAppReaction": "Please, wait till your application response", "youAuthorizedAs": "You authorized as:", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 2a94c66..2855d31 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -1,10 +1,8 @@ { "acceptRules": "I agree with {link}", "accountActivationTitle": "Account activation", - "accountDescription": "Ely.by account allows you to get access to many Minecraft resources. Please, take care of your account safety. Use secure password and change it regularly.", "accountEmail": "Enter account E-mail", "accountPassword": "Account password", - "accountPreferencesTitle": "Ely.by account preferences", "activationMailWasSent": "Please check {email} for the message with the last registration step", "alreadyReceivedCode": "Already received code", "approve": "Approve", @@ -19,7 +17,6 @@ "changeUsernameDescription": "You can change your nickname to any arbitrary value. Remember that it is not recommended to take a nickname of already existing Mojang account.", "changeUsernameTitle": "Change nickname", "changeUsernameWarning": "Be careful: if you playing on the server with nickname binding, then after changing nickname you may lose all your progress.", - "changedAt": "Changed {at}", "codePlaceholder": "Paste the code here", "components.auth.password.accountPassword": "Account password", "components.auth.password.forgotPassword": "Forgot password", @@ -29,6 +26,8 @@ "components.auth.password.rememberMe": "Remember me on this device", "components.auth.password.signInButton": "Sign in", "components.auth.password.suggestResetPassword": "Are you have {link}?", + "components.profile.accountDescription": "Благодаря аккаунту Ely.by вы можете получить доступ ко многим ресурсам, связанным с Minecraft. Берегите свой аккаунт, используйте надёжный пароль и регулярно его меняйте.", + "components.profile.accountPreferencesTitle": "Настройки аккаунта Ely.by", "components.profile.changePassword.achievementLossWarning": "Вы ведь дорожите своими игровыми достижениями?", "components.profile.changePassword.changePasswordButton": "Сменить пароль", "components.profile.changePassword.changePasswordDescription": "Придумайте пароль, который будет отличаться от ваших паролей на других сайтах и не будет совпадаеть с тем паролем, который вы используете для входа на различные игровые сервера Minecraft.", @@ -37,6 +36,15 @@ "components.profile.changePassword.newPasswordLabel": "Новый пароль:", "components.profile.changePassword.passwordRequirements": "Пароль должен содержать не менее 8 символов. Это могут быть любым символы — не ограничивайте себя, придумайте непредсказуемый пароль!", "components.profile.changePassword.repeatNewPasswordLabel": "Повторите указанный пароль:", + "components.profile.changedAt": "Изменен {at}", + "components.profile.disabled": "Не включена", + "components.profile.mojangPriorityWarning": "Найден аккаунт Mojang с таким же ником и, по правилам проекта, его владелец вправе потребовать восстановления контроля над ником.", + "components.profile.nickname": "Ник", + "components.profile.oldHashingAlgoWarning": "Для пароля применяется старый алгоритм хэширования
Пожалуйста, смените пароль.", + "components.profile.password": "Пароль", + "components.profile.personalData": "Персональные данные", + "components.profile.preferencesDescription": "Здесь вы можете сменить ключевые параметры вашего аккаунта. Обратите внимание, что для всех действий необходимо подтверждение при помощи ввода пароля.", + "components.profile.twoFactorAuth": "Двухфакторная аутентификация", "confirmEmail": "Confirm E-mail", "contactSupport": "Contact support", "copy": "Copy", @@ -44,12 +52,12 @@ "currentPassword": "Enter current password", "decline": "Decline", "didNotReceivedEmail": "Did not received E-mail?", - "disabled": "Disabled", "emailInvalid": "Email is invalid", "emailIsTempmail": "Tempmail E-mail addresses is not allowed", "emailNotAvailable": "This email is already registered.", "emailOrUsername": "E-mail or username", "emailRequired": "Email is required", + "emailToLong": "Email is too long", "enterFinalizationCode": "The E-mail change confirmation code was sent to {email}. Please enter the code received into the field below:", "enterInitializationCode": "The E-mail with an initialization code for E-mail change procedure was sent to {email}. Please enter the code into the field below:", "enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.", @@ -65,25 +73,19 @@ "loginRequired": "Please enter email or username", "loginTitle": "Sign in", "logout": "Logout", - "mojangPriorityWarning": "A Mojang account with the same nickname was found. According to project rules, account owner has the right to demand the restoration of control over nickname.", "newEmailPlaceholder": "Enter new E-mail", "newPassword": "Enter new password", "newPasswordRequired": "Please enter new password", "newRePassword": "Repeat new password", "newRePasswordRequired": "Please repeat new password", "next": "Next", - "nickname": "Nickname", - "oldHashingAlgoWarning": "Your was hashed with an old hashing algorithm.
Please, change password.", "passCodeToApp": "To complete authorization process, please, provide the following code to {appName}", - "password": "Password", "passwordChangeMessage": "To enhance the security of your account, please change your password.", "passwordRequired": "Please enter password", "passwordTooShort": "Your password is too short", "passwordsDoesNotMatch": "The passwords does not match", "permissionsTitle": "Application permissions", - "personalData": "Personal data", "pleaseEnterPassword": "Please, enter your current password", - "preferencesDescription": "Here you can change the key preferences of your account. Please note that all actions must be confirmed by entering a password.", "pressButtonToStart": "Press the button below to send a message with the code for E-mail change initialization.", "rePasswordRequired": "Please retype your password", "register": "Join", @@ -101,8 +103,10 @@ "theAppNeedsAccess1": "This application needs access", "theAppNeedsAccess2": "to your data", "title": "Confirm your action", - "twoFactorAuth": "Two factor auth", + "usernameInvalid": "Username is invalid", "usernameRequired": "Username is required", + "usernameTooLong": "Username is too long", + "usernameTooShort": "Username is too short", "usernameUnavailable": "This username is already taken", "waitAppReaction": "Please, wait till your application response", "youAuthorizedAs": "You authorized as:",