From 741d6da32a683a7a505ff6da5c2b701da9fc5c74 Mon Sep 17 00:00:00 2001 From: Daniel Felix Date: Fri, 20 Jun 2014 09:17:20 +0000 Subject: [PATCH 1/5] Corrected language key --- app/models/uc_period.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/uc_period.rb b/app/models/uc_period.rb index 7b7e1a2..2eff436 100644 --- a/app/models/uc_period.rb +++ b/app/models/uc_period.rb @@ -42,17 +42,17 @@ def txt_to_notify(add_body=true) if active?(time) msg = l(:label_dear_colleagues)+"\n\n" - msg << l(:infromation_technical_operations_emergency, :time_end => format_time(end_date-to))+"\n\n" + msg << l(:information_technical_operations_emergency, :time_end => format_time(end_date-to))+"\n\n" msg << custom_message if add_body && custom_message && custom_message != '' elsif planning?(time) msg = l(:label_dear_colleagues)+"\n\n" - msg << l(:infromation_technical_operations_planing, :time_start => format_time(begin_date-to), :time_end => format_time(end_date-to))+"\n\n" + msg << l(:information_technical_operations_planing, :time_start => format_time(begin_date-to), :time_end => format_time(end_date-to))+"\n\n" msg << custom_message if add_body && custom_message && custom_message != '' elsif manual_off?(time) msg = l(:label_dear_colleagues)+"\n\n" - msg << l(:infromation_technical_operations_ends) + msg << l(:information_technical_operations_ends) end msg end -end \ No newline at end of file +end From d541aae9101d47832d1bc5b6eab0513f068f3e43 Mon Sep 17 00:00:00 2001 From: Daniel Felix Date: Fri, 20 Jun 2014 09:18:03 +0000 Subject: [PATCH 2/5] Changed language key --- config/locales/ru.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index eee3ab9..767ab29 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -13,9 +13,9 @@ ru: warning_technical_operations_in_progress: "Технические работы!" label_dear_colleagues: "Уважаемые коллеги!" - infromation_technical_operations_planing: "На сервере Redmine с %{time_start} по %{time_end} будут проводиться технические работы! Просим завершить свою деятельность в RM к указанному периоду." - infromation_technical_operations_ends: "Технические работы завершены. Redmine работает в штатном режиме" - infromation_technical_operations_emergency: "На сервере Redmine проводятся технические работы, которые продлятся по %{time_end}." + information_technical_operations_planing: "На сервере Redmine с %{time_start} по %{time_end} будут проводиться технические работы! Просим завершить свою деятельность в RM к указанному периоду." + information_technical_operations_ends: "Технические работы завершены. Redmine работает в штатном режиме" + information_technical_operations_emergency: "На сервере Redmine проводятся технические работы, которые продлятся по %{time_end}." - infromation_technical_operations_emergency_html: "На сервере Redmine проводятся технические работы, которые продлятся по %{time_end}" + information_technical_operations_emergency_html: "На сервере Redmine проводятся технические работы, которые продлятся по %{time_end}" From 0ec61768eaf98933a873b2815a33879aade0e5ae Mon Sep 17 00:00:00 2001 From: Daniel Felix Date: Fri, 20 Jun 2014 09:18:31 +0000 Subject: [PATCH 3/5] changed language key --- config/locales/en.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 3edd99f..370acac 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -14,8 +14,8 @@ en: warning_technical_operations_in_progress: "Warning technical operations in progress!" label_dear_colleagues: "Dear colleagues!" - infromation_technical_operations_planing: "Redmine server will be under maintenance from %{time_start} till %{time_end}! Please complete your activities in RM to this period." - infromation_technical_operations_ends: "Technical operations completed. Redmine is operating normally" - infromation_technical_operations_emergency: "Redmine server is under maintenance till %{time_end}." + information_technical_operations_planing: "Redmine server will be under maintenance from %{time_start} till %{time_end}! Please complete your activities in RM to this period." + information_technical_operations_ends: "Technical operations completed. Redmine is operating normally" + information_technical_operations_emergency: "Redmine server is under maintenance till %{time_end}." - infromation_technical_operations_emergency_html: "Redmine server is under maintenance till %{time_end}" + information_technical_operations_emergency_html: "Redmine server is under maintenance till %{time_end}" From c75aff6a6f9ef6ce1eefd79219bf3bc7b8278d3b Mon Sep 17 00:00:00 2001 From: Daniel Felix Date: Fri, 20 Jun 2014 09:18:49 +0000 Subject: [PATCH 4/5] changed language key --- config/locales/de.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index a4a97ba..ba9aee9 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -14,8 +14,8 @@ de: warning_technical_operations_in_progress: "Achtung, technische Wartungsarbeiten werden durchgeführt!" label_dear_colleagues: "Liebe Kollegen!" - infromation_technical_operations_planing: "Der Redmine Server wird für die Zeit vom %{time_start} bis %{time_end} gewartet! Bitte schließen Sie Ihre Aktivitäten bis zu diesem Zeitfenster ab." - infromation_technical_operations_ends: "Technische Wartungsarbeiten wurden abgeschlossen. Redmine arbeitet normal." - infromation_technical_operations_emergency: "Der Redmine Server ist unter Wartung bis %{time_end}." + information_technical_operations_planing: "Der Redmine Server wird für die Zeit vom %{time_start} bis %{time_end} gewartet! Bitte schließen Sie Ihre Aktivitäten bis zu diesem Zeitfenster ab." + information_technical_operations_ends: "Technische Wartungsarbeiten wurden abgeschlossen. Redmine arbeitet normal." + information_technical_operations_emergency: "Der Redmine Server ist unter Wartung bis %{time_end}." - infromation_technical_operations_emergency_html: "Der Redmine Server ist unter Wartung bis %{time_end}" + information_technical_operations_emergency_html: "Der Redmine Server ist unter Wartung bis %{time_end}" From b789e12236671f7ba00973b306837b6e228fcd37 Mon Sep 17 00:00:00 2001 From: Daniel Felix Date: Fri, 20 Jun 2014 09:19:09 +0000 Subject: [PATCH 5/5] Corrected language key --- config/locales/bg.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 984236b..f002527 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -14,8 +14,8 @@ bg: warning_technical_operations_in_progress: "Техническа поддръжка" label_dear_colleagues: "Уважаеми потребители!" - infromation_technical_operations_planing: "Redmine е в техническа поддръжка от %{time_start} до %{time_end}. Моля да завършите работата си в Redmine до началото на периода." - infromation_technical_operations_ends: "Техническата поддръжка е завършена. Redmine работи нормално." - infromation_technical_operations_emergency: "Redmine е в техническа поддръжка, която ще продължи до %{time_end}." + information_technical_operations_planing: "Redmine е в техническа поддръжка от %{time_start} до %{time_end}. Моля да завършите работата си в Redmine до началото на периода." + information_technical_operations_ends: "Техническата поддръжка е завършена. Redmine работи нормално." + information_technical_operations_emergency: "Redmine е в техническа поддръжка, която ще продължи до %{time_end}." - infromation_technical_operations_emergency_html: "Redmine е в техническа поддръжка, която ще продължи до %{time_end}" + information_technical_operations_emergency_html: "Redmine е в техническа поддръжка, която ще продължи до %{time_end}"