organicmaps/twine
Archived
13
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity Actions

Split --all into --consume-all and --include-untranslated.

Browse source 
Overloading --all was a little confusing. It is better to be explicit.
This commit is contained in:
Sebastian Celis 2012-03-01 09:40:16 -06:00
parent 7af9048cf4
commit 78c52a6d73
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/twine/cli.rb
View file

@ -25,7 +25,7 @@ module Twine
opts.separator ''
opts.separator 'consume-string-file -- Slurps all of the strings from a translated strings file into the specified STRINGS_FILE. If you have some files returned to you by your translators you can use this command to incorporate all of their changes. This script will attempt to guess both the language and the format given the filename and extension. For example, "ja.strings" will assume that the file is a Japanese iOS strings file.'
opts.separator ''
opts.separator 'generate-loc-drop -- Generates a zip archive of strings files in any format. The purpose of this command is to create a very simple archive that can be handed off to a translation team. The translation team can unzip the archive, translate all of the strings in the archived files, zip everything back up, and then hand that final archive back to be consumed by the consume-loc-drop command. This command assumes that --all has been specified on the command line.'
opts.separator 'generate-loc-drop -- Generates a zip archive of strings files in any format. The purpose of this command is to create a very simple archive that can be handed off to a translation team. The translation team can unzip the archive, translate all of the strings in the archived files, zip everything back up, and then hand that final archive back to be consumed by the consume-loc-drop command. This command assumes that --include-untranslated has been specified on the command line.'
opts.separator ''
opts.separator 'consume-loc-drop -- Consumes an archive of translated files. This archive should be in the same format as the one created by the generate-loc-drop command.'
opts.separator ''
@ -53,8 +53,14 @@ module Twine
end
@options[:format] = lformat
end
opts.on('-a', '--all', 'Normally, when consuming a string file, Twine will ignore any string keys that do not exist in your master file. This flag will also cause any Android string files that are generated to include strings that have not yet been translated for the current language.') do |a|
@options[:consume_generate_all] = true
opts.on('-a', '--consume-all', 'Normally, when consuming a string file, Twine will ignore any string keys that do not exist in your master file.') do |a|
@options[:consume_all] = true
end
opts.on('-s', '--include-untranslated', 'This flag will cause any Android string files that are generated to include strings that have not yet been translated for the current language.') do |s|
@options[:include_untranslated] = true
end
opts.on('-o', '--output-file OUTPUT_FILE', 'Write the new strings database to this file instead of replacing the original file. This flag is only useful when running the consume-string-file or consume-loc-drop commands.') do |o|
@options[:output_path] = o
end
opts.on('-e', '--encoding ENCODING', 'Twine defaults to encoding all output files in UTF-8. This flag will tell Twine to use an alternate encoding for these files. For example, you could use this to write Apple .strings files in UTF-16. This flag currently only works with Apple .strings files and is currently only supported in Ruby 1.9.3 or greater.') do |e|
if !"".respond_to?(:encode)
@ -62,9 +68,6 @@ module Twine
end
@options[:output_encoding] = e
end
opts.on('-o', '--output-file OUTPUT_FILE', 'Write the new strings database to this file instead of replacing the original file. This flag is only useful when running the consume-string-file or consume-loc-drop commands.') do |o|
@options[:output_path] = o
end
opts.on('-h', '--help', 'Show this message.') do |h|
puts opts.help
exit
@ -134,7 +137,7 @@ module Twine
raise Twine::Error.new 'Please only specify a single language for the consume-string-file command.'
end
when 'generate-loc-drop'
@options[:consume_generate_all] = true
@options[:include_untranslated] = true
if @args.length == 3
@options[:output_path] = @args[2]
elsif @args.length > 3

2
lib/twine/formatters/abstract.rb
View file

@ -16,7 +16,7 @@ module Twine
def set_translation_for_key(key, lang, value)
if @strings.strings_map.include?(key)
@strings.strings_map[key].translations[lang] = value
elsif @options[:consume_generate_all]
elsif @options[:consume_all]
STDERR.puts "Adding new string '#{key}' to strings data file."
arr = @strings.sections.select { |s| s.name == 'Uncategorized' }
current_section = arr ? arr[0] : nil

2
lib/twine/formatters/android.rb
View file

@ -90,7 +90,7 @@ module Twine
key = row.key
value = row.translated_string_for_lang(lang, default_lang)
if !value && @options[:consume_generate_all]
if !value && @options[:include_untranslated]
value = row.translated_string_for_lang(@strings.language_codes[0])
end

2
test/twine_test.rb
View file

@ -5,7 +5,7 @@ class TwineTest < Test::Unit::TestCase
def test_generate_string_file_1
Dir.mktmpdir do |dir|
output_path = File.join(dir, 'fr.xml')
Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} --all))
Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} --include-untranslated))
assert_equal(File.read('test/fixtures/test-output-1.txt'), File.read(output_path))
end
end