Download as
Browse Code »

Commit e9f8d06df2fccd56054e2615bc15816dc566b522

Authored by Antonio Terceiro
1 parent b8ba9734
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1163: fixing translation problem

Showing 11 changed files with 73 additions and 13 deletions   Show diff stats
app/helpers/forms_helper.rb
  Diff comments   View file @e9f8d06
@@ -15,7 +15,8 @@ module FormsHelper @@ -15,7 +15,8 @@ module FormsHelper
15 def labelled_check_box( human_name, name, value = "1", checked = false, options = {} ) 15 def labelled_check_box( human_name, name, value = "1", checked = false, options = {} )
16 options[:id] ||= 'checkbox-' + FormsHelper.next_id_number 16 options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
17 check_box_tag( name, value, checked, options ) + 17 check_box_tag( name, value, checked, options ) +
18 - content_tag( 'label', human_name, :for => options[:id] ) 18 + content_tag( 'label', human_name, :for => options[:id] ) +
  19 + hidden_field_tag(name, '0')
19 end 20 end
20 21
21 def labelled_text_field( human_name, name, value=nil, options={} ) 22 def labelled_text_field( human_name, name, value=nil, options={} )
app/views/profile_editor/_organization.rhtml
  Diff comments   View file @e9f8d06
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 60
61 <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile, :only_required => false } %> 61 <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile, :only_required => false } %>
62 62
63 - <%= f.check_box(:enable_contact_us) if @profile.enterprise? %> 63 + <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
64 64
65 <h1><%= _('Moderation options') %></h1> 65 <h1><%= _('Moderation options') %></h1>
66 <div style='margin-bottom: 1em'> 66 <div style='margin-bottom: 1em'>
po/bg/noosfero.po
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5072,6 +5072,10 @@ msgid &quot;&quot; @@ -5072,6 +5072,10 @@ msgid &quot;&quot;
5072 "the homepage or to content inside it. Do you really want to change? " 5072 "the homepage or to content inside it. Do you really want to change? "
5073 msgstr "" 5073 msgstr ""
5074 5074
  5075 +#: app/views/profile_editor/_organization.rhtml:63
  5076 +msgid "Enable \"contact us\""
  5077 +msgstr ""
  5078 +
5075 #: app/views/profile_editor/_organization.rhtml:65 5079 #: app/views/profile_editor/_organization.rhtml:65
5076 msgid "Moderation options" 5080 msgid "Moderation options"
5077 msgstr "" 5081 msgstr ""
po/de/noosfero.po
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5072,6 +5072,10 @@ msgid &quot;&quot; @@ -5072,6 +5072,10 @@ msgid &quot;&quot;
5072 "the homepage or to content inside it. Do you really want to change? " 5072 "the homepage or to content inside it. Do you really want to change? "
5073 msgstr "" 5073 msgstr ""
5074 5074
  5075 +#: app/views/profile_editor/_organization.rhtml:63
  5076 +msgid "Enable \"contact us\""
  5077 +msgstr ""
  5078 +
5075 #: app/views/profile_editor/_organization.rhtml:65 5079 #: app/views/profile_editor/_organization.rhtml:65
5076 msgid "Moderation options" 5080 msgid "Moderation options"
5077 msgstr "" 5081 msgstr ""
po/es/noosfero.po
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5072,6 +5072,10 @@ msgid &quot;&quot; @@ -5072,6 +5072,10 @@ msgid &quot;&quot;
5072 "the homepage or to content inside it. Do you really want to change? " 5072 "the homepage or to content inside it. Do you really want to change? "
5073 msgstr "" 5073 msgstr ""
5074 5074
  5075 +#: app/views/profile_editor/_organization.rhtml:63
  5076 +msgid "Enable \"contact us\""
  5077 +msgstr ""
  5078 +
5075 #: app/views/profile_editor/_organization.rhtml:65 5079 #: app/views/profile_editor/_organization.rhtml:65
5076 msgid "Moderation options" 5080 msgid "Moderation options"
5077 msgstr "" 5081 msgstr ""
po/fr/noosfero.po
  Diff comments   View file @e9f8d06
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 11 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
12 "PO-Revision-Date: 2008-06-13 16:15-0300\n" 12 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
13 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n" 13 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5433,6 +5433,11 @@ msgid &quot;&quot; @@ -5433,6 +5433,11 @@ msgid &quot;&quot;
5433 "the homepage or to content inside it. Do you really want to change? " 5433 "the homepage or to content inside it. Do you really want to change? "
5434 msgstr "" 5434 msgstr ""
5435 5435
  5436 +#: app/views/profile_editor/_organization.rhtml:63
  5437 +#, fuzzy
  5438 +msgid "Enable \"contact us\""
  5439 +msgstr "Gérer les contacts."
  5440 +
