[Git][noosfero/noosfero][master] 2 commits: admin_notifications: checkbox message for profile

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
502cd82c by Marcos Ronaldo at 2016-05-17T18:01:22-03:00
admin_notifications: checkbox message for profile

- - - - -
6761d8c0 by Rodrigo Souto at 2016-05-17T21:20:36+00:00
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
- - - - -


3 changed files:

- plugins/admin_notifications/po/admin_notifications.pot
- plugins/admin_notifications/po/pt/admin_notifications.po
- plugins/admin_notifications/views/shared/_form.html.erb


Changes:

=====================================
plugins/admin_notifications/po/admin_notifications.pot
=====================================
--- a/plugins/admin_notifications/po/admin_notifications.pot
+++ b/plugins/admin_notifications/po/admin_notifications.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-16 14:48-0300\n"
-"PO-Revision-Date: 2016-05-16 14:48-0300\n"
+"POT-Creation-Date: 2016-05-17 15:38-0300\n"
+"PO-Revision-Date: 2016-05-17 15:38-0300\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: \n"
@@ -113,6 +113,10 @@ msgid "Red - Danger"
 msgstr ""
 
 #: ../views/shared/_form.html.erb:23
+msgid "Display only in the profile homepage"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:23
 msgid "Display only in the homepage"
 msgstr ""
 


=====================================
plugins/admin_notifications/po/pt/admin_notifications.po
=====================================
--- a/plugins/admin_notifications/po/pt/admin_notifications.po
+++ b/plugins/admin_notifications/po/pt/admin_notifications.po
@@ -89,6 +89,9 @@ msgstr "Verde - Sucesso"
 msgid "Red - Danger"
 msgstr "Vermelho - Perigo"
 
+msgid "Display only in the profile homepage"
+msgstr "Apresentar apenas na página inicial do perfil"
+
 msgid "Display only in the homepage"
 msgstr "Apresentar apenas na página inicial"
 


=====================================
plugins/admin_notifications/views/shared/_form.html.erb
=====================================
--- a/plugins/admin_notifications/views/shared/_form.html.erb
+++ b/plugins/admin_notifications/views/shared/_form.html.erb
@@ -20,7 +20,7 @@
     <%= 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))) %>
 
     <div>
-      <%= labelled_check_box(_("Display only in the homepage"), 'notifications[display_only_in_homepage]', '1', @notification.display_only_in_homepage?) %>
+      <%= 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?) %>
     </div>
 
     <div>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/dd350afda895a941580437712760bbf264168661...6761d8c0032df811e58357107a970909aee2ff0d
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160517/324dfee8/attachment-0001.html>