gettext_simple 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a384e7b157443ea0777813008727f62246b5d596
-  data.tar.gz: 550b003e7b7bf80c8f50b204d2e8f53f1fdb33f3
+  metadata.gz: 2eb895e7961ef32eac71be8e4028e1e7e36f2a4c
+  data.tar.gz: 3b2c03860b4885c1ac2280bdd11204b5eabaffb1
 SHA512:
-  metadata.gz: 16164102cf9c4d8e282979153b81cf903d67ab49242052387f42c678a21d312d9cc9be481851aac7978fd0f7981c189c1917bfd628b9b63a98434e91dd4b577e
-  data.tar.gz: a7a6624968f33de23ae65962b808abd8ddc8f7d1afa2c964c2b99de33972c91dddfd91ab1b68db2b1b28e762b020716cdd32847e129898e2c7a3f1d11ca75185
+  metadata.gz: 18e7bc4d0eeb9345ff621578cc4dcd6f48ab4fc634e6669337f6c21f592bc426d3e9191ebea0e64b031cee823fd0f2d14cf3a6ac6cfe9d5b8a91345e4f83153a
+  data.tar.gz: 998471cc897a4d57d2db5b0479a848e7ab630c40fef6dd123287471f7461aa94320bf22fd17dfe3d5e9c694e6acca7507624c1d47b685abbe33d2262f0281617

data/{README.rdoc → README.md}

@@ -1,4 +1,4 @@
-= gettext_simple
+# GettextSimple
 
 A very simple implementation of Gettext for Ruby.
 
@@ -9,15 +9,15 @@ gettext_simple = GettextSimple.new(:i18n => true)
 gettext_simple.load_dir("#{__dir__}/../../locales_gettext")
 gettext_simple.register_kernel_methods
 
-echo _("Hello world")
+puts _("Hello world")
 ```
 
 Replacements are done this way:
 ```ruby