5436 #: app/views/profile_editor/_organization.rhtml:65 5441 #: app/views/profile_editor/_organization.rhtml:65
5437 msgid "Moderation options" 5442 msgid "Moderation options"
5438 msgstr "Options de modération" 5443 msgstr "Options de modération"
po/hy/noosfero.po
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2009-07-11 17:27-0300\n" 11 "PO-Revision-Date: 2009-07-11 17:27-0300\n"
12 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n" 12 "Last-Translator: Anahit Minassian <anahit.minassian@cooperation.net>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5523,6 +5523,32 @@ msgid &quot;&quot; @@ -5523,6 +5523,32 @@ msgid &quot;&quot;
5523 "the homepage or to content inside it. Do you really want to change? " 5523 "the homepage or to content inside it. Do you really want to change? "
5524 msgstr "" 5524 msgstr ""
5525 5525
  5526 +#: app/views/profile_editor/_organization.rhtml:63
  5527 +#, fuzzy
  5528 +msgid "Enable \"contact us\""
  5529 +msgstr ""
  5530 +"#-#-#-#-# noosfero.po.REMOTE.16110.po (noosfero 0.18.4) #-#-#-#-#\n"
  5531 +"#-#-#-#-# noosfero.po.LOCAL.16110.po (noosfero 0.18.4) #-#-#-#-#\n"
  5532 +"#-#-#-#-# noosfero.po.REMOTE.9201.po (noosfero 0.16.0) #-#-#-#-#\n"
  5533 +"#-#-#-#-# noosfero.po.LOCAL.9201.po (noosfero 0.15.0) #-#-#-#-#\n"
  5534 +"#-#-#-#-# noosfero.po.REMOTE.17090.po (noosfero 0.15.0) #-#-#-#-#\n"
  5535 +"#-#-#-#-# noosfero.po.LOCAL.17090.po (noosfero 0.15.0) #-#-#-#-#\n"
  5536 +"#-#-#-#-# noosfero.po.REMOTE.26849.po (noosfero 0.15.0) #-#-#-#-#\n"
  5537 +"#-#-#-#-# noosfero.po.LOCAL.26849.po (noosfero 0.14.0) #-#-#-#-#\n"
  5538 +"#-#-#-#-# noosfero.po.REMOTE.21532.po (noosfero 0.14.0) #-#-#-#-#\n"
  5539 +"#-#-#-#-# noosfero.po.LOCAL.21532.po (noosfero 0.13.0) #-#-#-#-#\n"
  5540 +"#-#-#-#-# noosfero.po.REMOTE.8544.po (noosfero 0.13.0) #-#-#-#-#\n"
  5541 +"#-#-#-#-# noosfero.po.LOCAL.8544.po (noosfero 0.13.0) #-#-#-#-#\n"
  5542 +"#-#-#-#-# noosfero.po.REMOTE.17206.po (noosfero 0.13.0) #-#-#-#-#\n"
  5543 +"#-#-#-#-# noosfero.po.LOCAL.17206.po (noosfero 0.13.0) #-#-#-#-#\n"
  5544 +"#-#-#-#-# noosfero.po.REMOTE.9928.po (noosfero 0.13.0) #-#-#-#-#\n"
  5545 +"#-#-#-#-# noosfero.po.LOCAL.9928.po (noosfero 0.13.0) #-#-#-#-#\n"
  5546 +"#-#-#-#-# noosfero.po.REMOTE.21758.po (noosfero 0.13.0) #-#-#-#-#\n"
  5547 +"#-#-#-#-# noosfero.po.LOCAL.21758.po (noosfero 0.13.0) #-#-#-#-#\n"
  5548 +"#-#-#-#-# noosfero.po.REMOTE.25844.po (noosfero 0.13.0) #-#-#-#-#\n"
  5549 +"#-#-#-#-# noosfero.po.LOCAL.25844.po (noosfero 0.11.0) #-#-#-#-#\n"
  5550 +"Կապ պահպանող անձ"
  5551 +
5526 #: app/views/profile_editor/_organization.rhtml:65 5552 #: app/views/profile_editor/_organization.rhtml:65
5527 msgid "Moderation options" 5553 msgid "Moderation options"
5528 msgstr "Կառավարման հատկություններ" 5554 msgstr "Կառավարման հատկություններ"
po/it/noosfero.po
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5072,6 +5072,10 @@ msgid &quot;&quot; @@ -5072,6 +5072,10 @@ msgid &quot;&quot;
5072 "the homepage or to content inside it. Do you really want to change? " 5072 "the homepage or to content inside it. Do you really want to change? "
5073 msgstr "" 5073 msgstr ""
5074 5074
  5075 +#: app/views/profile_editor/_organization.rhtml:63
  5076 +msgid "Enable \"contact us\""
  5077 +msgstr ""
  5078 +
