Commit fa6244fc538d6453a97bc4d23e400505269c9bcc
Exists in
master
and in
28 other branches
Merge branch 'stable'
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
lib/noosfero.rb
| 1 | module Noosfero | 1 | module Noosfero |
| 2 | PROJECT = 'noosfero' | 2 | PROJECT = 'noosfero' |
| 3 | - VERSION = '0.22.2' | 3 | + VERSION = '0.22.3' |
| 4 | 4 | ||
| 5 | def self.pattern_for_controllers_in_directory(dir) | 5 | def self.pattern_for_controllers_in_directory(dir) |
| 6 | disjunction = controllers_in_directory(dir).join('|') | 6 | disjunction = controllers_in_directory(dir).join('|') |
lib/tasks/doc.rake
| @@ -105,7 +105,7 @@ namespace :noosfero do | @@ -105,7 +105,7 @@ namespace :noosfero do | ||
| 105 | if File.exists?(po) | 105 | if File.exists?(po) |
| 106 | Dir['doc/noosfero/**/*.en.xhtml'].each do |doc| | 106 | Dir['doc/noosfero/**/*.en.xhtml'].each do |doc| |
| 107 | target = doc.sub('.en.xhtml', ".#{lang}.xhtml") | 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 | end | 109 | end |
| 110 | end | 110 | end |
| 111 | end | 111 | end |
lib/tasks/release.rake
| @@ -57,7 +57,7 @@ EOF | @@ -57,7 +57,7 @@ EOF | ||
| 57 | end | 57 | end |
| 58 | 58 | ||
| 59 | desc 'prepares a release tarball' | 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 | sh "git tag #{version}" | 61 | sh "git tag #{version}" |
| 62 | sh 'rake -f Rakefile.pkg' | 62 | sh 'rake -f Rakefile.pkg' |
| 63 | puts "I: please upload the tarball to the website!" | 63 | puts "I: please upload the tarball to the website!" |