r18n-core 0.4.5 → 0.4.6

data/ChangeLog

@@ -1,3 +1,14 @@
+== 0.4.6 (Trinity)
+* Add support for new interpolation syntax in Rails 3.
+* Add Catalian locale (by Jordi Romero).
+* Add Finish locale (by Laura Guillén).
+* Add British locale (by JP Hastings-Spital).
+* Add Latvian locale (by Iļja Ketris).
+* Fix Spanish (by Jordi Romero), German, French, Esperanto (Iļja Ketris) and
+  Polish locales.
+* Fix documentation (by Iļja Ketris and felix).
+* Remove RubyGems from plugins requires.
+
 == 0.4.5 (Annual)
 * Filters for several types.
 * Global HTML escaping run before Markdown and Textile formatting.

data/README.rdoc

@@ -1,6 +1,6 @@
 = R18n
 
-R18n is a i18n tool to translate your Ruby application to several languages.
+R18n is an i18n tool to translate your Ruby application into several languages.
 
 Use <tt>r18n-rails</tt>, <tt>sinatra-r18n</tt> or teamon’s <tt>merb_i18n</tt> to
 localize Web applications and <tt>r18n-desktop</tt> to localize desktop
@@ -9,7 +9,7 @@ application.
 == Features
 
 === Ruby-style Syntax
-R18n uses hierarchical not English-centrist YAML format for translations by
+R18n uses hierarchical, not English-centric, YAML format for translations by
 default:
 
   user:
@@ -19,7 +19,7 @@ default:
       1: There is 1 user
       n: There are %1 users
 
-To access translation you can call methods with same names:
+To access translation you can call methods with the same names:
 
   t.user.edit         #=> "Edit user"
   t.user.name('John') #=> "User name is John"
@@ -28,14 +28,15 @@ To access translation you can call methods with same names:
   t.not.exists | 'default' #=> "default"
   t.not.exists.translated? #=> false
 
-If translation key has name of Object method you can use another way:
+If the translation key is the name of an Object method you can access it via
+hash index:
 
   t[:methods] #=> "Methods"
 
 === Filters
 
-You can add custom filters for some YAML type or any translated strings.
-Filters are cascade and can communicate with each other.
+You can add custom filters for YAML types or any translated string. Filters are
+cascading and can communicate with each other.
 
 R18n already has filters for HTML escaping, lambdas, Textile and Markdown:
 
@@ -50,22 +51,22 @@ R18n already has filters for HTML escaping, lambdas, Textile and Markdown:
 === Flexibility
 
 Translation variables and pluralization (“1 comment”, “5 comments”) are filters
-too. So you can extend or replace it. For example, you can use named variables
-filter from <tt>r18n-rails-api</tt> gem:
+too, so you can extend or replace them. For example, you can use the ‘named
+variables filter’ from the <tt>r18n-rails-api</tt> gem:
 
-  greeting: "Hi, {{name}}"
+  greeting: "Hi, %{name}"
 
   R18n::Filters.on(:named_variables)
   t.greeting(name: 'John') #=> "Hi, John"
 
 === Flexible Locales
 
-Locale can extend Locale class, so locales are very flexible. For example,
-English locale extend time formatters:
+Locales extend the Locale class. For example, English locale extends the time
+formatters:
 
   l Date.now, :full #=> "30th of November, 2009"
 
-Or Russian has built-in different pluralization without any lambdas in YAML:
+Russian has built-in pluralization without any lambdas in YAML:
 
   t.user.count(1) #=> "1 пользователь"
   t.user.count(2) #=> "2 пользователя"
@@ -73,7 +74,7 @@ Or Russian has built-in different pluralization without any lambdas in YAML:
 
 === Loaders
 
-R18n can load translations from any places, not just from YAML files. You just
+R18n can load translations from anywhere, not just from YAML files. You just
 need to create loader object with 2 methods: +available+ and +load+:
 
   class DBLoader
@@ -87,8 +88,9 @@ need to create loader object with 2 methods: +available+ and +load+:
   
   R18n.set R18n::I18n.new(user_locales, DBLoader.new)
 
-You can also set a list of different translation places or set extension places,
-which will be used only with application translation (useful for plugins).
+You can also set a list of different translation locations or set extension
+locations which will be only used with application translation (useful for
+plugins).
 
 === Object Translation
 
