From 2d61dfdf0c1572ec6508f17578acc85d1c894433 Mon Sep 17 00:00:00 2001 From: Yannick Francois Date: Mon, 7 Oct 2013 14:50:19 +0200 Subject: [PATCH] move lang to locals for account revover and signup pages --- app/views/accounts/recover_password.html.erb | 4 ++-- app/views/accounts/signup.html.erb | 6 +++--- config/locales/da.yml | 7 +++++++ config/locales/de.yml | 7 +++++++ config/locales/en.yml | 7 +++++++ config/locales/es-MX.yml | 8 ++++++++ config/locales/fr.yml | 7 +++++++ config/locales/he-IL.yml | 7 +++++++ config/locales/it.yml | 7 +++++++ config/locales/ja.yml | 7 +++++++ config/locales/lt.yml | 7 +++++++ config/locales/nb-NO.yml | 8 +++++++- config/locales/nl.yml | 7 +++++++ config/locales/pl.yml | 7 +++++++ config/locales/pt-BR.yml | 8 +++++++- config/locales/ro.yml | 7 +++++++ config/locales/ru.yml | 7 +++++++ config/locales/zh-CN.yml | 7 +++++++ config/locales/zh-TW.yml | 7 +++++++ lang/da_DK.rb | 14 +++----------- lang/de_DE.rb | 8 -------- lang/es_MX.rb | 8 -------- lang/fr_FR.rb | 8 -------- lang/he_IL.rb | 8 -------- lang/it_IT.rb | 8 -------- lang/ja_JP.rb | 8 -------- lang/lt_LT.rb | 8 -------- lang/nb_NO.rb | 8 -------- lang/nl_NL.rb | 8 -------- lang/pl_PL.rb | 8 -------- lang/pt_BR.rb | 8 -------- lang/ro_RO.rb | 8 -------- lang/ru_RU.rb | 3 --- lang/zh_CN.rb | 8 -------- lang/zh_TW.rb | 7 ------- 35 files changed, 128 insertions(+), 132 deletions(-) diff --git a/app/views/accounts/recover_password.html.erb b/app/views/accounts/recover_password.html.erb index 6586993736..fef813ee3f 100644 --- a/app/views/accounts/recover_password.html.erb +++ b/app/views/accounts/recover_password.html.erb @@ -1,6 +1,6 @@ <%= form_tag action: "recover_password" do %> - <%= text_field(:user, :login, {class: 'input-block-level', placeholder: _("Username or email")})%> - <%= submit_tag _('Reset my password'), class: "btn btn-info pull-right" %> + <%= text_field(:user, :login, {class: 'input-block-level', placeholder: t(".username_or_email")})%> + <%= submit_tag t('.reset_my_password'), class: "btn btn-info pull-right" %> <% end %> <%- content_for :account_links do %> diff --git a/app/views/accounts/signup.html.erb b/app/views/accounts/signup.html.erb index 2c25812d0b..f4c56150ee 100644 --- a/app/views/accounts/signup.html.erb +++ b/app/views/accounts/signup.html.erb @@ -1,7 +1,7 @@ <%= form_tag action: "signup" do %> - <%= text_field(:user, :login, {class: 'input-block-level', placeholder: _("Username") })%> - <%= text_field(:user, :email, {class: 'input-block-level', placeholder: _("Email") })%> - + <%= text_field(:user, :login, {class: 'input-block-level', placeholder: t(".username") })%> + <%= text_field(:user, :email, {class: 'input-block-level', placeholder: t(".email") })%> + <% end %> <%- content_for :account_links do %> diff --git a/config/locales/da.yml b/config/locales/da.yml index 9859ee1bf6..6d16ec4e26 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -40,3 +40,10 @@ da: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Brugernavn" + email: "Email" + signup: "Tilmelding" diff --git a/config/locales/de.yml b/config/locales/de.yml index f32550c4c5..02c0aeaa1a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -40,3 +40,10 @@ de: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Benutzername" + email: "Email" + signup: "Registrieren" diff --git a/config/locales/en.yml b/config/locales/en.yml index da7c2ef564..4efd371920 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,3 +40,10 @@ en: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Username" + email: "Email" + signup: "Signup" diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 329395f106..7c337277e4 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -40,3 +40,11 @@ es-MX: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Usuario" + email: "Email" + signup: "Registro" + diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9ec7749727..d575f30397 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -39,3 +39,10 @@ fr: confirm: proceed_to: "Allez sur %{link}" admin: "l'administration" + recover_password: + username_or_email: "Identifiant ou email" + reset_my_password: "Me renvoyer un mot de passe" + signup: + username: "Identifiant" + email: "Email" + signup: "S'inscrire" diff --git a/config/locales/he-IL.yml b/config/locales/he-IL.yml index d493b217d5..6fbd9cfd57 100644 --- a/config/locales/he-IL.yml +++ b/config/locales/he-IL.yml @@ -40,3 +40,10 @@ he-IL: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "שם משתמש" + email: "דואל" + signup: "הירשם" diff --git a/config/locales/it.yml b/config/locales/it.yml index 69866c401d..478a5b4c6b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -40,3 +40,10 @@ it: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Nome Utente" + email: "Email" + signup: "Iscrizione" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 22571c4a20..fcd5292306 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -40,3 +40,10 @@ ja: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "ユーザー名" + email: "メールアドレス" + signup: "サインアップ" diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 2b43ca5306..68a15aa335 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -40,3 +40,10 @@ lt: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Vartotojo vardas" + email: "El. pašto adresas" + signup: "Registracija" diff --git a/config/locales/nb-NO.yml b/config/locales/nb-NO.yml index 962059c15c..485e4a867c 100644 --- a/config/locales/nb-NO.yml +++ b/config/locales/nb-NO.yml @@ -38,4 +38,10 @@ nb-NO: confirm: proceed_to: "Fortsett til %s" admin: "admin" - + recover_password: + username_or_email: "Brukernavn eller epost" + reset_my_password: "Nullstill passordet mitt" + signup: + username: "Brukernavn" + email: "Epost" + signup: "Registrer" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index f0d2c282e7..81e1ce664b 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -40,3 +40,10 @@ nl: confirm: proceed_to: "Ga door naar %s" admin: "admin" + recover_password: + username_or_email: "Gebruikersnaam of e-mail" + reset_my_password: "Reset my password" + signup: + username: "Gebruikersnaam" + email: "E-mail" + signup: "Meld aan" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 670c5a2995..18d4b0cb2c 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -40,3 +40,10 @@ pl: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Użytkownik" + email: "Email" + signup: "Zapisz się" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 5acc513dcd..a9d1389854 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -40,5 +40,11 @@ pt-BR: confirm: proceed_to: "Proceed to %{link}" admin: "admin" - + recover_password: + username_or_email: "Usuario ou e-mail" + reset_my_password: "Reset my password" + signup: + username: "Usuario" + email: "Email" + signup: "Registrar" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 6d20c9be76..08169713f0 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -40,3 +40,10 @@ ro: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "Utilizator" + email: "Email" + signup: "Înregistrare" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8b47fff6b4..4783c8a184 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -40,3 +40,10 @@ ru: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Имя пользователи или email" + reset_my_password: "Reset my password" + signup: + username: "Username" + email: "Email" + signup: "Signup" diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 4f029237f9..52f1cd05b1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -40,3 +40,10 @@ zh-CN: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "用户名或邮箱" + reset_my_password: "Reset my password" + signup: + username: "用户名" + email: "Email" + signup: "注册" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 8add64637c..103cacec66 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -40,3 +40,10 @@ zh-TW: confirm: proceed_to: "Proceed to %{link}" admin: "admin" + recover_password: + username_or_email: "Username or email" + reset_my_password: "Reset my password" + signup: + username: "名稱" + email: "Email" + signup: "註冊" diff --git a/lang/da_DK.rb b/lang/da_DK.rb index a82abbd216..f507cbde09 100644 --- a/lang/da_DK.rb +++ b/lang/da_DK.rb @@ -153,14 +153,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Brugernavn" - l.store "Email", "Email" - l.store "Signup", "Tilmelding" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Arranger" l.store "Sort alphabetically", "Sortér alfabetisk" @@ -230,7 +222,7 @@ l.store "SmartyPants", "" l.store "Visual", "" l.store "Edit article", "" - + # app/views/admin/dashboard/_comments.html.erb l.store "Latest Comments", "Seneste kommentarer" l.store "No comments yet", "Der er ingen kommentarer endnu" @@ -378,7 +370,7 @@ l.store "Global settings", "" l.store "This will display", "" l.store "at the bottom of each post in the RSS feed", "" - l.store "Here you can add anything you want to appear in your application header, such as analytics service tracking code.", "" + l.store "Here you can add anything you want to appear in your application header, such as analytics service tracking code.", "" # app/views/admin/seo/permalinks.html.erb l.store "Publify offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links.", "" @@ -543,7 +535,7 @@ l.store "RSS and Atom feeds", "" l.store "XML Syndication", "" l.store "remove", "supprimer" - + # app/views/admin/tags/_form.html.erb l.store "Display name", "Vis navn" diff --git a/lang/de_DE.rb b/lang/de_DE.rb index 7b478034a0..b326f536e2 100644 --- a/lang/de_DE.rb +++ b/lang/de_DE.rb @@ -153,14 +153,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Benutzername" - l.store "Email", "Email" - l.store "Signup", "Registrieren" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Sortieren" l.store "Sort alphabetically", "Alphabetisch sortieren" diff --git a/lang/es_MX.rb b/lang/es_MX.rb index c656802b8a..ea1a5a87d9 100644 --- a/lang/es_MX.rb +++ b/lang/es_MX.rb @@ -155,14 +155,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Usuario" - l.store "Email", "Email" - l.store "Signup", "Registro" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Reorganizar" l.store "Sort alphabetically", "Ordenar alfabéticamente" diff --git a/lang/fr_FR.rb b/lang/fr_FR.rb index a2e8271e93..79042c0120 100644 --- a/lang/fr_FR.rb +++ b/lang/fr_FR.rb @@ -156,14 +156,6 @@ # app/models/post_type.rb l.store "This article type already exists", "" - # app/views/accounts/recover_password.html.erb - l.store "Reset my password", "Me renvoyer un mot de passe" - l.store "Username or email", "Identifiant ou email" - - # app/views/accounts/signup.html.erb - l.store "Username", "Identifiant" - l.store "Email", "Email" - l.store "Signup", "S'inscrire" # app/views/admin/cache/index.html.erb l.store "To save resources Publify caches content in static files. Cache is cleared each time something gets published. You may however want to clear the cache yourself.", "Afin d'économiser des ressources, Publify génère des fichiers statiques avec votre contenu. Ces fichiers sont supprimés lors d'une nouvelle publication. Vous pouvez cependant les effacer vous même." diff --git a/lang/he_IL.rb b/lang/he_IL.rb index 82c170efca..cf62e8d52a 100644 --- a/lang/he_IL.rb +++ b/lang/he_IL.rb @@ -153,14 +153,6 @@ l.store "Just Marked As Spam", "סומן כספאם" l.store "Spam", "ספאם" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "שם משתמש" - l.store "Email", "דואל" - l.store "Signup", "הירשם" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "סדר מחדש" l.store "Sort alphabetically", "מיין לפי האלף-בית" diff --git a/lang/it_IT.rb b/lang/it_IT.rb index a3697447b5..9bab66844e 100644 --- a/lang/it_IT.rb +++ b/lang/it_IT.rb @@ -153,14 +153,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Nome Utente" - l.store "Email", "Email" - l.store "Signup", "Iscrizione" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Riordina" l.store "Sort alphabetically", "Ordina alfabeticamente" diff --git a/lang/ja_JP.rb b/lang/ja_JP.rb index a2735f43d0..e9df673ea4 100644 --- a/lang/ja_JP.rb +++ b/lang/ja_JP.rb @@ -153,14 +153,6 @@ l.store "Just Marked As Spam", "スパムマーク" l.store "Spam", "スパム" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "ユーザー名" - l.store "Email", "メールアドレス" - l.store "Signup", "サインアップ" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "並べ替え" l.store "Sort alphabetically", "アルファベット順に並べ替え" diff --git a/lang/lt_LT.rb b/lang/lt_LT.rb index 6f5ed20fef..fc3044fcd9 100644 --- a/lang/lt_LT.rb +++ b/lang/lt_LT.rb @@ -153,14 +153,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Vartotojo vardas" - l.store "Email", "El. pašto adresas" - l.store "Signup", "Registracija" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Rikiuoti" l.store "Sort alphabetically", "Rikiuoti pagal abėcėlę" diff --git a/lang/nb_NO.rb b/lang/nb_NO.rb index f8649efee6..a43b8f9a5f 100644 --- a/lang/nb_NO.rb +++ b/lang/nb_NO.rb @@ -174,14 +174,6 @@ l.store "Just Marked As Spam", "Kun markert som Spam" l.store "Spam", "Spam" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "Brukernavn eller epost" - l.store "Reset my password", "Nullstill passordet mitt" - - # app/views/accounts/signup.html.erb - l.store "Username", "Brukernavn" - l.store "Email", "Epost" - l.store "Signup", "Registrer" # app/views/admin/cache/index.html.erb l.store "To save resources Publify caches content in static files. Cache is cleared each time something gets published. You may however want to clear the cache yourself.", diff --git a/lang/nl_NL.rb b/lang/nl_NL.rb index 8e3c181aec..a94e9ce42e 100644 --- a/lang/nl_NL.rb +++ b/lang/nl_NL.rb @@ -152,14 +152,6 @@ l.store "Just Marked As Spam", "Zojuist gemarkeerd als Spam" l.store "Spam", "Spam" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "Gebruikersnaam of e-mail" - - # app/views/accounts/signup.html.erb - l.store "Username", "Gebruikersnaam" - l.store "Email", "E-mail" - l.store "Signup", "Meld aan" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Orden opnieuw" l.store "Sort alphabetically", "Sorteer alfabetisch" diff --git a/lang/pl_PL.rb b/lang/pl_PL.rb index 3312548d25..24747d6e08 100644 --- a/lang/pl_PL.rb +++ b/lang/pl_PL.rb @@ -156,14 +156,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Użytkownik" - l.store "Email", "Email" - l.store "Signup", "Zapisz się" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Zmień porządek" l.store "Sort alphabetically", "Sortuj alfabetycznie" diff --git a/lang/pt_BR.rb b/lang/pt_BR.rb index 7189c8cca9..0fa69fb534 100644 --- a/lang/pt_BR.rb +++ b/lang/pt_BR.rb @@ -158,14 +158,6 @@ # app/views/accounts/login.html.erb l.store "Submit", "Enviar" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "Usuario ou e-mail" - - # app/views/accounts/signup.html.erb - l.store "Username", "Usuario" - l.store "Email", "Email" - l.store "Signup", "Registrar" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Reorganizar" l.store "Sort alphabetically", "Ordenar alfabéticamente" diff --git a/lang/ro_RO.rb b/lang/ro_RO.rb index 07cf04741c..26f1d83473 100644 --- a/lang/ro_RO.rb +++ b/lang/ro_RO.rb @@ -136,14 +136,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "Utilizator" - l.store "Email", "Email" - l.store "Signup", "Înregistrare" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "Ordonează" l.store "Sort alphabetically", "Ordonează alfabetic" diff --git a/lang/ru_RU.rb b/lang/ru_RU.rb index cc21b6a8cb..7f8b3d3be9 100644 --- a/lang/ru_RU.rb +++ b/lang/ru_RU.rb @@ -68,9 +68,6 @@ l.store "password", "пароль" l.store "Submit", "Войти" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "Имя пользователи или email" - # app/views/admin/categories/_categories.html.erb l.store "Sort alphabetically", "Сортировать по алфавиту" diff --git a/lang/zh_CN.rb b/lang/zh_CN.rb index 860b124c1c..8da2028913 100644 --- a/lang/zh_CN.rb +++ b/lang/zh_CN.rb @@ -156,14 +156,6 @@ # app/views/accounts/login.html.erb l.store "Submit", "提交" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "用户名或邮箱" - - # app/views/accounts/signup.html.erb - l.store "Username", "用户名" - l.store "Email", "Email" - l.store "Signup", "注册" - # app/views/admin/categories/_categories.html.erb l.store "Reorder", "重新排序" l.store "Sort alphabetically", "依字母顺序排序" diff --git a/lang/zh_TW.rb b/lang/zh_TW.rb index b71ac1d358..a6fbf48ccd 100644 --- a/lang/zh_TW.rb +++ b/lang/zh_TW.rb @@ -153,13 +153,6 @@ l.store "Just Marked As Spam", "" l.store "Spam", "" - # app/views/accounts/recover_password.html.erb - l.store "Username or email", "" - - # app/views/accounts/signup.html.erb - l.store "Username", "名稱" - l.store "Email", "Email" - l.store "Signup", "註冊" # app/views/admin/categories/_categories.html.erb l.store "Reorder", "重新排序"