r18n-core 0.1 → 0.1.1

data/README.rdoc

@@ -7,11 +7,12 @@ Use <tt>merb_r18n</tt> to localize Merb Web application and
 
 == Features
 
-* If there isn’t translation in user locale, it will be found in locales, which
+* It has special support for countries with two official languages. If there
+  isn’t translation in user locale, it will be found in locales, which
   user may know (not only in default locale). For example, many people in 
   Belarus can understand Russian, and locale has information about it.
-* It can localize your application: format numbers to the rules of the user 
-  locale, translate month and week days name and give other locale information.
+* It can format numbers and time to the rules of the user locale, translate
+  month and week days name and give other locale information.
 * It has translation for commons words, like “OK”, “Cancel”, etc.
 * It storage translation in rich YAML format. You can put procedures and
   pluralization (“1 comment”, “5 comments”) in your translation.
@@ -117,8 +118,8 @@ You can translate months and week days names in Time, Date and DateTime by
 
   i18n.l Time.now, "%B"  #=> "September"
 
-R18n has some time formats for locales: <tt>:time</tt>, <tt>:date</tt>,
-<tt>:short_data</tt>, <tt>:long_data</tt>, <tt>:datetime</tt>,
+R18n has some time formats for locales: <tt>:month</tt>, <tt>:time</tt>,
+<tt>:date</tt>, <tt>:short_data</tt>, <tt>:long_data</tt>, <tt>:datetime</tt>,
 <tt>:short_datetime</tt> and <tt>:long_datetime</tt>:
 
   i18n.l Time.now, :date #=> "09/21/2008"

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 PKG_NAME = 'r18n-core'
-PKG_VERSION = '0.1'
+require 'lib/r18n-core/version'
 
 ##############################################################################
 # Tests
@@ -54,13 +54,14 @@ end
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = PKG_NAME
-  s.version = PKG_VERSION
+  s.version = R18n::VERSION
   s.summary = 'I18n tool to translate your Ruby application.'
   s.description = <<-EOF
     R18n is a i18n tool to translate your Ruby application.