@@ -98,14 +100,14 @@ You can translate any class, including ORM models:
   
   class Product < ActiveRecord::Base
     include R18n::Translated
-    # Model has two usual property: title_en and title_ru
+    # Model has two normal properties: title_en and title_ru
     translations :title
   end
   
-  # For English user
+  # For English users
   product.title #=> "Anthrax"
   
-  # For Russian user
+  # For Russian users
   product.title #=> "Сибирская язва"
 
 === Localization
@@ -119,12 +121,10 @@ R18n can localize numbers and time:
 
 === Several User Languages
 
-Lack of translation in user language isn’t exception for R18n (because
-translation to not primary language done by enthusiasts, it can be out of date).
-R18n just automatically take next user language (browser send a list of locales)
-and for cultures with two officially languages (e.g., exUSSR) it take second
-language (e.g., if translation isn’t available in Kazakh R18n will see in
-Russian):
+If a particular locale is requested but missing, R18n will automatically take
+the next available language (according to the browser’s list of locales) and for
+cultures with two official languages (e.g., exUSSR) it takes the second language
+(e.g., if a translation isn’t available in Kazakh R18n will look for Russian):
 
   i18n = R18n::I18n.new(['kk', 'de'], 'dir/with/translations')
   
@@ -138,22 +138,22 @@ Russian):
 
 === Agnostic
 
-R18n has a agnostic core package and plugins with out-of-box support for
+R18n has an agnostic core package and plugins with out-of-box support for
 Sinatra, Merb and desktop applications.
 
 == Usage
 
-To add i18n support to your app, you can use special plugin for your
+To add i18n support to your app, you can use the particular plugin for your
 environment: <tt>r18n-rails</tt>, <tt>sinatra-r18n</tt> or
 <tt>r18n-desktop</tt>.
 
-If you develop you own plugin or want to use only core gem, you must to create
-I18n object and set to global variable by <tt>R18n.set</tt> or to current thread
-by <tt>R18n.thread_set</tt>:
+If you develop you own plugin or want to use only core gem, you will need to
+create an I18n object and by using <tt>R18n.set</tt> or, for the current thread,
+by using <tt>R18n.thread_set</tt>:
 
   R18n.set(R18n::I18n.new('en', 'path/to/translations'))
   
-You can add helpers to access to current I18n object:
+You can add helpers to access the current R18n object:
 
   include R18n::Helpers
   
@@ -163,12 +163,13 @@ You can add helpers to access to current I18n object:
 
 === Translation
 
-Translation files use YAML format and has name like en.yml (English) or
-en-us.yml (USA English dialect) with language/country code (RFC 3066).
+Translation files are in YAML format by default and have names like en.yml
+(English) or en-us.yml (USA English dialect) with language/country code (RFC
+3066).
 
-In translation you can use:
+In your translation files you can use:
 * Strings
-    robot: This is robot
+    robot: This is a robot
     percent: "Percent sign (%)"
 * Numbers
     number: 123
@@ -180,62 +181,62 @@ In translation you can use:
       n: %1 robots
 * Filters
     filtered: !!custom_type
-      This content will be processed by filter
+      This content will be processed by a filter
 
-To get translated string use method with key name or square brackets [] for
-keys, which is same with Object methods (+class+, +inspect+, etc):
+To get the translated string use a method with the key name or square brackets
+[] for keys, which is the same with Object methods (+class+, +inspect+, etc):
 
-  t.robot    #=> "This is robot"
-  t[:robot]  #=> "This is robot"
+  t.robot    #=> "This is a robot"
+  t[:robot]  #=> "This is a robot"
 
 Translation may be hierarchical:
 
   t.post.add     #=> "Add post"
   t[:post][:add] #=> "Add post"
 
-If locale willn’t be found in user locale R18n will search it in they sublocales
-or in another locale, which user know:
+If the locale isn’t found in the user’s requested locale, R18n will search for
+it in sublocales or in another locale, which the user also can accept:
 
-  t.no.in.english #=> "В английском нет"
+  t.not.in.english #=> "В английском нет"
 
-Translated string has +locale+ method and you can get it locale (Locale instance
-or code string if locale is’t supported in R18n):
+The translated string has a +locale+ method for determining its locale (Locale 
+instance or code string if locale is’t supported in R18n):
 
