gettext 2.3.7 → 2.3.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (91) hide show
  1. data/doc/text/news.md +24 -0
  2. data/gettext.gemspec +1 -0
  3. data/lib/gettext/tools/parser/ruby.rb +3 -1
  4. data/lib/gettext/tools/po.rb +1 -1
  5. data/lib/gettext/tools/poparser.rb +1 -1
  6. data/lib/gettext/version.rb +2 -2
  7. data/locale/bg/LC_MESSAGES/gettext.mo +0 -0
  8. data/locale/bs/LC_MESSAGES/gettext.mo +0 -0
  9. data/locale/ca/LC_MESSAGES/gettext.mo +0 -0
  10. data/locale/cs/LC_MESSAGES/gettext.mo +0 -0
  11. data/locale/de/LC_MESSAGES/gettext.mo +0 -0
  12. data/locale/el/LC_MESSAGES/gettext.mo +0 -0
  13. data/locale/eo/LC_MESSAGES/gettext.mo +0 -0
  14. data/locale/es/LC_MESSAGES/gettext.mo +0 -0
  15. data/locale/et/LC_MESSAGES/gettext.mo +0 -0
  16. data/locale/fr/LC_MESSAGES/gettext.mo +0 -0
  17. data/locale/hr/LC_MESSAGES/gettext.mo +0 -0
  18. data/locale/hu/LC_MESSAGES/gettext.mo +0 -0
  19. data/locale/it/LC_MESSAGES/gettext.mo +0 -0
  20. data/locale/ja/LC_MESSAGES/gettext.mo +0 -0
  21. data/locale/ko/LC_MESSAGES/gettext.mo +0 -0
  22. data/locale/lv/LC_MESSAGES/gettext.mo +0 -0
  23. data/locale/nb/LC_MESSAGES/gettext.mo +0 -0
  24. data/locale/nl/LC_MESSAGES/gettext.mo +0 -0
  25. data/locale/pt_BR/LC_MESSAGES/gettext.mo +0 -0
  26. data/locale/ru/LC_MESSAGES/gettext.mo +0 -0
  27. data/locale/sr/LC_MESSAGES/gettext.mo +0 -0
  28. data/locale/uk/LC_MESSAGES/gettext.mo +0 -0
  29. data/locale/vi/LC_MESSAGES/gettext.mo +0 -0
  30. data/locale/zh/LC_MESSAGES/gettext.mo +0 -0
  31. data/locale/zh_TW/LC_MESSAGES/gettext.mo +0 -0
  32. data/samples/cgi/locale/ca/LC_MESSAGES/helloerb1.mo +0 -0
  33. data/samples/cgi/locale/ca/LC_MESSAGES/helloerb2.mo +0 -0
  34. data/samples/cgi/locale/de/LC_MESSAGES/helloerb1.mo +0 -0
  35. data/samples/cgi/locale/de/LC_MESSAGES/helloerb2.mo +0 -0
  36. data/samples/cgi/locale/it/LC_MESSAGES/helloerb1.mo +0 -0
  37. data/samples/cgi/locale/it/LC_MESSAGES/helloerb2.mo +0 -0
  38. data/samples/cgi/locale/ko/LC_MESSAGES/helloerb1.mo +0 -0
  39. data/samples/cgi/locale/ko/LC_MESSAGES/helloerb2.mo +0 -0
  40. data/samples/locale/bg/LC_MESSAGES/hello_gtk.mo +0 -0
  41. data/samples/locale/bs/LC_MESSAGES/hello_gtk.mo +0 -0
  42. data/samples/locale/ca/LC_MESSAGES/hello_gtk.mo +0 -0
  43. data/samples/locale/cs/LC_MESSAGES/hello_gtk.mo +0 -0
  44. data/samples/locale/de/LC_MESSAGES/hello_gtk.mo +0 -0
  45. data/samples/locale/el/LC_MESSAGES/hello_gtk.mo +0 -0
  46. data/samples/locale/eo/LC_MESSAGES/hello_gtk.mo +0 -0
  47. data/samples/locale/es/LC_MESSAGES/hello_gtk.mo +0 -0
  48. data/samples/locale/fr/LC_MESSAGES/hello_gtk.mo +0 -0
  49. data/samples/locale/hr/LC_MESSAGES/hello_gtk.mo +0 -0
  50. data/samples/locale/hu/LC_MESSAGES/hello_gtk.mo +0 -0
  51. data/samples/locale/it/LC_MESSAGES/hello_gtk.mo +0 -0
  52. data/samples/locale/ja/LC_MESSAGES/hello_gtk.mo +0 -0
  53. data/samples/locale/ko/LC_MESSAGES/hello_gtk.mo +0 -0
  54. data/samples/locale/lv/LC_MESSAGES/hello_gtk.mo +0 -0
  55. data/samples/locale/nb/LC_MESSAGES/hello_gtk.mo +0 -0
  56. data/samples/locale/nl/LC_MESSAGES/hello_gtk.mo +0 -0
  57. data/samples/locale/pt_BR/LC_MESSAGES/hello_gtk.mo +0 -0
  58. data/samples/locale/ru/LC_MESSAGES/hello_gtk.mo +0 -0
  59. data/samples/locale/sr/LC_MESSAGES/hello_gtk.mo +0 -0
  60. data/samples/locale/sv/LC_MESSAGES/hello_gtk.mo +0 -0
  61. data/samples/locale/uk/LC_MESSAGES/hello_gtk.mo +0 -0
  62. data/samples/locale/vi/LC_MESSAGES/hello_gtk.mo +0 -0
  63. data/samples/locale/zh/LC_MESSAGES/hello_gtk.mo +0 -0
  64. data/samples/locale/zh_TW/LC_MESSAGES/hello_gtk.mo +0 -0
  65. data/samples/po/hello.pot +3 -3
  66. data/samples/po/hello2.pot +3 -3
  67. data/samples/po/hello_glade2.pot +3 -3
  68. data/samples/po/hello_gtk2.pot +3 -3
  69. data/samples/po/hello_noop.pot +3 -3
  70. data/samples/po/hello_plural.pot +3 -3
  71. data/samples/po/hello_tk.pot +3 -3
  72. data/src/poparser.ry +1 -1
  73. data/test/fixtures/_.rb +2 -1
  74. data/test/locale/ja/LC_MESSAGES/npgettext.mo +0 -0
  75. data/test/locale/ja/LC_MESSAGES/nsgettext.mo +0 -0
  76. data/test/locale/ja/LC_MESSAGES/pgettext.mo +0 -0
  77. data/test/locale/ja/LC_MESSAGES/sgettext.mo +0 -0
  78. data/test/po/_.pot +2 -2
  79. data/test/po/backslash.pot +3 -3
  80. data/test/po/non_ascii.pot +3 -3
  81. data/test/po/np_.pot +4 -5
  82. data/test/po/ns_.pot +3 -3
  83. data/test/po/p_.pot +3 -3
  84. data/test/po/s_.pot +3 -3
  85. data/test/po/untranslated.pot +2 -2
  86. data/test/test_locale_path.rb +7 -5
  87. data/test/test_parser.rb +4 -4
  88. data/test/test_po_generation.rb +2 -2
  89. data/test/test_textdomain_toplevel.rb +1 -1
  90. data/test/tools/test_xgettext.rb +73 -36
  91. metadata +733 -709