-    It can localize your application, has translation for commons words,
-    storage translation in rich YAML format with pluralization and procedures
-    and has sublocales list for each supported locale.
+    It can format numbers and time to the rules of the user locale,
+    has translation for common words, storage translation in YAML format with
+    pluralization and procedures and has special support for countries
+    with two official languages.
   EOF
   
   s.files = FileList[
@@ -89,5 +90,5 @@ end
 desc 'Install as a gem'
 task :install => [:package] do
   sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo'
-  sh %{#{sudo} gem install pkg/#{PKG_NAME}-#{PKG_VERSION}}
+  sh %{#{sudo} gem install pkg/#{PKG_NAME}-#{R18n::VERSION}}
 end

data/base/eo.yml

@@ -0,0 +1,7 @@
+ok: Ek
+save: Savi
+cancel: Nuligi
+yes: Jes
+no: Ne
+exit: Eliro
+delete: Forviŝi

data/lib/r18n-core/i18n.rb

@@ -101,7 +101,7 @@ module R18n
     # (it will load +fr+ for +fr_CA+ too).
     #
     # +Locales+ must be a locale code (RFC 3066) or array, ordered by priority.
-    def initialize(locales, translations_dir)
+    def initialize(locales, translations_dir = nil)
       locales = locales.to_a if String == locales.class
       
       @locales = locales.map do |locale|
@@ -130,8 +130,10 @@ module R18n
         end
       end
       
-      @translations_dir = File.expand_path(translations_dir)
-      @translation = Translation.load(locales, @translations_dir)
+      if not translations_dir.nil?
+        @translations_dir = File.expand_path(translations_dir)
+        @translation = Translation.load(locales, @translations_dir)
+      end
     end
     
     # Return Hash with titles (or code for translation without locale file) of

data/lib/r18n-core/locale.rb

@@ -133,10 +133,14 @@ module R18n
     # names. In +time+ you can use Time, DateTime or Date object. In +format+
     # you can use String with standart +strftime+ format (see
     # <tt>Time.strftime</tt> docs) or Symbol with format from locale file
-    # (<tt>:time</tt>, <tt>:date</tt>, <tt>:short_data</tt>, <tt>:long_data</tt>,
-    # <tt>:datetime</tt>, <tt>:short_datetime</tt> or <tt>:long_datetime</tt>).
+    # (<tt>:month</tt>, <tt>:time</tt>, <tt>:date</tt>, <tt>:short_data</tt>,
+    # <tt>:long_data</tt>, <tt>:datetime</tt>, <tt>:short_datetime</tt> or
+    # <tt>:long_datetime</tt>).
     def strftime(time, format)
       if Symbol == format.class
+        if :month == format
+          return @locale['months']['standalone'][time.month - 1]
+        end
         format = @locale['formats'][format.to_s]
       end
       

data/lib/r18n-core/translation.rb

@@ -32,10 +32,13 @@ module R18n
   # write <tt>%1</tt>, <tt>%2</tt>, etc and set it values as method arguments,
   # when you will be get value.
   #
+  # If in your system procedures in translations willn’t be secure (user can
+  # upoad or edit it) set <tt>R18n::Translation.call_proc</tt> to false.
+  #
   # To get translation value use method with same name. If translation name
   # is equal with Object methods (+new+, +to_s+, +methods+) use
   # <tt>[name, params…]</tt>. If you want to get pluralizable value, just set
-  # value for pluralization in fisrt argument of method. See samples below.
+  # value for pluralization in first argument of method. See samples below.
   #
   # Translated strings will have +locale+ methods, which return Locale or it
   # code, if locale file isn’t exists.
@@ -93,6 +96,8 @@ module R18n
   class Translation
     @@extension_translations = [
       Pathname(__FILE__).dirname.expand_path + '../../base']
+      
+    @@call_proc = true
 
     # Get dirs with extension translations. If application translations with
     # same locale isn’t exists, extension file willn’t be used.
@@ -135,6 +140,17 @@ module R18n
       self.new(locales, translations)
     end
     
+    # Is procedures in translations will be call. Set to false if user can
+    # upload or edit translations.
+    def self.call_proc=(call)
+      @@call_proc = call
+    end
+    
+    # Is procedures in translations will be call
+    def self.call_proc
+      @@call_proc
+    end
+    
     # Create translation hash with messages in +translations+ for +locales+.
     #
     # This is internal a constructor. To load translation use
@@ -166,7 +182,11 @@ module R18n
         if YAML::PrivateType == result.class
           case result.type_id
           when 'proc'
-            return eval("proc {#{result.value}}").call(*params)
+            if @@call_proc
+              return eval("proc {#{result.value}}").call(*params)
+            else
+              return nil
+            end
           when 'pl'
             locale = @locales[i]
             

data/lib/r18n-core/version.rb

@@ -0,0 +1,3 @@
+module R18n
+  VERSION = '0.1.1' unless defined?(R18n::VERSION)
+end

data/lib/r18n-core.rb

@@ -20,8 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 $KCODE = 'u'
 
 require 'pathname'
-dir = Pathname(__FILE__).dirname.expand_path + 'r18n-core'
 
+dir = Pathname(__FILE__).dirname.expand_path + 'r18n-core'
+require dir + 'version'
 require dir + 'locale'
 require dir + 'translated_string'
 require dir + 'translation'

data/locales/en.yml

@@ -21,12 +21,12 @@ time:
 
 formats:
   time: "%H:%M"
-  date: "%m/%d/%Y"
-  short_date: "%b %d"
-  long_date: "%B %d, %Y"
-  datetime: "%a %b %d %H:%M:%S %Z %Y"
+  date: "%d/%m/%Y"
+  short_date: "%d %b"
+  long_date: "%d %B, %Y"
+  datetime: "%a %d %b %H:%M:%S %Z %Y"
   short_datetime: "%d %b %H:%M"
-  long_datetime: "%B %d, %Y %H:%M"
+  long_datetime: "%d %B, %Y %H:%M"
 
 numbers:
   separation: classic

data/locales/en_US.yml

@@ -3,3 +3,12 @@ include: en
 code: en_US
 title: English (US)
 sublocales: [en]
+
+formats:
+  time: "%H:%M"
+  date: "%m/%d/%Y"
+  short_date: "%b %d"
+  long_date: "%B %d, %Y"
+  datetime: "%a %b %d %H:%M:%S %Z %Y"
+  short_datetime: "%b %d %H:%M"
+  long_datetime: "%B %d, %Y %H:%M"

data/locales/eo.yml

@@ -0,0 +1,34 @@
+title: Esperanto
+code: eo
+sublocales: [en]
+direction: ltr
+
+pluralization: "n == 0 ? 0 : n == 1 ? 1 : 'n'"
+
+week:
+  start: monday
+  days: [dimanĉo, lundo, mardo, merkredo, ĵaŭdo, vendredo, sabato]
+  abbrs: [dim, lun, mar, mer, ĵaŭ, ven, seb]
+
+months:
+  names: [januaro, februaro, marto, aprilo, majo, junio, julio, aŭgusto, septembro, oktobro, novembro, decembro]
+  abbrs: [jan, feb, mar, apr, maj, jun, jul, aŭg, sep, okt, nov, dec]
+  standalone: [januaro, februaro, marto, aprilo, majo, junio, julio, aŭgusto, septembro, oktobro, novembro, decembro]
+
+time:
+  am: AM
+  pm: PM
+
+formats:
+  time: "%H:%M"
+  date: "%Y-%m-%d"
+  short_date: "%d %b"
+  long_date: "la %d-a de %B de %Y"
+  datetime: "%a, %d %b %Y, %H:%M:%S %Z"
+  short_datetime: "%d %b, %H:%M"
+  long_datetime: "la %d-a de %B de %Y, %H:%M"
+
+numbers:
+  separation: classic
+  decimal_separator: "."
+  group_delimiter: " "

data/spec/i18n_spec.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe R18n::I18n do
-  DIR = Pathname(__FILE__).dirname + 'translations/general'
 
   it "should parse HTTP_ACCEPT_LANGUAGE" do
     R18n::I18n.parse_http(nil).should == []
@@ -74,5 +73,10 @@ describe R18n::I18n do
     
     i18n.l(Date.new(0)).should == '01.01.0000'
   end
+  
+  it "should loading without translations" do
+    i18n = R18n::I18n.new('ru')
+    i18n.l(Date.new(0)).should == '01.01.0000'
+  end
 
 end

data/spec/locale_spec.rb

@@ -40,7 +40,7 @@ describe R18n::Locale do
   end
 
   it "should return all available locales" do
-    R18n::Locale.available.sort.should == ['en', 'en_US', 'ru']
+    R18n::Locale.available.sort.should == ['en', 'en_US', 'eo', 'ru']
   end
 
   it "should return pluralization type by elements count" do
@@ -77,6 +77,7 @@ describe R18n::Locale do
     locale.strftime(time, '%b %B').should == 'янв января'
     locale.strftime(time, '%H:%M%p').should == '00:00 утра'
     
+    locale.strftime(time, :month).should == 'Январь'
     locale.strftime(time, :datetime).should == 'Чтв, 01 янв 1970, 00:00:00 GMT'
   end
 

data/spec/spec_helper.rb

@@ -10,3 +10,6 @@ class FakeIndianLocale < R18n::Locale
     }
   end
 end
+
+DIR = Pathname(__FILE__).dirname + 'translations/general'
+EXT = Pathname(__FILE__).dirname + 'translations/extension'

data/spec/translation_spec.rb

@@ -1,8 +1,6 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe R18n::Translation do
-  DIR = Pathname(__FILE__).dirname + 'translations/general'
-  EXT = Pathname(__FILE__).dirname + 'translations/extension'
 
   it "should return all available translations" do
     R18n::Translation.available(DIR).sort.should == ['en', 'no_LC', 'ru']
@@ -63,6 +61,14 @@ describe R18n::Translation do
     translation = R18n::Translation.load('en', DIR)
     translation.sum(2, 3).should == 5
   end
+  
+  it "shouldn't call proc if it isn't secure" do
+    translation = R18n::Translation.load('en', DIR)
+    R18n::Translation.call_proc = false
+    R18n::Translation.call_proc.should be_false
+    translation.sum(2, 3).should be_nil
+    R18n::Translation.call_proc = true
+  end
 
   it "should pluralize translation" do
     translation = R18n::Translation.load('en', DIR)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 +03:00
+date: 2008-11-23 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
-description: R18n is a i18n tool to translate your Ruby application. It can localize your application, has translation for commons words, storage translation in rich YAML format with pluralization and procedures and has sublocales list for each supported locale.
+description: R18n is a i18n tool to translate your Ruby application. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization and procedures and has special support for countries with two official languages.
 email: andrey@sitnik.ru
 executables: []
 
@@ -24,15 +24,18 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - base/ru.yml
+- base/eo.yml
 - base/en.yml
 - lib/r18n-core.rb
 - lib/r18n-core
 - lib/r18n-core/translation.rb
 - lib/r18n-core/translated_string.rb
 - lib/r18n-core/locale.rb
+- lib/r18n-core/version.rb
 - lib/r18n-core/i18n.rb
 - locales/en_US.yml
 - locales/ru.yml
+- locales/eo.yml
 - locales/en.yml
 - LICENSE
 - Rakefile