-  i18n.no.in.english.locale #=> Locale ru (Русский)
+  i18n.not.in.english.locale #=> Locale ru (Русский)
 
-You can replace some parameters in translated string by put it as arguments:
+You can include parameters in the translated string by specifying arguments:
   
   name: "My name is %1"
 
   t.name('John') #=> "My name is John"
 
-Pluralizable messages get item count from first argument:
+Pluralizable messages get their item count from the first argument:
 
   t.robots(0)  #=> "No robots"
   t.robots(1)  #=> "One robot"
   t.robots(50) #=> "50 robots"
 
-If there isn’t pluralization for some number, translation will be use +n+. If
-there isn’t locale file for translation, it will be use English pluralization
-rule (0, 1 and +n+).
+If there isn’t a pluralization for a particular number, translation will be use
++n+. If there isn’t a locale file for translation, it will use the English
+pluralization rule (0, 1 and +n+).
 
-You can check, is message has translation:
+You can check if the key has a translation:
 
   t.post.add.translated?   #=> true
   t.not.exists.translated? #=> false
 
-For untranslated strings you can set default value:
+You can set a default value for untranslated strings:
 
   t.not.exists | 'default' #=> "default"
 
-You can get translation keys, to analyze translation:
+You can query the translation keys:
 
   t.counties._keys.each do |county|
     puts t.counties[county]
   end
 
-R18n already has translation for common words for most supported locales.
-See <tt>base/</tt> in dir in gem.
+R18n already has translations for common words for most built in locales.
+See <tt>base/</tt> the source.
 
   t.yes    #=> "Yes"
   t.cancel #=> "Cancel"
@@ -243,28 +244,45 @@ See <tt>base/</tt> in dir in gem.
 
 === Filters
 
-You can also add you own filter for translations: escape HTML entries, convert
-from Markdown syntax, etc. Filters can be passive to process translation only on
-loading.
+You can also add you own filters for translations: escape HTML entities, convert
+from Markdown syntax, etc. Filters can be passive, only being processed when
+loaded.
 
-  R18n::Filters.add('custom_type', :filter_name) do |content, config, replace|
-    content.gsub(' ', replace)
-  end
-  R18n::Filters.add('custom_type', :passive => true) do |content, config|
-    content + '!'
-  end
+  friendship: !!gender
+    f: She adds a friend
+    m: He adds a friend
   
-  t.filtered('_') #=> "This_content_will_be_processed_by_filter!"
-
-You can also add global filters for all translated strings:
-
-  R18n::Filters.add(String, :capitalize_ruby) do |content, config|
-    content.gsub(/ruby/i) { |i| i.swapcase }
+  R18n::Filters.add('gender', :user_gender) do |content, config, user|
+    if user.female?
+      content['f']
+    else
+      content['m']
+    end
   end
+  
+  t.friendship(anne) #=> "She adds a friend"
+  
+To create a filter you pass the following to <tt>R18n::Filters.add</tt>:
+
+* Filter target. YAML type (<tt>!!type</tt>), <tt>String</tt> for all
+  translations of <tt>R18n::Untranslated</tt> for missing translations.
+* Optional filter name, to disable, enable or delete it later by
+  <tt>R18n::Filters.off</tt>, <tt>R18n::Filters.on</tt> and
+  <tt>R18n::Filters.delete</tt>.
+* Hash with options:
+  * <tt>:passive => true</tt> to filter translations only on load;
+  * <tt>:position</tt> within the list of current filters of this type
+    (by default a new filter will be inserted into last position).
+
+The filter will receive at least two arguments:
+* Translation (possibly already filtered by other filters for this type earlier
+  in the list).
+* A Hash with translation +locale+ and +path+.
+* Parameters from translation request will be in the remaining arguments.
 
 ==== HTML Escape
 
-R18n contain 2 filters to escape HTML entries: by YAML type and global. If you
+R18n contains 2 filters to escape HTML entities: by YAML type and global. If you
 need to escape HTML in some translations, just set <tt>!!escape</tt> YAML type:
 
   greater: !!escape
@@ -273,12 +291,12 @@ need to escape HTML in some translations, just set <tt>!!escape</tt> YAML type:
   t.greater #=> "1 &lt; 2 is true"
 
 If you develop web application and want to escape HTML in all translations, just
