From 3e4c91d07eee8b162e953013fe5682d2bbf38007 Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 18 Aug 2017 10:47:04 -0700 Subject: [PATCH 1/3] Added translation for admin error message --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index e0fc616..7051da8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1244,6 +1244,7 @@ en: space: companions: This host wishes to be housed with %{name} admin: + save_block_days_required: Select at least one day administrators: Error updating organizations dates: Error updating dates description: Error saving your conference description From 2f1ec5e1b5658b52be7dac5201993a1061e3c971 Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 18 Aug 2017 11:15:54 -0700 Subject: [PATCH 2/3] Fixed error editing locations --- .../conference_administration/administration_step.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/conference_administration/administration_step.html.haml b/app/views/conference_administration/administration_step.html.haml index 211975c..68f6184 100644 --- a/app/views/conference_administration/administration_step.html.haml +++ b/app/views/conference_administration/administration_step.html.haml @@ -38,4 +38,4 @@ = columns(medium: 12) do %p=((_"articles.admin.#{@admin_group}.descriptions.#{@admin_step}", :s)) unless @hide_description === true = row do - = render @admin_step + = render @admin_step.to_s From b26d601cf9b7cf1d6839362eaf1b4cbb69e59d17 Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 18 Aug 2017 12:08:31 -0700 Subject: [PATCH 3/3] Added missing admin strings --- config/locales/en.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 7051da8..89eb1ce 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1174,7 +1174,8 @@ en: format: "%{attribute} %{message}" messages: schedule: - need_not_available: '%{workshop_title} workshop requires %{need} but %{location} does not have this amenity' + need_not_available: This workshop requires %{need} but the location does not have this amenity + common_facilitator: '%{facilitator_name} is facilitating %{workshop_title} at the same time at this workshop' accepted: must be accepted blank: can't be blank present: must be blank