Download as
Browse Code »

Commit b4f458641a99d3504539c530b07f0ef948477cab

Authored by AntonioTerceiro
1 parent e6febcd3
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: adding __ as a shortcut for Noosfero.term plus 

translation

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2302 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 10 additions and 4 deletions   Show diff stats
app/views/shared/user_menu.rhtml
  Diff comments   View file @b4f4586
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 <li><a href="<%= homepage_path(:profile => current_user.login) %>" 18 <li><a href="<%= homepage_path(:profile => current_user.login) %>"
19 help="<%= _('Go to your home page.') %>" 19 help="<%= _('Go to your home page.') %>"
20 - ><span class="icon-menu-home"></span><%= Noosfero.term(N_('My Home Page')) %></a></li> 20 + ><span class="icon-menu-home"></span><%= __('My Home Page') %></a></li>
21 21
22 <!-- li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li --> 22 <!-- li><a href="#"><span class="icon-menu-blog"></span> Meu Blog</a></li -->
23 23
lib/noosfero.rb
  Diff comments   View file @b4f4586
1 -require 'gettext'  
2 -  
3 module Noosfero 1 module Noosfero
4 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
5 VERSION = '0.11.0' 3 VERSION = '0.11.0'
@@ -33,7 +31,7 @@ module Noosfero @@ -33,7 +31,7 @@ module Noosfero
33 end 31 end
34 32
35 def self.term(t) 33 def self.term(t)
36 - gettext(self.terminology.get(t)) 34 + self.terminology.get(t)
37 end 35 end
38 def self.terminology 36 def self.terminology
39 @terminology ||= Noosfero::Terminology::Default.new 37 @terminology ||= Noosfero::Terminology::Default.new
lib/noosfero/core_ext.rb
  Diff comments   View file @b4f4586
1 require 'noosfero/core_ext/string' 1 require 'noosfero/core_ext/string'
2 require 'noosfero/core_ext/integer' 2 require 'noosfero/core_ext/integer'
  3 +require 'noosfero/core_ext/object'
lib/noosfero/core_ext/object.rb 0 → 100644
  Diff comments   View file @b4f4586
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +class Object
  2 + def __(*args)
  3 + gettext(Noosfero.term(*args))
  4 + end
  5 +end
lib/tasks/gettext.rake
  Diff comments   View file @b4f4586
@@ -13,6 +13,7 @@ end @@ -13,6 +13,7 @@ end
13 desc "Update pot/po files to match new version." 13 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::ActiveRecordParser.init(:use_classname => false) 17 GetText::ActiveRecordParser.init(:use_classname => false)
17 GetText.update_pofiles(Noosfero::PROJECT, Dir.glob("{app,lib,public/designs}/**/*.{rb,rhtml}"), 18 GetText.update_pofiles(Noosfero::PROJECT, Dir.glob("{app,lib,public/designs}/**/*.{rb,rhtml}"),
18 "#{Noosfero::PROJECT} #{Noosfero::VERSION}") 19 "#{Noosfero::PROJECT} #{Noosfero::VERSION}")
lib/zen3_terminology.rb
  Diff comments   View file @b4f4586
@@ -4,6 +4,7 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom @@ -4,6 +4,7 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
4 include GetText 4 include GetText
5 5
6 def initialize 6 def initialize
  7 + # NOTE: the hash values must be marked for translation!!
7 super({ 8 super({
8 'My Home Page' => N_('My ePortfolio'), 9 'My Home Page' => N_('My ePortfolio'),
9 }) 10 })