[Git][noosfero/noosfero][master] 2 commits: Replaced explicit admin url by plugin method
Daniela Feitosa
gitlab at gitlab.com
Wed Oct 28 11:16:28 BRST 2015
Daniela Feitosa pushed to branch master at Noosfero / noosfero
Commits:
b61e7ae1 by Daniela Feitosa at 2015-10-28T13:11:11Z
Replaced explicit admin url by plugin method
This fixes link on Noosfero running as a subdirectory
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
- - - - -
6ddf4a29 by Daniela Feitosa at 2015-10-28T13:11:27Z
environment notification: updated translations
- - - - -
3 changed files:
- plugins/environment_notification/po/environment_notification.pot
- plugins/environment_notification/po/pt/environment_notification.po
- plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb
Changes:
=====================================
plugins/environment_notification/po/environment_notification.pot
=====================================
--- a/plugins/environment_notification/po/environment_notification.pot
+++ b/plugins/environment_notification/po/environment_notification.pot
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 1.2-514-gc258618\n"
-"POT-Creation-Date: 2015-09-24 19:03-0000\n"
+"Project-Id-Version: 1.3~rc1-4-g0d2935a\n"
+"POT-Creation-Date: 2015-10-28 13:05-0000\n"
"PO-Revision-Date: 2015-09-14 12:12-0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: plugins/environment_notification/lib/environment_notification_plugin.rb:11
+#: plugins/environment_notification/lib/environment_notification_plugin.rb:8
msgid "A plugin for environment notifications."
msgstr ""
@@ -25,54 +25,38 @@ msgstr ""
msgid "Notification Manager"
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:14
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:19
msgid "Notification successfully created"
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:17
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:22
msgid "Notification couldn't be created"
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:26
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:31
msgid "The notification was deleted."
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:28
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:33
msgid "Could not remove the notification"
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:38
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:43
msgid "The notification was edited."
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:40
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:45
msgid "Could not edit the notification."
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:52
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:57
msgid "The status of the notification was changed."
msgstr ""
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:54
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:59
msgid "Could not change the status of the notification."
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:8
-msgid "There are active notifications in this environment! You can "
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:10
-msgid "manage all notifications here."
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:28
-msgid "Do not show anymore"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:29
-msgid "Hide for now"
-msgstr ""
-
#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:3
msgid "Environment Notifications"
msgstr ""
@@ -118,60 +102,76 @@ msgstr ""
msgid "Do you want to delete this notification?"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:3
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:4
msgid "Back"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:9
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:10
msgid "Optional Title:"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:11
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:12
msgid "Enter your message here:"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:13
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:14
msgid ""
"Obs: You can use %{name} and %{email} variables to put the user's name and "
"email in the message."
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:16
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:17
msgid "Notifications Status"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Notifications Color/Type"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Blue - Information"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Yellow - Warning"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Green - Success"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Red - Danger"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:21
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:22
msgid "Display only in the homepage"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:25
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:26
msgid "Display to not logged users too"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:29
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:30
msgid "Display popup until user close the notification"
msgstr ""
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:33
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:34
msgid "Save"
msgstr ""
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:8
+msgid "There are active notifications in this environment!"
+msgstr ""
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:9
+msgid "Manage all notifications here."
+msgstr ""
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:26
+msgid "Do not show anymore"
+msgstr ""
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:27
+msgid "Hide for now"
+msgstr ""
=====================================
plugins/environment_notification/po/pt/environment_notification.po
=====================================
--- a/plugins/environment_notification/po/pt/environment_notification.po
+++ b/plugins/environment_notification/po/pt/environment_notification.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.2-514-gbe9e36b\n"
-"POT-Creation-Date: 2015-09-24 18:52-0000\n"
+"Project-Id-Version: 1.3~rc1-4-g0d2935a\n"
+"POT-Creation-Date: 2015-10-28 13:05-0000\n"
"PO-Revision-Date: 2015-09-14 12:12-0000\n"
"Last-Translator: FULL NAME <arthurmde at gmail.com>\n"
"Language-Team: Portuguese\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: plugins/environment_notification/lib/environment_notification_plugin.rb:11
+#: plugins/environment_notification/lib/environment_notification_plugin.rb:8
msgid "A plugin for environment notifications."
msgstr "Plugin para notificações do ambiente"
@@ -24,54 +24,38 @@ msgstr "Plugin para notificações do ambiente"
msgid "Notification Manager"
msgstr "Gerenciador de Notificações"
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:14
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:19
msgid "Notification successfully created"
msgstr "Notificação criada com sucesso"
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:17
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:22
msgid "Notification couldn't be created"
msgstr "Não foi possível criar notificação"
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:26
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:31
msgid "The notification was deleted."
msgstr "A notificação foi removida"
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:28
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:33
msgid "Could not remove the notification"
msgstr "Não foi possível remover a notificação"
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:38
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:43
msgid "The notification was edited."
msgstr "A notificação foi editada."
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:40
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:45
msgid "Could not edit the notification."
msgstr "Não foi possível editar a notificação."
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:52
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:57
msgid "The status of the notification was changed."
msgstr "O status da notificação foi modificado"
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:54
+#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:59
msgid "Could not change the status of the notification."
msgstr "Não foi possível alterar o status da notificação"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:8
-msgid "There are active notifications in this environment! You can "
-msgstr "Existem notificações ativas neste ambiente! Você pode "
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:10
-msgid "manage all notifications here."
-msgstr "gerenciar todas as notificações aqui."
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:28
-msgid "Do not show anymore"
-msgstr "Não mostrar mais"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:29
-msgid "Hide for now"
-msgstr "Ocultar momentaneamente"
-
#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:3
msgid "Environment Notifications"
msgstr "Notificações do Ambiente"
@@ -117,19 +101,19 @@ msgstr "Remover"
msgid "Do you want to delete this notification?"
msgstr "Você quer remover essa notificação?"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:3
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:4
msgid "Back"
msgstr "Voltar"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:9
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:10
msgid "Optional Title:"
msgstr "Título Opcional:"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:11
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:12
msgid "Enter your message here:"
msgstr "Entre com a sua mensagem aqui:"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:13
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:14
msgid ""
"Obs: You can use %{name} and %{email} variables to put the user's name and "
"email in the message."
@@ -137,42 +121,58 @@ msgstr ""
"Obs: Você pode usar as variáveis %{name} e %{email} para inserir o nome e "
"email do usuário logado na mensagem."
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:16
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:17
msgid "Notifications Status"
msgstr "Status da Notificação"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Notifications Color/Type"
msgstr "Cor/Tipo de Notificação"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Blue - Information"
msgstr "Azul - Informação"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Yellow - Warning"
msgstr "Amarelo - Atenção"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Green - Success"
msgstr "Verde - Sucesso"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:18
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
msgid "Red - Danger"
msgstr "Vermelho - Perigo"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:21
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:22
msgid "Display only in the homepage"
msgstr "Apresentar apenas na página inicial"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:25
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:26
msgid "Display to not logged users too"
msgstr "Apresentar notificação para usuários não logados também"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:29
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:30
msgid "Display popup until user close the notification"
msgstr "Apresentar Popup da notificação até que o usuário a feche"
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:33
+#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:34
msgid "Save"
msgstr "Salvar"
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:8
+msgid "There are active notifications in this environment!"
+msgstr "Existem notificações ativas neste ambiente!"
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:9
+msgid "Manage all notifications here."
+msgstr "Gerencie todas as notificações aqui."
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:26
+msgid "Do not show anymore"
+msgstr "Não mostrar mais"
+
+#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:27
+msgid "Hide for now"
+msgstr "Ocultar momentaneamente"
=====================================
plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb
=====================================
--- a/plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb
+++ b/plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb
@@ -5,10 +5,8 @@
<div class="adminnotification notification">
<div class="notification-message">
<p>
- <%= _("There are active notifications in this environment! You can ") %>
- <a href="/admin/plugin/environment_notification">
- <%= _("manage all notifications here.") %>
- </a>
+ <%= _("There are active notifications in this environment!") %>
+ <%= link_to _("Manage all notifications here."), EnvironmentNotificationPlugin.admin_url %>
</p>
</div>
</div>
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/af618249467f8344fb9023797ac941db66e3f546...6ddf4a2943f31ea791f40a50a9261271ab46a739
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151028/f0818757/attachment-0001.html>
More information about the Noosfero-dev
mailing list