From 0e8552ac4e79f7981e0b3d09136031ca1c957eb7 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Wed, 5 Jun 2013 16:58:52 +0200 Subject: [PATCH] fix #1273. Used the wording suggested in this ticket. --- app/views/recurring_todos/_edit_form.html.erb | 10 +++++----- .../recurring_todos/_recurring_todo_form.html.erb | 10 +++++----- config/locales/cs.yml | 6 ------ config/locales/de.yml | 6 ------ config/locales/en.yml | 13 +++++++------ config/locales/es.yml | 6 ------ config/locales/fr.yml | 7 ------- config/locales/he.yml | 6 ------ config/locales/nl.yml | 13 +++++++------ 9 files changed, 24 insertions(+), 53 deletions(-) diff --git a/app/views/recurring_todos/_edit_form.html.erb b/app/views/recurring_todos/_edit_form.html.erb index 20675f53..dfb94095 100644 --- a/app/views/recurring_todos/_edit_form.html.erb +++ b/app/views/recurring_todos/_edit_form.html.erb @@ -84,12 +84,12 @@ :month => select_tag('recurring_todo[yearly_month_of_year2]', options_for_select(@months_of_year, @recurring_todo.yearly_month_of_year2))) %>
-
- <%= radio_button_tag('recurring_todo[recurring_target]', 'due_date', @recurring_todo.target == 'due_date')%> <%= t('todos.recurrence.recurrence_on_due_date') %>. <%= t('todos.recurrence.show_options') %>: - <%= radio_button_tag('recurring_todo[recurring_show_always]', '1', @recurring_todo.show_always?)%> <%= t('todos.recurrence.show_option_always') %> +
+ <%= radio_button_tag('recurring_todo[recurring_target]', 'due_date', @recurring_todo.target == 'due_date')%> <%= t('todos.recurrence.recurrence_on.due_date') %>. <%= t('todos.recurrence.recurrence_on.show_options') %>: + <%= radio_button_tag('recurring_todo[recurring_show_always]', '1', @recurring_todo.show_always?)%> <%= t('todos.recurrence.recurrence_on.show_always') %> <%= radio_button_tag('recurring_todo[recurring_show_always]', '0', !@recurring_todo.show_always?)%> - <%= raw t('todos.recurrence.show_days_before', :days => text_field_tag( 'recurring_todo[recurring_show_days_before]', @recurring_todo.show_from_delta, {"size" => 3})) %>
- <%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', @recurring_todo.target == 'show_from_date')%> <%= t('todos.recurrence.from_tickler') %>
+ <%= raw t('todos.recurrence.recurrence_on.show_days_before', :days => text_field_tag( 'recurring_todo[recurring_show_days_before]', @recurring_todo.show_from_delta, {"size" => 3})) %>
+ <%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', @recurring_todo.target == 'show_from_date')%> <%= t('todos.recurrence.recurrence_on.from_tickler') %>

<% end %> diff --git a/app/views/recurring_todos/_recurring_todo_form.html.erb b/app/views/recurring_todos/_recurring_todo_form.html.erb index c42a4ed4..644571f5 100644 --- a/app/views/recurring_todos/_recurring_todo_form.html.erb +++ b/app/views/recurring_todos/_recurring_todo_form.html.erb @@ -76,13 +76,13 @@ :month => select_tag('recurring_todo[yearly_month_of_year2]', options_for_select(@months_of_year, Time.zone.now.month))) %>
-
- <%= radio_button_tag('recurring_todo[recurring_target]', 'due_date', true)%> <%= t('todos.recurrence.recurrence_on_due_date') %>. <%= t('todos.recurrence.show_options') %>: - <%= radio_button_tag('recurring_todo[recurring_show_always]', '1', true)%> <%= t('todos.recurrence.show_option_always') %> +
+ <%= radio_button_tag('recurring_todo[recurring_target]', 'due_date', true)%> <%= t('todos.recurrence.recurrence_on.due_date') %>. <%= t('todos.recurrence.recurrence_on.show_options') %>: + <%= radio_button_tag('recurring_todo[recurring_show_always]', '1', true)%> <%= t('todos.recurrence.recurrence_on.show_always') %> <%= radio_button_tag('recurring_todo[recurring_show_always]', '0', false)%> - <%= raw t('todos.recurrence.show_days_before', :days => text_field_tag( 'recurring_todo[recurring_show_days_before]', "0", {"size" => 3})) %> + <%= raw t('todos.recurrence.recurrence_on.show_days_before', :days => text_field_tag( 'recurring_todo[recurring_show_days_before]', "0", {"size" => 3})) %>
- <%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', false)%> <%= t('todos.recurrence.from_tickler') %>
+ <%= radio_button_tag('recurring_todo[recurring_target]', 'show_from_date', false)%> <%= t('todos.recurrence.recurrence_on.from_tickler') %>

diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 158bd703..9328812d 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -830,7 +830,6 @@ cs: ends_on_date: Končí %{date} ends_on_number_times: Končí po %{number} opakováních every_work_day: Každý pracovní den - from_tickler: datum kdy úkol vypadne z Tickleru (není nastaveno plánované datum) monthly: Měsíčně monthly_every_xth_day: '%{day} %{day_of_week} každý %{month}. měsíc' monthly_options: Nastavení pro měsíční opakované úkoly @@ -877,11 +876,6 @@ cs: times: (%{number} opakování) until: do weekly: každý týden - recurrence_on_due_date: datum na které je úkol plánován - recurrence_on_options: Nastavit opakování na - show_days_before: '%{days} dní před plánovaným datem' - show_option_always: stále - show_options: Úkázat úkol starts_on: Začíná weekly: Týdně weekly_every_number_week: Každých %{number} týdnů diff --git a/config/locales/de.yml b/config/locales/de.yml index 7206da1f..9ee6de7d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -848,7 +848,6 @@ de: ends_on_date: Endet am %{date} ends_on_number_times: Endet nach %{number} mal every_work_day: Jeden Arbeitstag - from_tickler: Fälligkeitsdatum kommt vom Notizbuch (keine Fälligkeit setzen) monthly: Monatlich monthly_every_xth_day: Der %{day} %{day_of_week} eines jeden %{month}. Monats monthly_options: Einstellungen für monatliche Aufgaben @@ -895,11 +894,6 @@ de: times: für %{number} Zeiten until: bis weekly: wöchentlich - recurrence_on_due_date: Fälligkeitsdatum - recurrence_on_options: Setze Wiederholung auf - show_days_before: '%{days} Tage bevor die Aufgabe fällig ist' - show_option_always: immer - show_options: Aufgabe anzeigen starts_on: Beginnt am weekly: Wöchentlich weekly_every_number_week: Kehrt jede %{number}. Woche wieder am diff --git a/config/locales/en.yml b/config/locales/en.yml index f239c6d8..b0279b07 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -592,7 +592,6 @@ en: ends_on_number_times: Ends after %{number} times ends_on_date: Ends on %{date} every_work_day: Every work day - recurrence_on_due_date: the date that the todo is due weekly_options: Settings for weekly recurring actions weekly: Weekly monthly_options: Settings for monthly recurring actions @@ -641,16 +640,18 @@ en: due: due until: until every_month: every month - show_option_always: always daily: Daily yearly_every_x_day: Every %{month} %{day} - recurrence_on_options: Set recurrence on + recurrence_on: + options: Use the calculated date to + due_date: set the actions due date + show_options: Show the action + show_always: always + show_days_before: "not until %{days} days before the due date" + from_tickler: set the date the action should be shown (do not set a due date) daily_every_number_day: Every %{number} day(s) - show_options: Show the todo weekly_every_number_week: Returns every %{number} week on ends_on: Ends on - show_days_before: "%{days} days before the todo is due" - from_tickler: the date todo comes from tickler (no due date set) no_end_date: No end date day_x_on_every_x_month: Day %{day} on every %{month} month yearly_options: Settings for yearly recurring actions diff --git a/config/locales/es.yml b/config/locales/es.yml index 8ca87659..117941e3 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -839,7 +839,6 @@ es: ends_on_date: Ends on %{date} ends_on_number_times: Ends after %{number} times every_work_day: Every work day - from_tickler: the date todo comes from tickler (no due date set) monthly: Monthly monthly_every_xth_day: The %{day} %{day_of_week} of every %{month} month monthly_options: Settings for monthly recurring actions @@ -886,11 +885,6 @@ es: times: for %{number} times until: until weekly: weekly - recurrence_on_due_date: the date that the todo is due - recurrence_on_options: Set recurrence on - show_days_before: '%{days} days before the todo is due' - show_option_always: always - show_options: Show the todo starts_on: Starts on weekly: Weekly weekly_every_number_week: Returns every %{number} week on diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d29569e8..e1d055f6 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -889,8 +889,6 @@ fr: ends_on_date: Fini le %{date} ends_on_number_times: Fini au bout de %{number} fois every_work_day: Chaque jour ouvré - from_tickler: la date de la tâche provient du reporteur (pas de date d\'échéance - définie) monthly: Mensuellement monthly_every_xth_day: Le %{day} %{day_of_week} tous les %{month} mois monthly_options: Paramètres pour les actions récurrentes mensuelles @@ -937,11 +935,6 @@ fr: times: pour %{number} fois until: jusqu'a weekly: Toutes les semaines - recurrence_on_due_date: La date d'échéance de la tâche - recurrence_on_options: Activer la récurrence - show_days_before: '%{days} jours avant la date d''échéance de la tâche' - show_option_always: toujours - show_options: Montrer la tâche starts_on: Démarre le weekly: Toutes les semaines weekly_every_number_week: Returns every %{number} week on diff --git a/config/locales/he.yml b/config/locales/he.yml index 155a3fb6..42c384f3 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -766,7 +766,6 @@ he: ends_on_date: מסתיים ב-%{date} ends_on_number_times: מסתיים לאחר %{number} פעמים every_work_day: בכל יום עבודה - from_tickler: תאריך היעד למשימה מגיע מהמִזְכָּר (לא נקבע תאריך יעד) monthly: חודשי monthly_every_xth_day: יום %{day} ה -%{day_of_week} בכל %{month} חודש monthly_options: הגדרות לפעולות בחזוריות חודשית @@ -791,11 +790,6 @@ he: times: כ-%{number} פעמים until: עד weekly: שבועי - recurrence_on_due_date: יעד למשימה - recurrence_on_options: הגדרת מחזוריות לפי - show_days_before: '%{days} ימים לפני תאריך היעד למשימה' - show_option_always: תמיד - show_options: הצגת משימות starts_on: מתחיל ב weekly: שבועי weekly_every_number_week: חוזר כל %{number} שבוע ב diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 89d943f8..e82f6aba 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -933,7 +933,6 @@ nl: ends_on_date: Eindigt op %{date} ends_on_number_times: Eindigt na %{number} keer every_work_day: Elke werkdag - from_tickler: de datum dat de actie uit de tickler komt (geen deadline ingesteld) monthly: Maandelijks monthly_every_xth_day: De %{day} %{day_of_week} van elke %{month} maand monthly_options: Instellingen voor maandelijks terugkerende acties @@ -980,11 +979,6 @@ nl: times: voor %{number} keer until: tot weekly: wekelijks - recurrence_on_due_date: de datum dat deadline van de actie is - recurrence_on_options: Stel herhaling in op - show_days_before: '%{days} dagen voor de deadline van actie' - show_option_always: altijd - show_options: Toon de actie starts_on: Begint op weekly: Wekelijks weekly_every_number_week: Herhaalt elke %{number} weken op @@ -993,6 +987,13 @@ nl: yearly_every_x_day: Elke %{month} %{day} yearly_every_xth_day: De %{day} %{day_of_week} van %{month} yearly_options: Instellingen voor jaarlijks terugkerende acties + recurrence_on: + due_date: 'de deadline van de actie ' + from_tickler: de datum wanneer de actie getoond moet worden (geen deadline) + options: Gebruik de berekende datum voor + show_always: altijd + show_days_before: niet voor %{days} dagen voor de deadline + show_options: Toon de actie recurrence_completed: Er is geen volgende actie na de terugkerende actie die u zojuist hebt voltooid. De herhaling is voltooid recurrence_period: Herhaling periode