Download as
Browse Code »

Commit 502ac9746ec402b5f546955a3d708cd03622833a

Authored by AntonioTerceiro
1 parent 3b39f87c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem523: marking more terminology switches 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2306 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 10 additions and 2 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @502ac97
@@ -25,7 +25,7 @@ class Environment < ActiveRecord::Base @@ -25,7 +25,7 @@ class Environment < ActiveRecord::Base
25 'disable_asset_articles' => _('Disable search for articles '), 25 'disable_asset_articles' => _('Disable search for articles '),
26 'disable_asset_enterprises' => _('Disable search for enterprises'), 26 'disable_asset_enterprises' => _('Disable search for enterprises'),
27 'disable_asset_people' => _('Disable search for people'), 27 'disable_asset_people' => _('Disable search for people'),
28 - 'disable_asset_communities' => _('Disable search for communities'), 28 + 'disable_asset_communities' => __('Disable search for communities'),
29 'disable_asset_products' => _('Disable search for products'), 29 'disable_asset_products' => _('Disable search for products'),
30 'disable_asset_events' => _('Disable search for events'), 30 'disable_asset_events' => _('Disable search for events'),
31 } 31 }
app/models/environment_statistics_block.rb
  Diff comments   View file @502ac97
@@ -16,7 +16,7 @@ class EnvironmentStatisticsBlock < Block @@ -16,7 +16,7 @@ class EnvironmentStatisticsBlock < Block
16 info = [ 16 info = [
17 n_('One user', '%{num} users', users) % { :num => users }, 17 n_('One user', '%{num} users', users) % { :num => users },
18 n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises }, 18 n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
19 - n_('One community', '%{num} communities', communities) % { :num => communities }, 19 + n__('One community', '%{num} communities', communities) % { :num => communities },
20 ] 20 ]
21 21
22 block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n")) 22 block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
lib/noosfero/core_ext/object.rb
  Diff comments   View file @502ac97
@@ -3,4 +3,8 @@ class Object @@ -3,4 +3,8 @@ class Object
3 gettext(Noosfero.term(*args)) 3 gettext(Noosfero.term(*args))
4 end 4 end
5 alias :getterm :__ 5 alias :getterm :__
  6 +
  7 + def n__(for_one, for_many, num)
  8 + ngettext(getterm(for_one), getterm(for_manu), num)
  9 + end
6 end 10 end
lib/tasks/gettext.rake
  Diff comments   View file @502ac97
@@ -14,6 +14,7 @@ desc "Update pot/po files to match new version." @@ -14,6 +14,7 @@ desc "Update pot/po files to match new version."
14 task :updatepo do 14 task :updatepo do
15 require 'gettext/utils' 15 require 'gettext/utils'
16 GetText::RubyParser::ID << '__' 16 GetText::RubyParser::ID << '__'
  17 + GetText::RubyParser::PLURAL_ID << 'n__'
17 GetText::ActiveRecordParser.init(:use_classname => false) 18 GetText::ActiveRecordParser.init(:use_classname => false)
18 GetText.update_pofiles(Noosfero::PROJECT, Dir.glob("{app,lib,public/designs}/**/*.{rb,rhtml}"), 19 GetText.update_pofiles(Noosfero::PROJECT, Dir.glob("{app,lib,public/designs}/**/*.{rb,rhtml}"),
19 "#{Noosfero::PROJECT} #{Noosfero::VERSION}") 20 "#{Noosfero::PROJECT} #{Noosfero::VERSION}")
lib/zen3_terminology.rb
  Diff comments   View file @502ac97
@@ -13,6 +13,9 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom @@ -13,6 +13,9 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
13 'The communities in which the user is a member' => N_('The groups in which the user is a member'), 13 'The communities in which the user is a member' => N_('The groups in which the user is a member'),
14 'All communities' => N_('All groups'), 14 'All communities' => N_('All groups'),
15 'Community' => N_('Group'), 15 'Community' => N_('Group'),
  16 + 'One community' => N_('One group'),
  17 + '%{num} communities' => N_('%{num} groups'),
  18 + 'Disable search for communities' => N_('Disable search for groups'),
16 }) 19 })
17 end 20 end
18 21