-activate global escape filter:
+activate the global escape filter:
 
   R18n::Filters.on(:global_escape_html)
 
-If you enable global HTML escape, you may use <tt>!!html</tt> YAML type to
-disable escaping in some special value.
+If you enable global HTML escape, you may still use <tt>!!html</tt> YAML type to
+disable escaping on some values:
 
   warning: !!html
     <b>Warning</b>
@@ -288,7 +306,7 @@ disable escaping in some special value.
 
 ==== Markdown
 
-To use Markdown in your translations you must install maruku gem:
+To use Markdown in your translations you must install the Maruku gem:
 
   hi: !!markdown
     **Hi**, people!
@@ -298,7 +316,7 @@ To use Markdown in your translations you must install maruku gem:
 
 ==== Textile
 
-To use Textile in your translations you must install RedCloth gem:
+To use Textile in your translations you must install the RedCloth gem:
 
   alarm: !!textile
     It will delete _all_ users!
@@ -313,27 +331,27 @@ You can use lambdas in your translations.
 
   t.sum(1, 2) #=> 3
 
-If it isn’t secure in your application (for example, user can change
+If this is unsafe in your application (for example, user can change
 translations), you can disable it:
 
   R18n::Filters.off(:procedure)
 
 === Localization
 
-You can print number and float according to the rules of the user locale:
+You can print numbers and floats according to the rules of the user locale:
 
   l -12000.5 #=> "−12,000.5"
 
 Number and float formatters will also put real typographic minus and put
-non-break thin spaces (for locale, which use it as digit separator).
+non-breakable thin spaces (for locale, which use it as digit separator).
 
-You can translate months and week days names in Time, Date and DateTime by
+You can translate months and week day names in Time, Date and DateTime by the
 +strftime+ method:
 
   l Time.now, '%B'  #=> "September"
 
-R18n has some time formats for locales: <tt>:human</tt>, <tt>:full</tt> and
-<tt>:standard</tt> (by default):
+R18n has some built-in time formats for locales: <tt>:human</tt>, <tt>:full</tt>
+and <tt>:standard</tt> (the default):
 
   l Time.now, :human #=> "now"
   l Time.now, :full  #=> "August 9th, 2009 21:47"
@@ -355,13 +373,13 @@ You can add i18n support to any classes, including ORM models:
     translations :title
   end
   
-  # For example, user know only Russian
+  # For example, user only knows Russian
   
-  # Set value to English (default) title
+  # Set English (default) title
   product.title_en = "Anthrax"
   product.title #=> "Anthrax"
   
-  # Set value to title on user locale (Russian)
+  # Set value for user locale (Russian)
   product.title = "Сибирская язва"
   product.title #=> "Сибирская язва"
   
@@ -372,14 +390,16 @@ See R18n::Translated for documentation.
 
 === Locale
 
-All supported locales are storage in R18n gem at +locales+ dir. If you want to
-add your locale, please write me to andrey@sitnik.ru.
+All supported locales are stored in R18n gem in +locales+ directory. If you want
+to add your locale, please fork this project and send a pull request or email me
+at andrey@sitnik.ru.
 
-To get information about locale create R18n::Locale instance:
+To get information about a locale create an R18n::Locale instance:
 
   locale = R18n::Locale.load('en')
 
-You can get from locale:
+You can then get the following from the locale:
+
 * Locale title and RFC 3066 code:
   
     locale.title #=> "English"
@@ -395,24 +415,26 @@ You can get from locale:
 
 === Loaders
 
-You can load translations from any ways, not just from YAML files. To load
+You can load translations from anywhere, not just from YAML files. To load
 translation you must create loader class with 2 methods:
+
 * <tt>available</tt> – return array of locales of available translations;
 * <tt>load(locale)</tt> – return Hash of translation.
-And put it instance to <tt>R18n::I18n.new</tt>:
+
+Pass its instance to <tt>R18n::I18n.new</tt>:
 
   R18n.set R18n::I18n.new('en', MyLoader.new(loader_param))
 
-You can set your loader as default and pass to <tt>R18n::I18n.new</tt> only
-constructor argument:
+You can set your default loader and pass it to <tt>R18n::I18n.new</tt> as the
+only constructor argument:
 
   R18n.default_loader = MyLoader
   R18n.set R18n::I18n.new('en', loader_param)
 
-If you want to load translation with some type for filter, use
+If you want to load a translation with some type for filter, use
 <tt>R18n::Typed</tt> struct:
 
-  # Loader load method return something like:
+  # Loader will return something like:
   { 'users' => R18n::Typed.new('pl', { 1 => '1 user', 'n' => '%1 users' }) }
   
   # To use pluralization filter (+pl+ type):
@@ -422,34 +444,36 @@ If you want to load translation with some type for filter, use
 
 For r18n plugin you can add loaders with translations, which will be used with
 application translations. For example, DB plugin may place translations for
-error messages in extension dir. R18n contain translations for base words as
-extension dir too.
+error messages in extension directory. R18n contain translations for base words
+as extension directory too.
 
   R18n.extension_places << R18n::Loader::YAML.new('./error_messages/')
 
 == Add Locale
 
-If R18n hasn’t locale file for your language, please add it. It’s very simple:
-* Create in locales/ file _code_.rb for your language and describe locale.
-  Just copy from another locale and change different values.
-  * If in your country people mostly know another language (like in exUSSR
-    countries people know Russian), add
+If R18n hasn’t got locale file for your language, please add it. It’s very
+simple:
+
+* Create the file _code_.rb in the locales/ directory for your language and
+  describe locale. Just copy from another locale and change the values.
+  * If your country has alternate languages (for example, in exUSSR countries
+    most people also know Russian), add
     <tt>sublocales %{_another_locale_ en}</tt>.
-* Create in base/ file _code_.yml for your language and translate base messages.
-  Just copy file from language, which you know, and rewrite values.
-* If you language need some special logic (for example, different pluralization
-  or time formatters) you can extend Locale class methods.
-* Push files by GitHub (http://github.com/ai/r18n) or just write e-mail with
-  this files to me (andrey@sitnik.ru).
+* Create in base/ file _code_.yml for your language and translate the base
+  messages. Just copy file from language, which you know, and rewrite values.
+* If your language needs some special logic (for example, different
+  pluralization or time formatters) you can extend Locale class methods.
+* Send a pull request via GitHub (http://github.com/ai/r18n) or just write email
+  with the files to me (andrey@sitnik.ru).
 
 _Code_ is RFC 3066 code for your language (for example, “en” for English and
-“fr-CA” for Canadian French). You can send to my e-mail any questions (on
-http://sitnik.ru you find another contact addresses).
+“fr-CA” for Canadian French). Email me with any questions you may have, you will
+find other contact addresses at http://sitnik.ru.
 
 == License
 
 R18n is licensed under the GNU Lesser General Public License version 3.
-You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
+See the LICENSE file or http://www.gnu.org/licenses/lgpl.html.
 
 == Author
 

data/base/ca.yml

@@ -0,0 +1,31 @@
+ok: "D'acord"
+save: Desar
+cancel: Cancel·lar
+'yes': 'Sí'
+'no': 'No'
+exit: Sortir
+delete: Esborrar
+
+human_time:
+  after_days: !!pl
+    1: %1 dia després
+    n: %1 dies després
+  tomorrow: demà
+  after_hours: !!pl
+    1: %1 hora després
+    n: %1 hores després
+  after_minutes: !!pl
+    1: %1 minut després
+    n: %1 minuts després
+  now: ara
+  today: avui
+  minutes_ago: !!pl
+    1: fa %1 minut
+    n: fa %1 minuts
+  hours_ago: !!pl
+    1: fa %1 hora
+    n: fa %1 hores
+  yesterday: ahir
+  days_ago: !!pl
+    1: fa %1 dia
+    n: fa %1 dies

data/base/de.yml

@@ -20,12 +20,12 @@ human_time:
   now: jetzt
   today: heute
   minutes_ago: !!pl
-    1: %1 Minute vor
-    n: %1 Minuten vor
+    1: vor %1 Minute
+    n: vor %1 Minuten
   hours_ago: !!pl
-    1: %1 Stunde vor
-    n: %1 Stunden vor
+    1: vor %1 Stunde
+    n: vor %1 Stunden
   yesterday: gestern
   days_ago: !!pl
-    1: %1 Tag vor
-    n: %1 Tagen vor
+    1: vor %1 Tag
+    n: vor %1 Tagen

data/base/fi.yml

@@ -0,0 +1,31 @@
+ok: OK
+save: Tallenna
+cancel: Peru
+'yes': Kyllä
+'no': Ei
+exit: Poistu
+delete: Poista
+
+human_time:
+  after_days: !!pl
+    1: yhden päivän kuluttua
+    n: %1 päivän kuluttua
+  tomorrow: huomenna
+  after_hours: !!pl
+    1: yhden tunnin kuluttua
+    n: %1 tunnin kuluttua
+  after_minutes: !!pl
+    1: yhden minuutin kuluttua
+    n: %1 minuutin kuluttua
+  now: nyt
+  today: tänään
+  minutes_ago: !!pl
+    1: minuutti sitten
+    n: %1 minuuttia sitten
+  hours_ago: !!pl
+    1: tunti sitten
+    n: %1 tuntia sitten
+  yesterday: eilen
+  days_ago: !!pl
+    1: päivä sitten
+    n: %1 päivää sitten

data/base/fr.yml

@@ -3,12 +3,12 @@ save: Enregistrer
 cancel: Annuler
 'yes': Oui
 'no': Non
-exit: Sortie
+exit: Partir
 delete: Supprimer
 
 human_time:
   after_days: !!pl
-    1: dans une jour
+    1: dans un jour
     n: dans %1 jours
   tomorrow: demain
   after_hours: !!pl
@@ -20,12 +20,12 @@ human_time:
   now: maintenant
   today: "aujourd'hui"
   minutes_ago: !!pl
-    1: il ya une minute
-    n: il ya %1 minutes
+    1: il y a une minute
+    n: il y a %1 minutes
   hours_ago: !!pl
-    1: il ya une heure
-    n: il ya %1 heures
+    1: il y a une heure
+    n: il y a %1 heures
   yesterday: hier
   days_ago: !!pl
-    1: il ya une jour
-    n: il ya %1 jours
+    1: il y a un jour
+    n: il y a %1 jours

data/base/lv.yml

@@ -0,0 +1,31 @@
+ok: Ok
+save: Saglabāt
+cancel: Atcelt
+'yes': 'Jā'
+'no': 'Nē'
+exit: Iziet
+delete: Dzēst
+
+human_time:
+  after_days: !!pl
+    1: nākamajā dienā
+    n: pēc %1 dienām
+  tomorrow: rīt
+  after_hours: !!pl
+    1: nākamajā stundā
+    n: pēc %1 stundas
+  after_minutes: !!pl
+    1: nākamajā minūtē
+    n: pēc %1 minūtēm
+  now: tagad
+  today: šodien
+  minutes_ago: !!pl
+    1: pirms minūtes
+    n: pirms %1 minūtēm
+  hours_ago: !!pl
+    1: pirms stundas
+    n: pirms %1 stundām
+  yesterday: vakar
+  days_ago: !!pl
+    1: pirms vienas dienas
+    n: pirms %1 stundām

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '0.4.5' unless defined? R18n::VERSION
+  VERSION = '0.4.6' unless defined? R18n::VERSION
 end

data/locales/ca.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module R18n
+  class Locales::Ca < Locale
+    set :title => 'Català',
+        
+        :wday_names => %w{diumenge dilluns dimarts dimecres dijous divendres dissabte},
+        :wday_abbrs => %w{dg dl dm dc dj dv ds},
+        
+        :month_names => %w{Gener Febrer Març Abril Maig Juny Juliol Agost
+                           Setembre Octubre Novembre Desembre},
+        :month_abbrs => %w{gen feb mar abr mai jun jul ago set oct nov des},
+        
+        :date_format => '%d/%m/%Y',
+        :full_format => '%d de %B',
+        :year_format => '_ de %Y',
+        
+        :number_decimal => ",",
+        :number_group   => "."
+  end
+end

data/locales/de.rb

@@ -9,11 +9,13 @@ module R18n
         
         :month_names => %w{Januar Februar März April Mai Juni Juli August
                            September Oktober November Dezember},
-        :month_abbrs => %w{Jan Feb Mär Apr Mai Jun Jul Aug Sep Okt Nov Dez},
+        :month_abbrs => %w{Jan. Feb. Mär. Apr. Mai. Jun. Jul. Aug. Sep. Okt.
+                           Nov. Dez.},
         
         :time_am => 'vormittags',
         :time_pm => 'nachmittags',
         :date_format => '%d.%m.%Y',
+        :full_format => '%e. %B',
         
         :number_decimal => ",",
         :number_group   => "."

data/locales/en-gb.rb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), 'en')
+
+module R18n::Locales
+  class EnGb < En
+    set :title => 'British English',
+        :code =>  'en-GB',
+        :sublocales => %w{en}
+  end
+end

data/locales/en-us.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'en')
 
 module R18n::Locales
   class EnUs < En
