diff --git a/examples/next/pages/ui/components/authenticator/sign-in-federated/index.page.tsx b/examples/next/pages/ui/components/authenticator/sign-in-federated/index.page.tsx index 0cf75ad3d0e..f17b330929d 100644 --- a/examples/next/pages/ui/components/authenticator/sign-in-federated/index.page.tsx +++ b/examples/next/pages/ui/components/authenticator/sign-in-federated/index.page.tsx @@ -1,5 +1,6 @@ import { Authenticator } from '@aws-amplify/ui-react'; -import { Amplify } from 'aws-amplify'; +import { dict } from '@aws-amplify/ui-core'; +import { Amplify, I18n } from 'aws-amplify'; import awsExports from '@environments/auth-with-federated/src/aws-exports'; @@ -10,6 +11,8 @@ Amplify.configure({ }, }); +I18n.putVocabularies(dict); + export default function AuthenticatorWithFacebook() { return ( diff --git a/packages/core/src/i18n/index.ts b/packages/core/src/i18n/index.ts new file mode 100644 index 00000000000..b01054046be --- /dev/null +++ b/packages/core/src/i18n/index.ts @@ -0,0 +1 @@ +export * from './translations'; diff --git a/packages/core/src/i18n/translations.ts b/packages/core/src/i18n/translations.ts new file mode 100644 index 00000000000..4d3ac3842b5 --- /dev/null +++ b/packages/core/src/i18n/translations.ts @@ -0,0 +1,312 @@ +/* + * Copyright 2017-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with + * the License. A copy of the License is located at + * + * http://aws.amazon.com/apache2.0/ + * + * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + */ + +export const dict = { + de: { + 'Sign In': 'Anmelden', + 'Sign Up': 'Registrieren', + 'Sign Out': 'Abmelden', + 'Sign in to your account': 'Melden Sie sich mit Ihrem Account an', + Username: 'Benutzername', + Password: 'Passwort', + 'Enter your username': 'Geben Sie Ihren Benutzernamen ein', + 'Enter your password': 'Geben Sie Ihr Passwort ein', + 'No account? ': 'Kein Account? ', + 'Forgot your password? ': 'Passwort vergessen? ', + 'Reset password': 'Passwort zurücksetzen', + 'User does not exist': 'Dieser Benutzer existiert nicht', + 'User already exists': 'Dieser Benutzer existiert bereits', + 'Incorrect username or password': + 'Falscher Benutzername oder falsches Passwort', + 'Invalid password format': 'Ungültiges Passwort-Format', + 'Create account': 'Hier registrieren', + 'Forgot Password': 'Passwort vergessen', + 'Change Password': 'Passwort ändern', + 'New Password': 'Neues Passwort', + Email: 'Email', + 'Phone Number': 'Telefonnummer', + 'Confirm a Code': 'Code bestätigen', + 'Confirm Sign In': 'Anmeldung bestätigen', + 'Confirm Sign Up': 'Registrierung bestätigen', + 'Back to Sign In': 'Zurück zur Anmeldung', + 'Send Code': 'Code senden', + Confirm: 'Bestätigen', + 'Resend Code': 'Code erneut senden', + Submit: 'Abschicken', + Skip: 'Überspringen', + Verify: 'Verifizieren', + 'Verify Contact': 'Kontakt verifizieren', + Code: 'Code', + 'Confirmation Code': 'Bestätigungs-Code', + 'Lost your code? ': 'Code verloren? ', + 'Account recovery requires verified contact information': + 'Zurücksetzen des Account benötigt einen verifizierten Account', + 'Invalid phone number format': `Ungültiges Telefonummern-Format. + Benutze eine Nummer im Format: +12345678900`, + 'Create Account': 'Account erstellen', + 'Have an account? ': 'Schon registriert? ', + 'Sign in': 'Anmelden', + 'Signing in': 'Signing in', + 'Create a new account': 'Erstelle einen neuen Account', + 'Reset your password': 'Zurücksetzen des Passworts', + 'An account with the given email already exists.': + 'Ein Account mit dieser Email existiert bereits.', + 'Username cannot be empty': 'Benutzername darf nicht leer sein', + 'Password attempts exceeded': + 'Die maximale Anzahl der fehlerhaften Anmeldeversuche wurde erreicht', + }, + fr: { + Hello: 'Bonjour', + 'Loading...': 'Chargement...', + 'Sign In': 'Se connecter', + 'Sign In with Amazon': 'Se connecter avec Amazon', + 'Sign In with Facebook': 'Se connecter avec Facebook', + 'Sign In with Google': 'Se connecter avec Google', + 'Sign In with AWS': 'Se connecter avec AWS', + 'Sign Up': "S'inscrire", + 'Sign Out': 'Déconnexion', + 'Forgot Password': 'Mot de passe oublié', + Username: "Nom d'utilisateur", + Password: 'Mot de passe', + 'Change Password': 'Modifier le mot de passe', + Change: 'Modifier', + 'New Password': 'Nouveau mot de passe', + Email: 'Email', + 'Phone Number': 'Numéro de téléphone', + 'Confirm a Code': 'Confirmer un code', + 'Confirm Sign In': 'Confirmer la connexion', + 'Confirm Sign Up': "Confirmer l'inscription", + 'Back to Sign In': 'Retour à la connexion', + Send: 'Envoyer', + 'Send Code': "M'envoyer un code", + Confirm: 'Confirmer', + SMS: 'SMS', + 'Confirm SMS Code': 'Confirmer le code SMS', + 'Confirm TOTP Code': 'Confirmer le code TOTP', + 'Resend a Code': 'Renvoyer un code', + Submit: 'Soumettre', + Skip: 'Passer', + Verify: 'Vérifier', + 'Verify Contact': 'Vérifier le contact', + Code: 'Code', + 'Confirmation Code': 'Code de confirmation', + 'Account recovery requires verified contact information': + 'La récupération du compte nécessite des informations de contact vérifiées', + + 'User does not exist': "L'utilisateur n'existe pas", + 'User already exists': "L'utilisateur existe déjà", + 'Incorrect username or password': 'Identifiant ou mot de passe incorrect', + 'Invalid password format': 'Format de mot de passe invalide', + 'Invalid phone number format': `Format de numéro de téléphone invalide. Veuillez utiliser un format +12345678900`, + 'Username/client id combination not found.': "L'utilisateur n'existe pas", + 'Network error': 'Erreur réseau', + 'Sign in to your account': 'Connexion à votre compte', + 'Forgot your password? ': 'Mot de passe oublié ? ', + 'Reset password': 'Réinitialisez votre mot de passe', + 'No account? ': 'Pas de compte ? ', + 'Create account': 'Créer un compte', + 'Create Account': 'Créer un compte', + 'Have an account? ': 'Déjà un compte ? ', + 'Sign in': 'Se connecter', + 'Create a new account': 'Créer un nouveau compte', + 'Reset your password': 'Réinitialisez votre mot de passe', + 'Enter your username': "Saisissez votre nom d'utilisateur", + 'Enter your password': 'Saisissez votre mot de passe', + 'Enter your phone number': 'Saisissez votre numéro de téléphone', + 'Enter your email': 'Saisissez votre adresse email', + 'Enter your code': 'Saisissez cotre code de confirmation', + 'Lost your code? ': 'Vous avez perdu votre code ? ', + 'Resend Code': 'Renvoyer le code', + or: 'ou', + 'An account with the given email already exists.': + 'Un utilisateur avec cette adresse email existe déjà.', + 'Username cannot be empty': "Le nom d'utilisateur doit être renseigné", + }, + + es: { + 'Sign in to your account': 'Iniciar sesíon', + 'Loading...': 'Cargando...', + 'Confirmation Code': 'Codigo de confirmación', + 'Sign In': 'Iniciar sesíon', + 'Sign Up': 'Regístrase', + 'Sign Out': 'Desconectar', + 'Forgot Password': 'Se te olvidó la contraseña?', + Username: 'Nombre de usuario', + Password: 'Contraseña', + 'Change Password': 'Cambia la contraseña', + 'New Password': 'Nueva contraseña', + Email: 'Email', + 'Phone Number': 'Número de teléfono', + 'Resend Code': 'Mandar codigo otra vez', + 'Create a new account': 'Crear una cuenta nueva', + 'Confirm a Code': 'Confirmar un código', + 'Confirm Sign In': 'Confirmar inicio de sesión', + 'Confirm Sign Up': 'Confirmar Registración', + 'Back to Sign In': 'Iniciar sesión', + 'Send Code': 'Enviar código', + Confirm: 'Confirmar', + 'Resend a Code': 'Reenviar un código', + Submit: 'Enviar', + Skip: 'Omitir', + Verify: 'Verificar', + 'Verify Contact': 'Verificar contacto', + Code: 'Código', + 'Account recovery requires verified contact information': + 'La recuperación de la cuenta requiere información de contacto verificada', + 'Username cannot be empty': 'El campo de usuario no puede estar vacido', + 'User does not exist': 'El usuario no existe', + 'User already exists': 'El usuario ya existe', + 'Incorrect username or password': + 'Nombre de usuario o contraseña incorrecta', + 'Invalid password format': 'Formato de contraseña inválido', + 'Invalid phone number format': + 'Formato de n\xFAmero de tel\xE9fono inv\xE1lido.\nUtilice el formato de n\xFAmero de tel\xE9fono +12345678900', + }, + + it: { + 'Account recovery requires verified contact information': + 'Ripristino del conto richiede un account verificati', + 'An account with the given email already exists.': + 'Un account con questa email esiste già.', + 'Back to Sign In': 'Torna alla Accesso', + 'Change Password': 'Cambia la password', + Code: 'Codice', + Confirm: 'Conferma', + 'Confirm Sign In': 'Conferma di applicazione', + 'Confirm Sign Up': 'Registrazione Conferma', + 'Confirm a Code': 'Codice Conferma', + 'Confirmation Code': 'Codice di verifica', + 'Create Account': 'Crea account', + 'Create a new account': 'Creare un nuovo account', + 'Create account': 'Registrati', + Email: 'E-mail', + 'Enter your password': 'Inserire la password', + 'Enter your username': 'Inserisci il tuo nome utente', + 'Forgot your password? ': 'Password dimenticata?', + 'Forgot Password': 'Password dimenticata', + 'Have an account? ': 'Già registrato?', + 'Incorrect username or password': 'Nome utente o password errati', + 'Invalid password format': 'Formato della password non valido', + 'Invalid phone number format': + 'Utilizzo non valido Telefonummern formattare un numero nel formato :. 12.345.678,9 mille', + 'Lost your code?': 'Perso codice?', + 'New Password': 'Nuova password', + 'No account? ': 'Nessun account?', + Password: 'Password', + 'Password attempts exceeded': + 'Il numero massimo di tentativi di accesso falliti è stato raggiunto', + 'Phone Number': 'Numero di telefono', + 'Resend Code': 'Codice Rispedisci', + 'Reset password': 'Ripristina password', + 'Reset your password': 'Resetta password', + 'Send Code': 'Invia codice', + 'Sign In': 'Accesso', + 'Sign Out': 'Esci', + 'Sign Up': 'Iscriviti', + 'Sign in': 'Accesso', + 'Sign in to your account': 'Accedi con il tuo account a', + Skip: 'Salta', + Submit: 'Sottoscrivi', + 'User already exists': 'Questo utente esiste già', + 'User does not exist': 'Questo utente non esiste', + Username: 'Nome utente', + 'Username cannot be empty': 'Nome utente non può essere vuoto', + Verify: 'Verifica', + 'Verify Contact': 'Contatto verifica', + }, + zh: { + 'Sign In': '登录', + 'Sign Up': '注册', + 'Sign Out': '退出', + 'Forgot Password': '忘记密码', + Username: '用户名', + Password: '密码', + 'Change Password': '改变密码', + 'New Password': '新密码', + Email: '邮箱', + 'Phone Number': '电话', + 'Confirm a Code': '确认码', + 'Confirm Sign In': '确认登录', + 'Confirm Sign Up': '确认注册', + 'Back to Sign In': '回到登录', + 'Send Code': '发送确认码', + Confirm: '确认', + 'Resend a Code': '重发确认码', + Submit: '提交', + Skip: '跳过', + Verify: '验证', + 'Verify Contact': '验证联系方式', + Code: '确认码', + 'Account recovery requires verified contact information': + '账户恢复需要验证过的联系方式', + + 'User does not exist': '用户不存在', + 'User already exists': '用户已经存在', + 'Incorrect username or password': '用户名或密码错误', + 'Invalid password format': '密码格式错误', + 'Invalid phone number format': '电话格式错误，请使用格式 +12345678900', + }, + ja: { + 'Sign In': 'サインイン ', + 'Sign Up': '登録 ', + 'Sign Out': 'サインアウト ', + 'Sign in to your account': 'アカウントにサインイン ', + Username: 'ユーザー名 ', + Password: 'パスワード ', + 'Enter your username': 'ユーザー名を入力 ', + 'Enter your password': 'パスワードを入力 ', + 'No account? ': 'アカウントが無いとき ', + 'Forgot your password? ': 'パスワードを忘れましたか？ ', + 'Reset password': 'パスワードをリセット ', + 'User does not exist': 'ユーザーが存在しません ', + 'User already exists': '既にユーザーが存在しています ', + 'Incorrect username or password': 'ユーザー名かパスワードが異なります ', + 'Invalid password format': 'パスワードの形式が無効です ', + 'Create account': 'アカウントを作る ', + 'Forgot Password': 'パスワードを忘れた ', + 'Change Password': 'パスワードを変える ', + 'New Password': '新しいパスワード', + Email: 'メールアドレス', + 'Phone Number': '電話番号', + 'Confirm a Code': 'コードを確認', + 'Confirm Sign In': 'サインインする', + 'Confirm Sign Up': '登録する', + 'Back to Sign In': 'サインインに戻る', + 'Send Code': 'コードを送信', + Confirm: '確定', + 'Resend Code': 'コードを再送信', + Submit: '送信', + Skip: 'スキップ', + Verify: '確認', + 'Verify Contact': '連絡先を確認', + Code: 'コード', + 'Confirmation Code': '確認コード', + 'Lost your code? ': 'コードを失くしましたか？', + 'Account recovery requires verified contact information': + 'アカウントの復旧には確認済みの連絡先が必要です', + 'Invalid phone number format': + '不正な電話番号の形式です。\n+12345678900 の形式で入力してください', + 'Create Account': 'アカウントを作る', + 'Have an account? ': 'アカウントを持っていますか？', + 'Sign in': 'サインイン', + 'Create a new account': '新しいアカウントを作る', + 'Reset your password': 'パスワードをリセットする', + 'An account with the given email already exists.': + '入力されたメールアドレスのアカウントが既に存在します', + 'Username cannot be empty': 'ユーザー名は入力必須です', + 'Password attempts exceeded': 'サインインの試行回数が上限に達しました', + 'Sign In with Google': 'Googleでサインイン', + 'Sign In with Facebook': 'Facebookでサインイン', + 'Sign In with Amazon': 'Amazonでサインイン', + }, +}; diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 5a17989bc8e..45c7e9562cf 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -2,3 +2,4 @@ export * from './machines'; export * from './authService'; export * from './types'; export * from './helpers'; +export * from './i18n'; diff --git a/packages/e2e/cypress/integration/ui/components/authenticator/reset-password.feature b/packages/e2e/cypress/integration/ui/components/authenticator/reset-password.feature index 58b873cde17..b841a309c80 100644 --- a/packages/e2e/cypress/integration/ui/components/authenticator/reset-password.feature +++ b/packages/e2e/cypress/integration/ui/components/authenticator/reset-password.feature @@ -9,14 +9,14 @@ Feature: Reset Password @next @react Scenario: Reset Password with valid username - When I click on the "Reset Password" button + When I click on the "Reset password" button And I type a valid username "VALID_USERNAME" And I click the "Send code" button Then I will be redirected to the confirm forgot password page @next @react Scenario: Reset Password with invalid username - When I click on the "Reset Password" button + When I click on the "Reset password" button And I type an invalid username "INVALID_USERNAME" And I click the "Send code" button Then I see "Username/client id combination not found." diff --git a/packages/react/src/components/Authenticator/FederatedSignIn/FederatedSignIn.tsx b/packages/react/src/components/Authenticator/FederatedSignIn/FederatedSignIn.tsx index 5148d3d334a..22823102fc5 100644 --- a/packages/react/src/components/Authenticator/FederatedSignIn/FederatedSignIn.tsx +++ b/packages/react/src/components/Authenticator/FederatedSignIn/FederatedSignIn.tsx @@ -1,8 +1,9 @@ import { get, includes } from 'lodash'; -import { useAmplify, useAuth } from '../../../hooks'; +import { I18n } from '@aws-amplify/core'; import { FederatedIdentityProviders } from '@aws-amplify/ui-core'; +import { useAmplify, useAuth } from '../../../hooks'; import { FederatedSignInButton } from './FederatedSignInButtons'; export const FederatedSignIn = (): JSX.Element => { @@ -16,19 +17,19 @@ export const FederatedSignIn = (): JSX.Element => { const facebookButton = includes(loginMechanisms, 'facebook') ? ( ) : null; const googleButton = includes(loginMechanisms, 'google') ? ( ) : null; const amazonButton = includes(loginMechanisms, 'amazon') ? ( ) : null; diff --git a/packages/react/src/components/Authenticator/SignIn/SignIn.tsx b/packages/react/src/components/Authenticator/SignIn/SignIn.tsx index 52464a35293..2524c564c3f 100644 --- a/packages/react/src/components/Authenticator/SignIn/SignIn.tsx +++ b/packages/react/src/components/Authenticator/SignIn/SignIn.tsx @@ -1,6 +1,7 @@ +import { I18n } from '@aws-amplify/core'; import { getActorState, SignInState } from '@aws-amplify/ui-core'; -import { useAmplify, useAuth } from '../../../hooks'; +import { useAmplify, useAuth } from '../../../hooks'; import { FederatedSignIn } from '../FederatedSignIn'; import { ErrorText, UserNameAlias } from '../shared'; @@ -51,7 +52,7 @@ export function SignIn() { }} onChange={handleChange} > - Sign in to your account + {I18n.get('Sign in to your account')} @@ -59,28 +60,32 @@ export function SignIn() {
- No account?{' '} + {I18n.get('No account? ')}
diff --git a/packages/react/src/components/Authenticator/shared/UserNameAlias.tsx b/packages/react/src/components/Authenticator/shared/UserNameAlias.tsx index 98bb80f6721..a9755549e70 100644 --- a/packages/react/src/components/Authenticator/shared/UserNameAlias.tsx +++ b/packages/react/src/components/Authenticator/shared/UserNameAlias.tsx @@ -1,7 +1,8 @@ -import { useAuth } from '../../../hooks'; +import { I18n } from '@aws-amplify/core'; +import { getAliasInfoFromContext } from '@aws-amplify/ui-core'; +import { useAuth } from '../../../hooks'; import { Label, Text, Input, ErrorText } from '../../../primitives'; -import { getAliasInfoFromContext } from '@aws-amplify/ui-core'; export interface UserNameAliasProps { handleInputChange?(event): void; @@ -16,7 +17,7 @@ export function UserNameAlias(props: UserNameAliasProps) { return (