From 1f599b8596881260ffd7fe3801db2cd087a175cf Mon Sep 17 00:00:00 2001 From: Vasil Kolev Date: Sun, 31 Aug 2014 21:46:03 +0300 Subject: [PATCH] Partial string extraction and translation --- app/views/devise/confirmations/new.html.slim | 4 +-- app/views/devise/passwords/edit.html.slim | 4 +-- app/views/devise/passwords/new.html.slim | 4 +-- app/views/devise/registrations/edit.html.slim | 12 +++---- app/views/devise/registrations/new.html.slim | 2 +- app/views/devise/sessions/new.html.slim | 4 +-- app/views/devise/shared/_links.html.slim | 12 +++---- app/views/home/index.html.slim | 9 +++-- config/locales/bg.yml | 28 +++++++++++++++- config/locales/en.yml | 33 +++++++++++++++++++ 10 files changed, 85 insertions(+), 27 deletions(-) diff --git a/app/views/devise/confirmations/new.html.slim b/app/views/devise/confirmations/new.html.slim index 4437d9d..966750a 100644 --- a/app/views/devise/confirmations/new.html.slim +++ b/app/views/devise/confirmations/new.html.slim @@ -1,4 +1,4 @@ -h2.entry-title Повторно изпращане на инструкции за потвърждаване на акаунт +h2.entry-title = t :resend_instructions_header = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| = f.error_notification @@ -8,6 +8,6 @@ h2.entry-title Повторно изпращане на инструкции з = f.input :email, required: true, autofocus: true, hint: false .form-actions - = f.button :submit, 'Изпрати отново инструкциите' + = f.button :submit, t(:resend_instructions_btn) == render 'devise/shared/links' diff --git a/app/views/devise/passwords/edit.html.slim b/app/views/devise/passwords/edit.html.slim index 2a698ca..647b4d6 100644 --- a/app/views/devise/passwords/edit.html.slim +++ b/app/views/devise/passwords/edit.html.slim @@ -1,4 +1,4 @@ -h2.entry-title Промяна на парола +h2.entry-title = t :change_pass = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = f.error_notification @@ -11,6 +11,6 @@ h2.entry-title Промяна на парола = f.input :password_confirmation, required: true .form-actions - = f.button :submit, 'Промяна на паролата' + = f.button :submit, t(:change_pass) = render 'devise/shared/links' diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim index 81f8378..964f619 100644 --- a/app/views/devise/passwords/new.html.slim +++ b/app/views/devise/passwords/new.html.slim @@ -1,4 +1,4 @@ -h2.entry-title Забравена парола? +h2.entry-title = t :lostpass = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| = f.error_notification @@ -7,6 +7,6 @@ h2.entry-title Забравена парола? = f.input :email, required: true, autofocus: true, hint: false .form-actions - = f.button :submit, 'Изпрати ми инструкции за промяна на парола' + = f.button :submit, t(:send_lostpass_instructions) == render 'devise/shared/links' diff --git a/app/views/devise/registrations/edit.html.slim b/app/views/devise/registrations/edit.html.slim index c3d6161..60578a9 100644 --- a/app/views/devise/registrations/edit.html.slim +++ b/app/views/devise/registrations/edit.html.slim @@ -1,6 +1,6 @@ = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, multipart: true }) do |f| .form_inputs - h2.entry-title Лекторски профил + h2.entry-title = t :speaker_profile = f.error_notification = f.simple_fields_for :speaker_profile do |ff| = ff.input :picture, as: :image_preview, input_html: {preview_version: :thumb} @@ -14,16 +14,16 @@ = ff.input :biography .form-inputs - h3.entry-title Данни за вход в системата + h3.entry-title = t :login_data = f.input :email, required: true - if devise_mapping.confirmable? && resource.pending_reconfirmation? p - Очаква се потвърждение на: #{resource.unconfirmed_email} + = t :expected_validation, email: resource.unconfirmed_email - = f.input :password, autocomplete: "off", hint: "Не попълвайте, ако не желаете да промените паролата си", required: false + = f.input :password, autocomplete: "off", hint: t(:pass_update_hint1), required: false = f.input :password_confirmation, required: false - = f.input :current_password, hint: "Попълнете, ако искате да промените паролата или имейл адреса си.", required: true + = f.input :current_password, hint: t:(pass_update_hint2), required: true .form-actions - = f.button :submit, 'Обнови' + = f.button :submit, t(:update) diff --git a/app/views/devise/registrations/new.html.slim b/app/views/devise/registrations/new.html.slim index f024368..35e6592 100644 --- a/app/views/devise/registrations/new.html.slim +++ b/app/views/devise/registrations/new.html.slim @@ -1,4 +1,4 @@ -h2.entry-title Регистрация +h2.entry-title = t :registration = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = f.error_notification diff --git a/app/views/devise/sessions/new.html.slim b/app/views/devise/sessions/new.html.slim index fc125ce..ddd4b37 100644 --- a/app/views/devise/sessions/new.html.slim +++ b/app/views/devise/sessions/new.html.slim @@ -1,4 +1,4 @@ -h2.entry-title Вход +h2.entry-title = t :login = simple_form_for(resource, as: resource_name, url: session_path(resource_name), ) do |f| .form-inputs @@ -7,6 +7,6 @@ h2.entry-title Вход = f.input :remember_me, as: :boolean if devise_mapping.rememberable? .form-actions - = f.button :submit, 'Влез' + = f.button :submit, t(:login) == render 'devise/shared/links' diff --git a/app/views/devise/shared/_links.html.slim b/app/views/devise/shared/_links.html.slim index 366b7c3..08d389c 100644 --- a/app/views/devise/shared/_links.html.slim +++ b/app/views/devise/shared/_links.html.slim @@ -1,23 +1,23 @@ - if controller_name != 'sessions' - = link_to 'Вход', new_session_path(resource_name) + = link_to t(:enter)', new_session_path(resource_name) br - if devise_mapping.registerable? && controller_name != 'registrations' - = link_to 'Регистрация', new_registration_path(resource_name) + = link_to t(:registration), new_registration_path(resource_name) br - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' - = link_to 'Забравена парола?', new_password_path(resource_name) + = link_to t(:lostpass), new_password_path(resource_name) br - if devise_mapping.confirmable? && controller_name != 'confirmations' - = link_to 'Не Сте получили инструкции за потвърждение?', new_confirmation_path(resource_name) + = link_to t(:did_not_get_confirmation), new_confirmation_path(resource_name) br - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' - = link_to 'Не Сте получили инструкции за отключване?', new_unlock_path(resource_name) + = link_to t(:did_not_get_unlock), new_unlock_path(resource_name) br - if devise_mapping.omniauthable? - resource_class.omniauth_providers.each do |provider| - = link_to 'Влез с #{provider.to_s.titleize}', omniauth_authorize_path(resource_name, provider) + = link_to t(:login_with, with: @provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) diff --git a/app/views/home/index.html.slim b/app/views/home/index.html.slim index ef351a3..9cbece4 100644 --- a/app/views/home/index.html.slim +++ b/app/views/home/index.html.slim @@ -1,14 +1,13 @@ -h1.entry-title #{@current_conference.title} - призив за лектори +h1.entry-title = t :home_title, conference: @current_conference.title = simple_format @current_conference.description -p Бихме искали да получим предложенията Ви за лекции и уъркшопи, принадлежащи - към следните категории: +p =t :what_we_ask ul - for track in @current_conference.tracks li = track.name .centered.large - => link_to 'Предложи лекция', new_lecture_path, class: 'btn-link btn-link-large' - = link_to 'Предложи уъркшоп', new_workshop_path, class: 'btn-link btn-link-large' + => link_to t(:submit_lecture), new_lecture_path, class: 'btn-link btn-link-large' + = link_to t(:submit_workshop), new_workshop_path, class: 'btn-link btn-link-large' diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 91c3d13..a26c514 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -77,4 +77,30 @@ bg: confirmation: не съответства на паролата errors: messages: - improbable_phone: 'не е валиден телефонен номер' \ No newline at end of file + improbable_phone: 'не е валиден телефонен номер' + + home_title: %{conference} - зов за лектори + what_we_ask: Бихме искали да получим предложенията Ви за лекции и уъркшопи, принадлежащи към следните категории: + submit_lecture: Предложи лекция + submit_workshop: Предложи уъркшоп + resend_instructions_header: Повторно изпращане на инструкции за потвърждаване на акаунт + resend_instructions_btn: Изпрати отново инструкциите + + enter: Вход + registration: Регистрация + lostpass: Забравена парола? + did_not_get_confirmation: Не сте получили инструкции за потвърждение? + did_not_get_unlock: Не сте получили инструкции за отключване? + change_pass: Промяна на парола + send_lostpass_instructions: Изпрати ми инструкции за промяна на парола + + login_data: Данни за вход в системата + login_with: Влез с %{with} + + speaker_profile: Лекторски профил + expected_validation: Очаква се потвърждение на: %{email} + pass_update_hint1: Не попълвайте, ако не желаете да промените паролата си + pass_update_hint2: Попълнете, ако искате да промените паролата или имейл адреса си. + update: Обнови + + diff --git a/config/locales/en.yml b/config/locales/en.yml index 7a3acb9..78b153e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -78,3 +78,36 @@ en: errors: messages: improbable_phone: 'not a valid phone number' + + home_title: "%{conference} - call for speakers" + what_we_ask: Please send us applications for talks and workshops in the following categories: + submit_lecture: Submit lecture + submit_workshop: Submit workshop + resend_instructions_header: Re-send the instructions for confirming an account + resend_instructions_btn: Re-send instructions + enter: Login + login: Login + registration: Registration + lostpass: Lost password? + did_not_get_confirmation: Did not get confirmation instructions? + did_not_get_unlock: Did not get unlocking instructions? + change_pass: Change password + send_lostpass_instructions: Send instructions to reset lost password + + enter: Вход + registration: Регистрация + lostpass: Забравена парола? + did_not_get_confirmation: Не сте получили инструкции за потвърждение? + did_not_get_unlock: Не сте получили инструкции за отключване? + change_pass: Промяна на парола + send_lostpass_instructions: Изпрати ми инструкции за промяна на парола + + login_data: Login data + login_with: Login with %{with} + + speaker_profile: Speaker's profile + expected_validation: Expected confirmation of: %{email} + pass_update_hint1: Do not fill, if you do not want to change your password + pass_update_hint2: Fill this if you want to change your password or email. + update: Обнови +