data/doc/text/news.md CHANGED
@@ -1,5 +1,29 @@
1
1
  # News
2
2
 
3
+ ## <a id="2-3-8">2.3.8</a>: 2013-04-05
4
+
5
+ This is a msgmerge improved release.
6
+
7
+ ### Improvements
8
+
9
+ * Added licence information to the gemspec.
10
+ [GitHub #13] [Patch by jordimassaguerpla]
11
+ * Supported Ruby 2.0.0.
12
+ [GitHub #14] [Reported by mtasaka]
13
+
14
+ ### Fixes
15
+
16
+ * [rxgettext] Fixed a bug that the comment for the previous message
17
+ also exists in the current message.
18
+ [Debian #684184] [Reported by Francesco Poli] [Patch by Jérémy Bobbio]
19
+
20
+ ### Thanks
21
+
22
+ * jordimassaguerpla
23
+ * mtasaka
24
+ * Francesco Poli
25
+ * Jérémy Bobbio
26
+
3
27
  ## <a id="2-3-7">2.3.7</a>: 2013-01-11
4
28
 
5
29
  This is a msgmerge improved release.
data/gettext.gemspec CHANGED
@@ -37,4 +37,5 @@ So you can use GNU gettext tools for maintaining.
37
37
  s.add_development_dependency("test-unit")
38
38
  s.add_development_dependency("test-unit-notify")
39
39
  s.add_development_dependency("test-unit-rr")
40
+ s.license = "Ruby or LGPLv3+"
40
41
  end
@@ -160,7 +160,9 @@ module GetText
160
160
  ignore_next_comma = false
161
161
  case tk
162
162
  when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
163
- store_po_entry(po, po_entry, path, line_no, last_comment)
163
+ if store_po_entry(po, po_entry, path, line_no, last_comment)
164
+ last_comment = ""
165
+ end
164
166
  if ID.include?(tk.name)
165
167
  po_entry = POEntry.new(:normal)
166
168
  elsif PLURAL_ID.include?(tk.name)
@@ -191,7 +191,7 @@ module GetText
191
191
  header_entry = @entries[[nil, ""]]
192
192
  po_string << header_entry.to_s unless header_entry.nil?
193
193
 
194
- content_entries = @entries.reject do |(msgctxt, msgid), _|
194
+ content_entries = @entries.reject do |(_, msgid), _|
195
195
  msgid == :last or msgid.empty?
196
196
  end
197
197
 
@@ -235,7 +235,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
235
235
 
236
236
  def detect_file_encoding(po_file)
237
237
  open(po_file, :encoding => 'ASCII-8BIT') do |input|
238
- input.lines.each do |line|
238
+ input.each_line do |line|
239
239
  return Encoding.find($1) if %r["Content-Type:.*\scharset=(.*)\\n"] =~ line
240
240
  end
241
241
  end
@@ -1,7 +1,7 @@
1
1
  =begin
2
2
  version - version information of gettext
3
3
 
4
- Copyright (C) 2012 Kouhei Sutou <kou@clear-code.com>
4
+ Copyright (C) 2012-2013 Kouhei Sutou <kou@clear-code.com>
5
5
  Copyright (C) 2005-2009 Masao Mutoh
6
6
 
7
7
  You may redistribute it and/or modify it under the same
@@ -9,5 +9,5 @@
9
9
  =end
10
10
 
11
11
  module GetText
12
- VERSION = "2.3.7"
12
+ VERSION = "2.3.8"
13
13
  end
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
data/samples/po/hello.pot CHANGED
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 10:50+0900\n"
12
- "PO-Revision-Date: 2012-11-15 10:50+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
data/src/poparser.ry CHANGED
@@ -333,7 +333,7 @@ end
333
333
 
334
334
  def detect_file_encoding(po_file)
335
335
  open(po_file, :encoding => 'ASCII-8BIT') do |input|
336
- input.lines.each do |line|
336
+ input.each_line do |line|
337
337
  return Encoding.find($1) if %r["Content-Type:.*\scharset=(.*)\\n"] =~ line
338
338
  end
339
339
  end
data/test/fixtures/_.rb CHANGED
@@ -97,11 +97,12 @@ ddd
97
97
  end
98
98
 
99
99
  def test_17
100
- ret = _(<<EOF
100
+ translated = _(<<EOF
101
101
  Here document1
102
102
  Here document2
103
103
  EOF
104
104
  )
105
+ translated
105
106
  end
106
107
 
107
108
  def test_18
data/test/po/_.pot CHANGED
@@ -8,8 +8,8 @@ msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: gettext 2.3.4\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 12:08+0900\n"
12
- "PO-Revision-Date: 2012-11-15 12:08+0900\n"
11
+ "POT-Creation-Date: 2012-10-29 14:22+0900\n"
12
+ "PO-Revision-Date: 2012-10-29 14:22+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 12:08+0900\n"
12
- "PO-Revision-Date: 2012-11-15 12:08+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 12:08+0900\n"
12
- "PO-Revision-Date: 2012-11-15 12:08+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
data/test/po/np_.pot CHANGED
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 12:08+0900\n"
12
- "PO-Revision-Date: 2012-11-15 12:08+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -18,8 +18,7 @@ msgstr ""
18
18
  "Content-Transfer-Encoding: 8bit\n"
19
19
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
 
21
- #: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33
22
- #: ../fixtures/np_.rb:34
21
+ #: ../fixtures/np_.rb:28 ../fixtures/np_.rb:29 ../fixtures/np_.rb:33 ../fixtures/np_.rb:34
23
22
  msgctxt "Magazine"
24
23
  msgid "a book"
25
24
  msgid_plural "%{num} books"
data/test/po/ns_.pot CHANGED
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: gettext 2.3.4\n"
9
+ "Project-Id-Version: gettext 2.3.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2012-11-15 12:08+0900\n"
12
- "PO-Revision-Date: 2012-11-15 12:08+0900\n"
11
+ "POT-Creation-Date: 2012-08-24 15:08+0900\n"
12
+ "PO-Revision-Date: 2012-08-24 15:08+0900\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"