-    set :title => 'English (US)',
+    set :title => 'American English',
         :code =>  'en-US',
         :sublocales => %w{en},
         

data/locales/eo.rb

@@ -4,7 +4,7 @@ module R18n
     set :title => 'Esperanto',
         
         :wday_names => %w{dimanĉo lundo mardo merkredo ĵaŭdo vendredo sabato},
-        :wday_abbrs => %w{dim lun mar mer ĵaŭ ven seb},
+        :wday_abbrs => %w{dim lun mar mer ĵaŭ ven sab},
         
         :month_names => %w{januaro februaro marto aprilo majo junio julio
                            aŭgusto septembro oktobro novembro decembro},

data/locales/es.rb

@@ -4,7 +4,7 @@ module R18n
     set :title => 'Español',
         
         :wday_names => %w{domingo lunes martes miércoles jueves viernes sábado},
-        :wday_abbrs => %w{dom lun mar mie jue mie sab},
+        :wday_abbrs => %w{dom lun mar mie jue vie sab},
         
         :month_names => %w{Enero Febrero Marzo Abril Mayo Junio Julio Agosto
                            Septiembre Octubre Noviembre Diciembre},

data/locales/fi.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module R18n
+  class Locales::Fi < Locale
+    set :title => 'Suomi',
+        
+        :wday_names => %w{sunnuntai maanantai tiistai keskiviikko torstai
+                          terjantai lauantai},
+        :wday_abbrs => %w{su ma ti ke to te la},
+        
+        :month_names => %w{tammikuuta helmikuuta maaliskuuta huhtikuuta
+                           toukokuuta kesäkuuta heinäkuuta elokuuta syyskuuta
+                           lokakuuta marraskuuta joulukuuta},
+        :month_abbrs => %w{tam hel maa huh tou kes hei elo syy lok mar jou},
+        :month_standalone => %w{tammikuu helmikuu maaliskuu huhtikuu toukokuu
+                                kesäkuu heinäkuu elokuu syyskuu lokakuu
+                                marraskuu joulukuu},
+        
+        :date_format => '%d.%m.%Y',
+        :time_format => ' %H.%M',
+        :full_format => '%e. %B',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+    
+    def format_time_full(time, *params)
+      format_date_full(time) + ' kello' + format_time(time)
+    end
+  end
+end

