Download as
Browse Code »

Commit 6761d8c0032df811e58357107a970909aee2ff0d

Authored by Rodrigo Souto
2 parents dd350afd 502cd82c
Exists in ratings_minor_fixes and in 3 other branches fix_sign_up_form, organization_ratings_improvements, profile_api_improvements

Merge branch 'admin_notification_translations' into 'master' 

admin_notifications: checkbox message for profile

Changes "homepage" checkbox message when the notification is for a profile.

See merge request !923
Showing 3 changed files with 10 additions and 3 deletions   Show diff stats
plugins/admin_notifications/po/admin_notifications.pot
  Diff comments   View file @6761d8c
@@ -8,8 +8,8 @@ msgid "" @@ -8,8 +8,8 @@ msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2016-05-16 14:48-0300\n"  
12 -"PO-Revision-Date: 2016-05-16 14:48-0300\n" 11 +"POT-Creation-Date: 2016-05-17 15:38-0300\n"
  12 +"PO-Revision-Date: 2016-05-17 15:38-0300\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
15 "Language: \n" 15 "Language: \n"
@@ -113,6 +113,10 @@ msgid &quot;Red - Danger&quot; @@ -113,6 +113,10 @@ msgid &quot;Red - Danger&quot;
113 msgstr "" 113 msgstr ""
114 114
115 #: ../views/shared/_form.html.erb:23 115 #: ../views/shared/_form.html.erb:23
  116 +msgid "Display only in the profile homepage"
  117 +msgstr ""
  118 +
  119 +#: ../views/shared/_form.html.erb:23
116 msgid "Display only in the homepage" 120 msgid "Display only in the homepage"
117 msgstr "" 121 msgstr ""
118 122
plugins/admin_notifications/po/pt/admin_notifications.po
  Diff comments   View file @6761d8c
@@ -89,6 +89,9 @@ msgstr &quot;Verde - Sucesso&quot; @@ -89,6 +89,9 @@ msgstr &quot;Verde - Sucesso&quot;
89 msgid "Red - Danger" 89 msgid "Red - Danger"
90 msgstr "Vermelho - Perigo" 90 msgstr "Vermelho - Perigo"
91 91
  92 +msgid "Display only in the profile homepage"
  93 +msgstr "Apresentar apenas na página inicial do perfil"
  94 +
92 msgid "Display only in the homepage" 95 msgid "Display only in the homepage"
93 msgstr "Apresentar apenas na página inicial" 96 msgstr "Apresentar apenas na página inicial"
94 97
plugins/admin_notifications/views/shared/_form.html.erb
  Diff comments   View file @6761d8c
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <%= labelled_form_field(_('Notifications Color/Type'), select(:notifications, :type, options_for_select_with_title({_("Blue - Information") => "AdminNotificationsPlugin::InformationNotification", _("Yellow - Warning") => "AdminNotificationsPlugin::WarningNotification", _("Green - Success") => "AdminNotificationsPlugin::SuccessNotification", _("Red - Danger") => "AdminNotificationsPlugin::DangerNotification"}, @notification.type))) %> 20 <%= labelled_form_field(_('Notifications Color/Type'), select(:notifications, :type, options_for_select_with_title({_("Blue - Information") => "AdminNotificationsPlugin::InformationNotification", _("Yellow - Warning") => "AdminNotificationsPlugin::WarningNotification", _("Green - Success") => "AdminNotificationsPlugin::SuccessNotification", _("Red - Danger") => "AdminNotificationsPlugin::DangerNotification"}, @notification.type))) %>
21 21
22 <div> 22 <div>
23 - <%= labelled_check_box(_("Display only in the homepage"), 'notifications[display_only_in_homepage]', '1', @notification.display_only_in_homepage?) %> 23 + <%= labelled_check_box(profile.present? ? _("Display only in the profile homepage") : _("Display only in the homepage") , 'notifications[display_only_in_homepage]', '1', @notification.display_only_in_homepage?) %>
24 </div> 24 </div>
25 25
26 <div> 26 <div>