Download as
Browse Code »

Commit 502ac9746ec402b5f546955a3d708cd03622833a

Authored by AntonioTerceiro
1 parent 3b39f87c
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

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 25 'disable_asset_articles' => _('Disable search for articles '),
26 26 'disable_asset_enterprises' => _('Disable search for enterprises'),
27 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 29 'disable_asset_products' => _('Disable search for products'),
30 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 16 info = [
17 17 n_('One user', '%{num} users', users) % { :num => users },
18 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 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 3 gettext(Noosfero.term(*args))
4 4 end
5 5 alias :getterm :__
  6 +
  7 + def n__(for_one, for_many, num)
  8 + ngettext(getterm(for_one), getterm(for_manu), num)
  9 + end
6 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 14 task :updatepo do
15 15 require 'gettext/utils'
16 16 GetText::RubyParser::ID << '__'
  17 + GetText::RubyParser::PLURAL_ID << 'n__'
17 18 GetText::ActiveRecordParser.init(:use_classname => false)
18 19 GetText.update_pofiles(Noosfero::PROJECT, Dir.glob("{app,lib,public/designs}/**/*.{rb,rhtml}"),
19 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 13 'The communities in which the user is a member' => N_('The groups in which the user is a member'),
14 14 'All communities' => N_('All groups'),
15 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 20 end
18 21  
... ...