data/locales/lv.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+module R18n
+  class Locales::Lv < Locale
+    set :title => 'Latviešu',
+        
+        :wday_names => %w{Svētdiena Pirmdiena Otrdiena Trešdiena Ceturtdiena
+                          Piektiena Sestdiena},
+        :wday_abbrs => %w{Sv P O T C P S},
+        
+        :month_names => %w{janvāris februāris marts aprīlis maijs jūnijs jūlijs
+                           augusts septembris oktobris novembris decembris},
+        :month_abbrs => %w{jan feb mar apr mai jūn jūl aug sep okt nov dec},
+        :month_standalone => %w{Janvāris Februāris Marts Aprīlis Maijs Jūnijs
+                                Jūlijs Augusts Septembris Oktobris Novembris
+                                Decembris},
+        
+        :date_format => '%d.%m.%Y',
+        :year_format => '_, %Y',
+            
+        :number_decimal => ",",
+        :number_group   => " "
+    
+    def pluralize(n)
+      if 0 == n
+        0
+      elsif 1 == n % 10 and 11 != n % 100
+        1
+      else
+        'n'
+      end
+    end
+  end
+end

data/locales/pl.rb

@@ -14,11 +14,11 @@ module R18n
                                 sierpień wrzesień październik listopad
                                 grudzień},
         
-        :date_format => '%d/%m/%Y',
+        :date_format => '%d.%m.%Y',
         
         :number_decimal => ",",
         :number_group   => " "
-        
+    
     def pluralize(n)
       return 0 if n == 0
       case n % 10

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +04:00
+date: 2010-06-22 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -29,48 +29,55 @@ extra_rdoc_files:
 - LICENSE
 - ChangeLog
 files: 
-- base/kk.yml
-- base/it.yml
-- base/ru.yml
+- base/th.yml
+- base/zh.yml
+- base/eo.yml
 - base/pl.yml
 - base/sk.yml
+- base/kk.yml
+- base/es.yml
+- base/fi.yml
+- base/lv.yml
 - base/de.yml
-- base/eo.yml
-- base/cs.yml
+- base/en.yml
+- base/ca.yml
+- base/it.yml
+- base/ru.yml
 - base/pt_br.yml
-- base/es.yml
 - base/fr.yml
-- base/th.yml
-- base/en.yml
-- base/zh.yml
-- lib/r18n-core.rb
-- lib/r18n-core/filters.rb
-- lib/r18n-core/untranslated.rb
-- lib/r18n-core/yaml_loader.rb
+- base/cs.yml
 - lib/r18n-core/version.rb
-- lib/r18n-core/utils.rb
-- lib/r18n-core/translated_string.rb
-- lib/r18n-core/translation.rb
+- lib/r18n-core/i18n.rb
 - lib/r18n-core/translated.rb
