From cb3673551443a5f1600322e94d86665603b281b8 Mon Sep 17 00:00:00 2001 From: Andrew Radev Date: Mon, 10 Aug 2015 15:03:19 +0300 Subject: [PATCH] Translations and adjustments --- .../app/views/open_fest/events/new.slim | 3 + .../app/views/open_fest/shared/_nav.slim | 2 +- .../config/locales/simple_form.bg.yml | 26 +++---- .../config/locales/simple_form.en.yml | 30 +++----- lib/open_fest/config/locales/views.bg.yml | 5 +- lib/open_fest/config/locales/views.en.yml | 71 +++++++++++++++++++ 6 files changed, 95 insertions(+), 42 deletions(-) create mode 100644 lib/open_fest/config/locales/views.en.yml diff --git a/lib/open_fest/app/views/open_fest/events/new.slim b/lib/open_fest/app/views/open_fest/events/new.slim index a329a4b..af001ac 100644 --- a/lib/open_fest/app/views/open_fest/events/new.slim +++ b/lib/open_fest/app/views/open_fest/events/new.slim @@ -2,8 +2,11 @@ p = form.error_notification + h2= t('submit_event', event_type: @event_type.name) + .form-inputs = form.input :event_type_id, as: :hidden + = form.input :title, autofocus: true = form.input :subtitle diff --git a/lib/open_fest/app/views/open_fest/shared/_nav.slim b/lib/open_fest/app/views/open_fest/shared/_nav.slim index 7f05161..3e6b2c5 100644 --- a/lib/open_fest/app/views/open_fest/shared/_nav.slim +++ b/lib/open_fest/app/views/open_fest/shared/_nav.slim @@ -6,7 +6,7 @@ nav div ul.menu li - a href="#" = t('views.navigation.submit_event') + a href=events_path = t('views.navigation.submit_event') li a href="#" = t('views.navigation.become_a_volunteer') li diff --git a/lib/open_fest/config/locales/simple_form.bg.yml b/lib/open_fest/config/locales/simple_form.bg.yml index 4162687..9c04343 100644 --- a/lib/open_fest/config/locales/simple_form.bg.yml +++ b/lib/open_fest/config/locales/simple_form.bg.yml @@ -21,22 +21,12 @@ bg: github: Потребителското Ви име в Github twitter: Потребителското Ви име в Twitter event: - title: Заглавието на лекцията Ви - subtitle: Подзаглавието на лекцията Ви (ако има такова) - track_id: Потокът от лекции, в който искате да попадне лекцията Ви - length: Продължителността на лекция може да бъде от 40 до 45 минути - language: Език, на който ще бъде водена лекцията - abstract: Резюме на лекцията, което да може да бъде прочетено от посетителите (1 абзац) - description: Подробно описание на лекцията (няколко абзаца) + title: Заглавието на събитието Ви + subtitle: Подзаглавието на събитието Ви (ако има такова) + track_id: Потокът от лекции, в който искате да попадне събитието Ви + length: Продължителността на събитието може да бъде от 40 до 45 минути + language: Език, на който ще бъде водено събитието + abstract: Резюме на събитието, което да може да бъде прочетено от посетителите (1 абзац) + description: Подробно описание на събитието (няколко абзаца) notes: Забележки, които искате да споделите с организаторския екип - agreement: Отбележете съгласни ли сте с това лекцията Ви да бъде записана и публикувана под лиценз CC-BY-ND (Creative Commons – Attribution – No Derivatives) - workshop: - title: Заглавието на уъркшопа Ви - subtitle: Подзаглавието на уъркшопа Ви (ако има такова) - track_id: Потокът от уъркшопи, в който искате да попадне уъркшопа Ви - length: Продължителността на всеки уъркшоп може да бъде от 30 до 120 минути - language: Език, на който ще бъде воден уъркшопа - abstract: Резюме на уъркшопа, което да може да бъде прочетено от посетителите (1 абзац) - description: Подробно описание на уъркшопа (няколко абзаца) - notes: Забележки, които искате да споделите с организаторския екип - agreement: Отбележете съгласни ли сте с това уъркшопът Ви да бъде записан и публикуван под лиценз CC-BY-ND (Creative Commons – Attribution – No Derivatives) + agreement: Отбележете съгласни ли сте с това събитието Ви да бъде записано и публикувано под лиценз CC-BY-ND (Creative Commons – Attribution – No Derivatives) diff --git a/lib/open_fest/config/locales/simple_form.en.yml b/lib/open_fest/config/locales/simple_form.en.yml index 227fe0c..770e3e7 100644 --- a/lib/open_fest/config/locales/simple_form.en.yml +++ b/lib/open_fest/config/locales/simple_form.en.yml @@ -20,23 +20,13 @@ en: biography: Describe yourself in a few sentences in third person :) github: Your Github username twitter: Your Twitter username - lecture: - title: Title of your talk - subtitle: Sub-title of your talk (if applicable) - track_id: Track for your talk - length: The length of your talk can be from 40 to 45 minutes - language: Language in which the talk will be presented - abstract: Abstract of the talk, for the visitors - description: Detailed description of the talk, visible to the visitors - notes: Notes on your talk, visible only to the organizers - agreement: Indicate if you accept your lecture to be recorded and published under the CC-BY-ND (Creative Commons – Attribution – No Derivatives) license - workshop: - title: Title of your workshop - subtitle: Sub-title of your workshop (if applicable) - track_id: Track for your workshop - length: The length of the workshop can be from 30 to 120 minutes - language: Language in which the workshop will be conducted - abstract: Abstract of the workshop, visible to the visitors - description: Detailed description of the workshop, visible to the visitors - notes: Notes, visible only to the organizers - agreement: Indicate if you accept your workshop to be recorded and published under the CC-BY-ND (Creative Commons – Attribution – No Derivatives) license + event: + title: Title of your event + subtitle: Sub-title of your event (if applicable) + track_id: Track for your event + length: The length of your event can be from 40 to 45 minutes + language: Language in which the event will be presented + abstract: Abstract of the event, for the visitors + description: Detailed description of the event, visible to the visitors + notes: Notes on your event, visible only to the organizers + agreement: Indicate if you accept that your event will be recorded and published under the CC-BY-ND (Creative Commons – Attribution – No Derivatives) license diff --git a/lib/open_fest/config/locales/views.bg.yml b/lib/open_fest/config/locales/views.bg.yml index 0fae951..5281721 100644 --- a/lib/open_fest/config/locales/views.bg.yml +++ b/lib/open_fest/config/locales/views.bg.yml @@ -5,8 +5,7 @@ bg: home_title: "%{conference} - зов за лектори" what_we_ask: 'Бихме искали да получим предложенията Ви за лекции и уъркшопи, принадлежащи към следните категории до 30 септември 2014г.:' license_notice: 'Имайте предвид, че презентациите ви впоследствие ще бъдат публикувани с лиценз CC-BY-ND (Creative Commons – Attribution – No derivatives).' - submit_lecture: Предложи лекция - submit_workshop: Предложи уъркшоп + submit_event: Предложи %{event_type} resend_instructions_header: Повторно изпращане на инструкции за потвърждаване на акаунт resend_instructions_btn: Изпрати отново инструкциите @@ -74,4 +73,4 @@ bg: suggestion_and_speaker_count: "%{suggestions} предложения от %{speakers} лектори" lecture_was_successfully_confirmed: "Лекцията беше потвърдена успешно" - workshop_was_successfully_confirmed: "Уъркшопът беше потвърден успешно" \ No newline at end of file + workshop_was_successfully_confirmed: "Уъркшопът беше потвърден успешно" diff --git a/lib/open_fest/config/locales/views.en.yml b/lib/open_fest/config/locales/views.en.yml new file mode 100644 index 0000000..61ce57a --- /dev/null +++ b/lib/open_fest/config/locales/views.en.yml @@ -0,0 +1,71 @@ +en: + home_title: "%{conference} - call for speakers" + what_we_ask: 'Please send us applications for talks and workshops in the following categories until September 30, 2014:' + license_notice: 'Keep in mind that your workshop/presentation will later be published under the CC-BY-ND (Creative Commons – Attribution – No derivatives) license.' + submit_event: Submit %{event_type} + 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 + + login_data: Login data + login_with: "Login with %{with}" + + speaker_profile: Speaker's profile + please_fill_in_your_speaker_profile: Please fill in your speaker 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 e-mail. + update: Update + + resend_unlock_instructions_title: Re-send unlocking instructions + + edit_speaker_profile: Edit profile + + edit_workshop: Edit workshop + + edit_title: "track: „%{track}“, duration: %{len} min." + abstract: Abstract + description: Description + edit: Edit + + new_workshop_title: Submit new workshop + + my_workshops: My submitted workshops + no_workshops_submitted: You have no submissions for workshops + + edit_talk: Edit talk + + submit_talk_header: Submit new talk + + my_talks: My submitted talks + no_talks_submitted: You have no submissions for talks + + hello: "Hello, %{name}" + account_locked: Your account was locked because of too many failed login attempts. + click_to_unlock: 'Click on the link below to unlock it:' + + welcome: "Welcome, %{name}" + confirm_by_clicking: 'You can confirm your account by clicking on the link below:' + + someone_requested_passreset: Someone has requested a link to reset the password of your account. Your password can be changed through the link below. + do_not_want_pass_reset1: If you don't want to change your password, please delete this message. + do_not_want_pass_reset2: Your password will not be changed unless you click on the link above and enter a new password. + + home: Home + talks: Lectures + workshops: Workshops + logout: Logout + + of_motto: share the freedom + meta_data: "Language: %{language}, track: \"%{track}\", length: %{length} min." + suggestion_and_speaker_count: "%{suggestions} suggestions by %{speakers} speakers" + + lecture_was_successfully_confirmed: "The lecture was successfully confirmed" + workshop_was_successfully_confirmed: "The workshop was successfully confirmed"