-echo _("Hello %{name}", :name => "Kasper") #=> "Hello Kasper"
+puts _("Hello %{name}", :name => "Kasper") #=> "Hello Kasper"
 ```
 
-== Contributing to gettext_simple
+## Contributing to gettext_simple
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -27,7 +27,7 @@ echo _("Hello %{name}", :name => "Kasper") #=> "Hello Kasper"
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2014 Kasper Johansen. See LICENSE.txt for
 further details.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/gettext_simple.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "gettext_simple"
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2014-04-09"
+  s.date = "2014-04-10"
   s.description = "A very simple version of Gettext reading .po files directly."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -22,13 +22,14 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "gettext_simple.gemspec",
     "include/kernel_methods.rb",
     "lib/gettext_simple.rb",
     "spec/gettext_simple_spec.rb",
+    "spec/sample_file.po",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kaspernj/gettext_simple"

data/lib/gettext_simple.rb

@@ -101,13 +101,59 @@ class GettextSimple
 private
   
   def scan_pofile(locale, filepath)
-    cont = nil
-    File.open(filepath, "r", {:encoding => @args[:encoding]}) do |fp|
-      cont = fp.read.encode("utf-8")
-    end
+    current_id = nil
+    current_translation = nil
+    
+    reading_id = false
+    reading_translation = false
     
-    cont.scan(/msgid\s+\"(.+)\"(\r|)\nmsgstr\s+\"(.+)\"(\r|)\n(\r|)\n/) do |match|
-      @locales[locale][match[0]] = match[2].to_s.encode("utf-8")
+    File.open(filepath, "r", :encoding => @args[:encoding]) do |fp|
+      fp.each_line do |line|
+        if match = line.match(/^(msgid|msgstr)\s+"(.*)"$/)
+          if match[1] == "msgid"
+            current_id = match[2]
+            reading_id = true
+          elsif match[1] == "msgstr"
+            current_translation = match[2]
+            reading_id = false
+            reading_translation = true
+          else
+            raise "Unknown translation parameter: '#{match[1]}'."
+          end
+        elsif match = line.match(/^"(.*)"$/)
+          if reading_id
+            current_id << match[1]
+          elsif reading_translation
+            current_translation << match[1]
+          else
+            raise "Text given but don't know what to do with it."
+          end
+        elsif line.match(/^(\r|)\n$/)
+          if reading_id
+            reading_id = false
+          elsif reading_translation
+            add_translation(locale, current_id, current_translation)
+            reading_translation = false
+            current_id = nil
+            current_translation = nil
+          end
+        elsif line.start_with?("#")
+          # Line is a comment - ignore.
+        else
+          raise "Couldn't understand line: '#{line}'."
+        end
+      end
+      
+      add_translation(locale, current_id, current_translation) if reading_translation
     end
+    
+    #cont.scan(/msgid\s+\"(.+)\"(\r|)\nmsgstr\s+\"(.+)\"(\r|)\n(\r|)\n/) do |match|
+    #  @locales[locale][match[0]] = match[2].to_s.encode("utf-8")
+    #end
+  end
+  
+  def add_translation(locale, key, val)
+    raise "No such language: '#{locale}'." unless @locales.key?(locale)
+    @locales[locale][key] = val
   end
-end
+end

data/spec/gettext_simple_spec.rb

@@ -7,9 +7,18 @@ describe "GettextSimple" do
     Dir.mkdir("#{@dir}/da")
     Dir.mkdir("#{@dir}/da/LC_MESSAGES")
     
-    File.open("#{@dir}/da/LC_MESSAGES/default.po", "w") do |fp|
+    file_path = "#{@dir}/da/LC_MESSAGES/default.po"
+    File.open(file_path, "w") do |fp|
       fp.puts "msgid \"test %{name}\"\n"
-      fp.puts "msgstr \"test translate %{name}\"\n\n"
+      fp.puts "msgstr \"test translate %{name}\"\n"
+      fp.puts "\n"
+      
+      fp.puts "msgid \"\"\n"
+      fp.puts "\"test multiple lines\"\n"
+      fp.puts "msgstr \"\"\n"
+      fp.puts "\"test mange\"\n"
+      fp.puts "\" linjer\"\n"
+      fp.puts "\n"
     end
     
     @gs = GettextSimple.new
@@ -29,4 +38,26 @@ describe "GettextSimple" do
     
     _("test %{name}", :name => "Kasper").should eq "test translate Kasper"
   end
+  
+  it "can read multiple line values" do
+    @gs.instance_variable_get(:@locales)["da"].keys.should include "test multiple lines"
+    @gs.instance_variable_get(:@locales)["da"]["test multiple lines"].should eq "test mange linjer"
+  end
+  
+  it "can read a sample file from POEdit" do
+    @gs = GettextSimple.new
+    
+    da = {}
+    locales = @gs.instance_variable_get(:@locales)
+    locales[:da] = da
+    
+    @gs.__send__(:scan_pofile, :da, "#{File.dirname(__FILE__)}/sample_file.po")
+    
+    da["Locale"].should eq "Sprog"
+    
+    test_key = "BeachInspectors.com is your online tool for the best beach vacation in Denmark. Find reviews and insider tips for danish beaches and rate your favorite beach."
+    test_value = "BeachInspectors.com er dit online værktøj til den bedste strand ferie i Danmark. Find bedømmelser og insider tips til danske strande og bedøm dine favoritstrande."
+    
+    da[test_key].should eq test_value
+  end
 end

data/spec/sample_file.po

@@ -0,0 +1,136 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: danish_beaches\n"
+"POT-Creation-Date: 2014-04-10 11:11+0100\n"
+"PO-Revision-Date: 2014-04-10 11:11+0100\n"
+"Last-Translator: Kasper Johansen <k@spernj.org>\n"
+"Language-Team: Kasper Johansen <k@spernj.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: ../../../\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-SearchPath-0: app\n"
+"X-Poedit-SearchPath-1: lib\n"
+
+#: app/admin/beach.rb:7 app/admin/beach_preference.rb:18
+#: app/views/beach_preferences/_form.html.erb:51
+#: app/views/beaches/index.html.erb:9
+msgid "Name"
+msgstr "Navn"
+
+#: app/admin/beach.rb:18
+msgid "Details"
+msgstr "Detaljer"
+
+#: app/admin/beach.rb:24
+msgid "Preference values"
+msgstr "Præference værdier"
+
+#: app/admin/beach.rb:28 app/admin/page.rb:7
+msgid "Translations"
+msgstr "Oversættelser"
+
+#: app/admin/beach.rb:31
+msgid "Meta description"
+msgstr "Meta beskrivelse"
+
+#: app/admin/beach.rb:33 app/admin/beach.rb:59
+#: app/views/beach_preferences/_form.html.erb:56
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: app/admin/beach.rb:46 app/admin/page.rb:18
+msgid "Locale"
+msgstr "Sprog"
+
+#: app/admin/beach.rb:55
+msgid "Appetizer"
+msgstr "Appetitvækker"
+
+#: app/admin/page.rb:24
+msgid "Content"
+msgstr "Indhold"
+
+#: app/models/beach.rb:29
+msgid "Beach %s"
+msgstr "Strand %s"
+
+#: app/models/beach_preference.rb:7
+msgid "Boolean"
+msgstr "Boolean"
+
+#: app/models/beach_preference.rb:8
+msgid "Checkbox"
+msgstr "Checkboks"
+
+#: app/models/beach_preference.rb:9 app/views/beaches/show.html.erb:345
+msgid "Stars"
+msgstr "Stjerner"
+
+#: app/models/beach_preference.rb:47 app/models/beach_preference.rb:55
+msgid "Not set"
+msgstr "Ikke sat"
+
+#: app/models/beach_preference.rb:48 app/models/beach_preference.rb:56
+msgid "No"
+msgstr "Nej"
+
+#: app/models/beach_preference.rb:49 app/models/beach_preference.rb:57
+msgid "Yes"
+msgstr "Ja"
+
+#: app/models/beach_preference.rb:63
+msgid "Invalid type: '%s'."
+msgstr "Ugyldig type: '%s'."
+
+#: app/models/comment.rb:6
+msgid "You do not have permission to approve comments."
+msgstr "Du har ikke rettighed til at godkende kommentarer."
+
+#: app/models/comment.rb:7
+msgid "This comment is already approved."
+msgstr "Denne kommentar er allerede godkendt."
+
+#: app/controllers/facebook_sessions_controller.rb:20
+msgid "No Facebook-cookie set."
+msgstr "Ingen Facebook-cookie var sat."
+
+#: app/controllers/application_controller.rb:46
+msgid "Not logged in so no Facebook-token."
+msgstr "Ikke logget ind så der er ingen Facebook-token."
+
+#: app/controllers/comments_controller.rb:28
+msgid "Just wrote a comment for a beach on the BeackFreaks-website!"
+msgstr ""
+"Har lige skrevet en kommentar til en strand på BeachFreaks-hjemmesiden!"
+
+#: app/controllers/comments_controller.rb:29
+msgid "A picture of Roedbyhavn Beach."
+msgstr "Et billede af Rødbyhavn Strand."
+
+#: app/views/pages/show.html.erb:4 app/views/beaches/show.html.erb:283
+msgid "Administration"
+msgstr "Administration"
+
+#: app/views/users/show.html.erb:1
+msgid "Show user: %s"
+msgstr "Vis bruger: %s"
+
+#: app/views/frontpage/index.html.erb:3
+msgid "BeachInspectors | Tips and reviews for the best beaches in Denmark"
+msgstr "BeachInspectors | Tips og bedømmelser af de bedste strande i Danmark."
+
+#: app/views/frontpage/index.html.erb:7
+#: app/views/layouts/application.html.erb:15
+msgid ""
+"BeachInspectors.com is your online tool for the best beach vacation in "
+"Denmark. Find reviews and insider tips for danish beaches and rate your "
+"favorite beach."
+msgstr ""
+"BeachInspectors.com er dit online værktøj til den bedste strand ferie i "
+"Danmark. Find bedømmelser og insider tips til danske strande og bedøm dine "
+"favoritstrande."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_simple
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,20 +86,21 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - gettext_simple.gemspec
 - include/kernel_methods.rb
 - lib/gettext_simple.rb
 - spec/gettext_simple_spec.rb
+- spec/sample_file.po
 - spec/spec_helper.rb
 homepage: http://github.com/kaspernj/gettext_simple
 licenses: