From 575928d8a3be43f42fd2ba1e47a47e29d232ba3a Mon Sep 17 00:00:00 2001 From: wvengen Date: Tue, 7 Oct 2014 01:06:21 +0200 Subject: [PATCH] fix use_messages heading in config screen (closes foodcoops#319) --- config/locales/en.yml | 2 +- config/locales/nl.yml | 2 +- .../configs/_tab_messages/add_config.html.haml.deface | 2 +- lib/foodsoft_messages/config/locales/en.yml | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 5092f259..92c8a5f3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -502,7 +502,7 @@ en: time_zone: Time zone tolerance_is_costly: Tolerance is costly use_apple_points: Apple points - use_messages: Enable messages + use_messages: Messages use_nick: Use nicknames use_wiki: Enable wiki webstats_tracking_code: Tracking code diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 080d6d74..8067c12f 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -499,7 +499,7 @@ nl: time_zone: Tijdzone tolerance_is_costly: Tolerantie is duur use_apple_points: Appelpunten - use_messages: Berichten gebruiken + use_messages: Berichten use_nick: Bijnamen gebruiken use_wiki: Wiki gebruiken tabs: diff --git a/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface b/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface index 41af5566..9f8091fb 100644 --- a/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface +++ b/lib/foodsoft_messages/app/overrides/admin/configs/_tab_messages/add_config.html.haml.deface @@ -1,4 +1,4 @@ / insert_bottom ':root:last-child' -= config_use_heading form, :use_messages, label: 'Messages' do += config_use_heading form, :use_messages do = config_input form, :mailing_list, as: :string, input_html: {class: 'input-xlarge'} = config_input form, :mailing_list_subscribe, as: :string, input_html: {class: 'input-xlarge'} diff --git a/lib/foodsoft_messages/config/locales/en.yml b/lib/foodsoft_messages/config/locales/en.yml index c300d3b1..abeb9e07 100644 --- a/lib/foodsoft_messages/config/locales/en.yml +++ b/lib/foodsoft_messages/config/locales/en.yml @@ -17,6 +17,15 @@ en: users: show: send_message: Send message + config: + hints: + mailing_list: Mailing-list email address to use instead of the messaging system for mail to all members. + mailing_list_subscribe: Email address where members can send an email to for subscribing. + use_messages: Allow members to communicate with each other within Foodsoft. + keys: + use_messages: Messages + mailing_list: Mailing-list + mailing_list_subscribe: Mailing-list subscribe helpers: messages: write_message: Write message