[Git][noosfero/noosfero][master] 2 commits: Fix time translation in organization_ratings
Daniela Feitosa
gitlab at gitlab.com
Wed Oct 7 22:33:11 BRT 2015
Daniela Feitosa pushed to branch master at Noosfero / noosfero
Commits:
c7da8fac by Luciano Prestes Cavalcanti at 2015-10-07T20:08:52Z
Fix time translation in organization_ratings
Signed-off-by: Fabio Teixeira <fabio1079 at gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr at gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
- - - - -
5f1ce128 by Daniela Feitosa at 2015-10-08T01:32:40Z
Merge branch 'fix_time_translation' into 'master'
Error in translation after assessing community
Message with error: "Os administradores configuraram o tempo mínimo de 24 hour(s)"
"hour(s)" should be "hora(s)"
Issue in softwarepublico:
https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/271
See merge request !697
- - - - -
3 changed files:
- plugins/organization_ratings/po/organization_ratings.pot
- plugins/organization_ratings/po/pt/organization_ratings.po
- plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
Changes:
=====================================
plugins/organization_ratings/po/organization_ratings.pot
=====================================
--- a/plugins/organization_ratings/po/organization_ratings.pot
+++ b/plugins/organization_ratings/po/organization_ratings.pot
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 1.1-882-g0c116ba\n"
-"POT-Creation-Date: 2015-09-25 15:42-0000\n"
+"Project-Id-Version: 1.2.1+spb4-129-g9247619\n"
+"POT-Creation-Date: 2015-10-07 19:59+0200\n"
"PO-Revision-Date: 2015-09-11 18:56-0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,32 +17,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:15
-msgid "You can not vote on this %s"
-msgstr ""
-
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:47
-msgid "%s successfully rated!"
-msgstr ""
-
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:49
-msgid "Sorry, there were problems rating this profile."
+#: plugins/organization_ratings/lib/organization_ratings_block.rb:5
+msgid "Organization Ratings"
msgstr ""
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:12
-msgid "Configuration updated successfully."
+#: plugins/organization_ratings/lib/organization_ratings_block.rb:9
+msgid "This block displays the organization ratings."
msgstr ""
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:14
-msgid "Configuration could not be saved."
+#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
+msgid "More Recent"
msgstr ""
-#: plugins/organization_ratings/lib/average_rating_block.rb:5
-msgid "Organization Average Rating"
+#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
+msgid "Best Ratings"
msgstr ""
-#: plugins/organization_ratings/lib/average_rating_block.rb:9
-msgid "This block displays the organization average rating."
+#: plugins/organization_ratings/lib/organization_ratings_plugin.rb:9
+msgid "A plugin that allows you to rate a organization and comment about it."
msgstr ""
#: plugins/organization_ratings/lib/create_organization_rating_comment.rb:31
@@ -105,68 +97,36 @@ msgid ""
" You can access %{url} to see your comment."
msgstr ""
-#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
-msgid "More Recent"
-msgstr ""
-
-#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
-msgid "Best Ratings"
-msgstr ""
-
-#: plugins/organization_ratings/lib/organization_ratings_block.rb:5
-msgid "Organization Ratings"
-msgstr ""
-
-#: plugins/organization_ratings/lib/organization_ratings_block.rb:9
-msgid "This block displays the organization ratings."
+#: plugins/organization_ratings/lib/average_rating_block.rb:5
+msgid "Organization Average Rating"
msgstr ""
-#: plugins/organization_ratings/lib/organization_ratings_plugin.rb:9
-msgid "A plugin that allows you to rate a organization and comment about it."
+#: plugins/organization_ratings/lib/average_rating_block.rb:9
+msgid "This block displays the organization average rating."
msgstr ""
#: plugins/organization_ratings/lib/organization_rating.rb:10
msgid "must be between 1 and 5"
msgstr ""
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:3
-msgid "Organization Rating Settings"
-msgstr ""
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:10
-msgid "Value"
-msgstr ""
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:13
-msgid "Default amount of stars marked on evaluations"
-msgstr ""
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:17
-msgid "Users can rate an organization only once"
-msgstr ""
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:21
-msgid "The comments are moderated"
-msgstr ""
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:26
-msgid "Time in hours between evaluations from the same user."
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:12
+msgid "Configuration updated successfully."
msgstr ""
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:27
-msgid "To disable cooldown use zero (0) value."
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:14
+msgid "Configuration could not be saved."
msgstr ""
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:35
-msgid "Order ratings by"
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:15
+msgid "You can not vote on this %s"
msgstr ""
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:41
-msgid "Ratings amount per page"
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:47
+msgid "%s successfully rated!"
msgstr ""
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:50
-msgid "Back"
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:49
+msgid "Sorry, there were problems rating this profile."
msgstr ""
#: plugins/organization_ratings/views/shared/_rating_button.html.erb:3
@@ -189,10 +149,6 @@ msgstr ""
msgid "* You must be logged in to submit a report."
msgstr ""
-#: plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb:2
-msgid "Comment:"
-msgstr ""
-
#: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:39
msgid "Rated as"
msgstr ""
@@ -226,13 +182,57 @@ msgid "Hi, %s! The administrators set the minimum time of"
msgstr ""
#: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:71
-msgid "%s hour(s)"
+msgid "%d hour(s)"
msgstr ""
#: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:72
msgid "between each evaluation."
msgstr ""
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:3
+msgid "Organization Rating Settings"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:10
+msgid "Value"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:13
+msgid "Default amount of stars marked on evaluations"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:17
+msgid "Users can rate an organization only once"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:21
+msgid "The comments are moderated"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:26
+msgid "Time in hours between evaluations from the same user."
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:27
+msgid "To disable cooldown use zero (0) value."
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:35
+msgid "Order ratings by"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:41
+msgid "Ratings amount per page"
+msgstr ""
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:50
+msgid "Back"
+msgstr ""
+
+#: plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb:17
+msgid "See more"
+msgstr ""
+
#: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:4
msgid "Rating: "
msgstr ""
@@ -245,6 +245,6 @@ msgstr ""
msgid "Rate this %s"
msgstr ""
-#: plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb:17
-msgid "See more"
+#: plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb:2
+msgid "Comment:"
msgstr ""
=====================================
plugins/organization_ratings/po/pt/organization_ratings.po
=====================================
--- a/plugins/organization_ratings/po/pt/organization_ratings.po
+++ b/plugins/organization_ratings/po/pt/organization_ratings.po
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 1.1-882-g0c116ba\n"
-"POT-Creation-Date: 2015-09-25 15:42-0000\n"
+"Project-Id-Version: 1.2.1+spb4-129-g9247619\n"
+"POT-Creation-Date: 2015-10-07 19:59+0200\n"
"PO-Revision-Date: 2015-09-11 18:56-0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,33 +17,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:15
-msgid "You can not vote on this %s"
-msgstr "Você não pode votar nesta %s"
-
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:47
-msgid "%s successfully rated!"
-msgstr "%s avaliada com sucesso!"
-
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:49
-msgid "Sorry, there were problems rating this profile."
-msgstr "Desculpe, ocorreram problemas na avaliação deste perfil."
+#: plugins/organization_ratings/lib/organization_ratings_block.rb:5
+msgid "Organization Ratings"
+msgstr "Avaliações da Organização"
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:12
-msgid "Configuration updated successfully."
-msgstr "Configurações atualizadas com sucesso."
+#: plugins/organization_ratings/lib/organization_ratings_block.rb:9
+msgid "This block displays the organization ratings."
+msgstr "Este bloco mostra as avaliações da organização."
-#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:14
-msgid "Configuration could not be saved."
-msgstr "Configurações não puderam ser salvas."
+#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
+msgid "More Recent"
+msgstr "Mais Recentes"
-#: plugins/organization_ratings/lib/average_rating_block.rb:5
-msgid "Organization Average Rating"
-msgstr "Média de Avaliações da Organização"
+#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
+msgid "Best Ratings"
+msgstr "Melhores Avaliações"
-#: plugins/organization_ratings/lib/average_rating_block.rb:9
-msgid "This block displays the organization average rating."
-msgstr "Este bloco mostra a média de avaliações da organização."
+#: plugins/organization_ratings/lib/organization_ratings_plugin.rb:9
+msgid "A plugin that allows you to rate a organization and comment about it."
+msgstr ""
+"Um plugin que permite que você avalie uma organização e comente sobre ela."
#: plugins/organization_ratings/lib/create_organization_rating_comment.rb:31
msgid "Comment waiting for approval"
@@ -125,70 +118,37 @@ msgstr ""
"Seu pedido para comentar em %{target} foi aprovado.\n"
"\tVocê pode acessar %{url} para ver seu comentário."
-#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
-msgid "More Recent"
-msgstr "Mais Recentes"
-
-#: plugins/organization_ratings/lib/organization_ratings_config.rb:8
-msgid "Best Ratings"
-msgstr "Melhores Avaliações"
-
-#: plugins/organization_ratings/lib/organization_ratings_block.rb:5
-msgid "Organization Ratings"
-msgstr "Avaliações da Organização"
-
-#: plugins/organization_ratings/lib/organization_ratings_block.rb:9
-msgid "This block displays the organization ratings."
-msgstr "Este bloco mostra as avaliações da organização."
+#: plugins/organization_ratings/lib/average_rating_block.rb:5
+msgid "Organization Average Rating"
+msgstr "Média de Avaliações da Organização"
-#: plugins/organization_ratings/lib/organization_ratings_plugin.rb:9
-msgid "A plugin that allows you to rate a organization and comment about it."
-msgstr ""
-"Um plugin que permite que você avalie uma organização e comente sobre ela."
+#: plugins/organization_ratings/lib/average_rating_block.rb:9
+msgid "This block displays the organization average rating."
+msgstr "Este bloco mostra a média de avaliações da organização."
#: plugins/organization_ratings/lib/organization_rating.rb:10
msgid "must be between 1 and 5"
msgstr "deve ser entre 1 e 5"
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:3
-msgid "Organization Rating Settings"
-msgstr "Configuração para Avaliações em Organizações"
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:10
-msgid "Value"
-msgstr "Valor"
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:13
-msgid "Default amount of stars marked on evaluations"
-msgstr "Quantidade padrão de estrelas marcadas nas avaliações"
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:17
-msgid "Users can rate an organization only once"
-msgstr "Usuários podem avaliar uma organização apenas uma vez"
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:21
-msgid "The comments are moderated"
-msgstr "Os comentários são moderados"
-
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:26
-msgid "Time in hours between evaluations from the same user."
-msgstr "Tempo em horas entre avaliações do mesmo usuário."
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:12
+msgid "Configuration updated successfully."
+msgstr "Configurações atualizadas com sucesso."
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:27
-msgid "To disable cooldown use zero (0) value."
-msgstr "Para desabilitar o tempo de espera utilize o valor zero (0)."
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb:14
+msgid "Configuration could not be saved."
+msgstr "Configurações não puderam ser salvas."
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:35
-msgid "Order ratings by"
-msgstr "Ordenar avaliações por"
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:15
+msgid "You can not vote on this %s"
+msgstr "Você não pode votar nesta %s"
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:41
-msgid "Ratings amount per page"
-msgstr "Quantidade de avaliações por página"
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:47
+msgid "%s successfully rated!"
+msgstr "%s avaliada com sucesso!"
-#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:50
-msgid "Back"
-msgstr "Voltar"
+#: plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb:49
+msgid "Sorry, there were problems rating this profile."
+msgstr "Desculpe, ocorreram problemas na avaliação deste perfil."
#: plugins/organization_ratings/views/shared/_rating_button.html.erb:3
msgid "Rate %s "
@@ -210,10 +170,6 @@ msgstr "Relate suas experiências."
msgid "* You must be logged in to submit a report."
msgstr "* Você precisa estar logado para enviar um relato."
-#: plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb:2
-msgid "Comment:"
-msgstr "Comentário:"
-
#: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:39
msgid "Rated as"
msgstr "Avaliado em"
@@ -247,13 +203,57 @@ msgid "Hi, %s! The administrators set the minimum time of"
msgstr "Olá, %s! Os administradores configuraram o tempo mínimo de "
#: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:71
-msgid "%s hour(s)"
-msgstr "%s hora(s)"
+msgid "%d hour(s)"
+msgstr "%d hora(s)"
#: plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb:72
msgid "between each evaluation."
msgstr "entre cada avaliação."
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:3
+msgid "Organization Rating Settings"
+msgstr "Configuração para Avaliações em Organizações"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:10
+msgid "Value"
+msgstr "Valor"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:13
+msgid "Default amount of stars marked on evaluations"
+msgstr "Quantidade padrão de estrelas marcadas nas avaliações"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:17
+msgid "Users can rate an organization only once"
+msgstr "Usuários podem avaliar uma organização apenas uma vez"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:21
+msgid "The comments are moderated"
+msgstr "Os comentários são moderados"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:26
+msgid "Time in hours between evaluations from the same user."
+msgstr "Tempo em horas entre avaliações do mesmo usuário."
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:27
+msgid "To disable cooldown use zero (0) value."
+msgstr "Para desabilitar o tempo de espera utilize o valor zero (0)."
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:35
+msgid "Order ratings by"
+msgstr "Ordenar avaliações por"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:41
+msgid "Ratings amount per page"
+msgstr "Quantidade de avaliações por página"
+
+#: plugins/organization_ratings/views/organization_ratings_plugin_admin/index.html.erb:50
+msgid "Back"
+msgstr "Voltar"
+
+#: plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb:17
+msgid "See more"
+msgstr "Veja mais"
+
#: plugins/organization_ratings/views/blocks/display_organization_average_rating.html.erb:4
msgid "Rating: "
msgstr "Avaliação:"
@@ -266,9 +266,9 @@ msgstr "Seja o primeiro a avaliar!"
msgid "Rate this %s"
msgstr "Avalie esta %s"
-#: plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb:17
-msgid "See more"
-msgstr "Veja mais"
+#: plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb:2
+msgid "Comment:"
+msgstr "Comentário:"
#~ msgid "community"
#~ msgstr "comunidade"
=====================================
plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
=====================================
--- a/plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
+++ b/plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
@@ -68,7 +68,7 @@
<% else %>
<div class="star-rate-form rating-cooldown">
<%= _("Hi, %s! The administrators set the minimum time of") % current_user.name %>
- <strong><%= _("%s hour(s)" % env_organization_ratings_config.cooldown) %></strong>
+ <strong><%= _("%d hour(s)") % env_organization_ratings_config.cooldown %></strong>
<%= _("between each evaluation.") %>
<%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
@@ -77,4 +77,4 @@
</div>
-</div>
\ No newline at end of file
+</div>
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/92476194059c6104af0a8c25281403e03794f90a...5f1ce128974895608c9ffa55f6d4492932560997
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151008/9550d73a/attachment-0001.html>
More information about the Noosfero-dev
mailing list