5075 #: app/views/profile_editor/_organization.rhtml:65 5079 #: app/views/profile_editor/_organization.rhtml:65
5076 msgid "Moderation options" 5080 msgid "Moderation options"
5077 msgstr "" 5081 msgstr ""
po/nl/noosfero.po
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5072,6 +5072,10 @@ msgid &quot;&quot; @@ -5072,6 +5072,10 @@ msgid &quot;&quot;
5072 "the homepage or to content inside it. Do you really want to change? " 5072 "the homepage or to content inside it. Do you really want to change? "
5073 msgstr "" 5073 msgstr ""
5074 5074
  5075 +#: app/views/profile_editor/_organization.rhtml:63
  5076 +msgid "Enable \"contact us\""
  5077 +msgstr ""
  5078 +
5075 #: app/views/profile_editor/_organization.rhtml:65 5079 #: app/views/profile_editor/_organization.rhtml:65
5076 msgid "Moderation options" 5080 msgid "Moderation options"
5077 msgstr "" 5081 msgstr ""
po/noosfero.pot
  Diff comments   View file @e9f8d06
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.19.0\n" 9 "Project-Id-Version: noosfero 0.19.0\n"
10 -"POT-Creation-Date: 2009-08-03 12:50-0300\n" 10 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5072,6 +5072,10 @@ msgid &quot;&quot; @@ -5072,6 +5072,10 @@ msgid &quot;&quot;
5072 "the homepage or to content inside it. Do you really want to change? " 5072 "the homepage or to content inside it. Do you really want to change? "
5073 msgstr "" 5073 msgstr ""
5074 5074
  5075 +#: app/views/profile_editor/_organization.rhtml:63
  5076 +msgid "Enable \"contact us\""
  5077 +msgstr ""
  5078 +
5075 #: app/views/profile_editor/_organization.rhtml:65 5079 #: app/views/profile_editor/_organization.rhtml:65
5076 msgid "Moderation options" 5080 msgid "Moderation options"
5077 msgstr "" 5081 msgstr ""
po/pt_BR/noosfero.po
  Diff comments   View file @e9f8d06
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 msgid "" 12 msgid ""
13 msgstr "" 13 msgstr ""
14 "Project-Id-Version: noosfero 0.19.0\n" 14 "Project-Id-Version: noosfero 0.19.0\n"
15 -"POT-Creation-Date: 2009-08-03 12:50-0300\n"  
16 -"PO-Revision-Date: 2009-08-03 12:51-0300\n" 15 +"POT-Creation-Date: 2009-08-03 13:06-0300\n"
  16 +"PO-Revision-Date: 2009-08-03 13:20-0300\n"
17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 "Language-Team: LANGUAGE <LL@li.org>\n" 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 "MIME-Version: 1.0\n" 19 "MIME-Version: 1.0\n"
@@ -4530,7 +4530,7 @@ msgstr &quot;Entrar nessa comunidade&quot; @@ -4530,7 +4530,7 @@ msgstr &quot;Entrar nessa comunidade&quot;
4530 #: app/views/blocks/profile_info_actions/community.rhtml:16 4530 #: app/views/blocks/profile_info_actions/community.rhtml:16
4531 #: app/views/blocks/profile_info_actions/enterprise.rhtml:8 4531 #: app/views/blocks/profile_info_actions/enterprise.rhtml:8
4532 msgid "Contact us" 4532 msgid "Contact us"
4533 -msgstr "Contacte-nos" 4533 +msgstr "Fale conosco"
4534 4534
4535 #: app/views/blocks/profile_info_actions/person.rhtml:5 4535 #: app/views/blocks/profile_info_actions/person.rhtml:5
4536 msgid "Add friend" 4536 msgid "Add friend"
@@ -5243,6 +5243,10 @@ msgstr &quot;&quot; @@ -5243,6 +5243,10 @@ msgstr &quot;&quot;
5243 "Você está prestes a alterar o endereço, e isto vai quebrar links externos " 5243 "Você está prestes a alterar o endereço, e isto vai quebrar links externos "
5244 "para a homepage ou para conteúdo dentro dela. Você quer realmente mudar?" 5244 "para a homepage ou para conteúdo dentro dela. Você quer realmente mudar?"
5245 5245
  5246 +#: app/views/profile_editor/_organization.rhtml:63
  5247 +msgid "Enable \"contact us\""
  5248 +msgstr "Habilitar \"fale conosco\""
  5249 +
5246 #: app/views/profile_editor/_organization.rhtml:65 5250 #: app/views/profile_editor/_organization.rhtml:65
5247 msgid "Moderation options" 5251 msgid "Moderation options"
5248 msgstr "Opções de moderação" 5252 msgstr "Opções de moderação"