Download as
Browse Code »

Commit fa6244fc538d6453a97bc4d23e400505269c9bcc

Authored by Antonio Terceiro
2 parents 72691c97 7326693e
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

Merge branch 'stable'

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
lib/noosfero.rb
  Diff comments   View file @fa6244f
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '0.22.2'
  3 + VERSION = '0.22.3'
4 4  
5 5 def self.pattern_for_controllers_in_directory(dir)
6 6 disjunction = controllers_in_directory(dir).join('|')
... ...
lib/tasks/doc.rake
  Diff comments   View file @fa6244f
... ... @@ -105,7 +105,7 @@ namespace :noosfero do
105 105 if File.exists?(po)
106 106 Dir['doc/noosfero/**/*.en.xhtml'].each do |doc|
107 107 target = doc.sub('.en.xhtml', ".#{lang}.xhtml")
108   - sh "po4a-translate -f xhtml -M utf8 -m #{doc} -p #{po} -L utf8 -l #{target}"
  108 + sh "po4a-translate -f xhtml -M utf8 -m #{doc} -p #{po} -L utf8 -l #{target} >/dev/null 2>&1"
109 109 end
110 110 end
111 111 end
... ...
lib/tasks/release.rake
  Diff comments   View file @fa6244f
... ... @@ -57,7 +57,7 @@ EOF
57 57 end
58 58  
59 59 desc 'prepares a release tarball'
60   - task :release => [ :check_tag, 'noosfero:doc:build', :authors, :check_repo ] do
  60 + task :release => [ :check_tag, 'noosfero:doc:translate', :authors, :check_repo ] do
61 61 sh "git tag #{version}"
62 62 sh 'rake -f Rakefile.pkg'
63 63 puts "I: please upload the tarball to the website!"
... ...