+- lib/r18n-core/translation.rb
 - lib/r18n-core/unsupported_locale.rb
-- lib/r18n-core/locale.rb
-- lib/r18n-core/i18n.rb
+- lib/r18n-core/yaml_loader.rb
+- lib/r18n-core/untranslated.rb
+- lib/r18n-core/translated_string.rb
+- lib/r18n-core/filters.rb
 - lib/r18n-core/helpers.rb
-- locales/it.rb
+- lib/r18n-core/utils.rb
+- lib/r18n-core/locale.rb
+- lib/r18n-core.rb
 - locales/pl.rb
-- locales/en.rb
-- locales/cs.rb
 - locales/es.rb
-- locales/kk.rb
-- locales/en-us.rb
-- locales/zh.rb
+- locales/fi.rb
+- locales/sk.rb
+- locales/eo.rb
+- locales/cs.rb
 - locales/th.rb
+- locales/it.rb
+- locales/en.rb
+- locales/zh.rb
 - locales/fr.rb
+- locales/kk.rb
+- locales/lv.rb
 - locales/ru.rb
-- locales/sk.rb
-- locales/pt-br.rb
+- locales/en-us.rb
+- locales/en-gb.rb
 - locales/de.rb
-- locales/eo.rb
+- locales/pt-br.rb
+- locales/ca.rb
 - LICENSE
 - ChangeLog
 - README.rdoc
@@ -105,28 +112,28 @@ signing_key:
 specification_version: 3
 summary: I18n tool to translate your Ruby application.
 test_files: 
-- spec/translated_spec.rb
-- spec/locales/it_spec.rb
-- spec/locales/th_spec.rb
-- spec/locales/fr_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/pl_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/en_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/spec_helper.rb
-- spec/r18n_spec.rb
 - spec/yaml_loader_spec.rb
-- spec/translation_spec.rb
-- spec/translations/general/ru.yml
-- spec/translations/general/en.yml
 - spec/translations/general/no-lc.yml
-- spec/translations/two/fr.yml
+- spec/translations/general/en.yml
+- spec/translations/general/ru.yml
 - spec/translations/two/en.yml
+- spec/translations/two/fr.yml
 - spec/translations/extension/no-tr.yml
 - spec/translations/extension/en.yml
 - spec/translations/extension/deep/en.yml
-- spec/filters_spec.rb
+- spec/spec_helper.rb
 - spec/i18n_spec.rb
+- spec/translation_spec.rb
+- spec/locales/en-us_spec.rb
+- spec/locales/cs_spec.rb
+- spec/locales/sk_spec.rb
+- spec/locales/ru_spec.rb
+- spec/locales/fr_spec.rb
+- spec/locales/th_spec.rb
+- spec/locales/en_spec.rb
+- spec/locales/it_spec.rb
+- spec/locales/pl_spec.rb
+- spec/translated_spec.rb
+- spec/r18n_spec.rb
+- spec/filters_spec.rb
 - spec/locale_spec.rb