Download as
Browse Code »

Commit 34f26734782dca41b2a563a20f5e2a62eb6d46c2

Authored by Rodrigo Souto
2 parents 16d11c32 dc521944
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'ai3179' into 'stable' 

Fix crash on rake noosfero:translations:compile

http://noosfero.org/Development/ActionItem3179
Showing 2 changed files with 1 additions and 2 deletions   Show diff stats
lib/tasks/doc.rake
  Diff comments   View file @34f2673
@@ -136,7 +136,6 @@ namespace :noosfero do @@ -136,7 +136,6 @@ namespace :noosfero do
136 desc "Translates Noosfero online documentation (does not touch PO files)" 136 desc "Translates Noosfero online documentation (does not touch PO files)"
137 task :translate => [:link_plugins_textiles, :do_translation] 137 task :translate => [:link_plugins_textiles, :do_translation]
138 task :do_translation => english_xhtml do 138 task :do_translation => english_xhtml do
139 - require_dependency 'noosfero'  
140 languages = Noosfero.locales.keys - ['en'] 139 languages = Noosfero.locales.keys - ['en']
141 languages.each do |lang| 140 languages.each do |lang|
142 po = "po/#{lang}/noosfero-doc.po" 141 po = "po/#{lang}/noosfero-doc.po"
lib/tasks/translation.rake
  Diff comments   View file @34f2673
@@ -5,7 +5,7 @@ namespace :noosfero do @@ -5,7 +5,7 @@ namespace :noosfero do
5 task :update => ['updatepo', 'noosfero:doc:rebuild'] 5 task :update => ['updatepo', 'noosfero:doc:rebuild']
6 6
7 desc 'Compiles all translations' 7 desc 'Compiles all translations'
8 - task :compile => ['makemo', 'noosfero:doc:translate'] 8 + task :compile => ['makemo', 'environment', 'noosfero:doc:translate']
9 9
10 end 10 end
11 end 11 end