french_rails 0.2.1 → 0.2.2

data/lib/french_rails.rb

@@ -1,8 +1,6 @@
 # FrenchRails
 module FrenchRails
   class Railtie < Rails::Railtie
-    railtie_name :french_rails
-
     initializer :load_french_rails => :load_application_initializers do
       require 'french_rails/backend/simple'
       require 'french_rails/action_view/text_helper'

data/lib/french_rails/backend/simple.rb

@@ -1,25 +1,23 @@
-require 'i18n/backend/base'
-require 'i18n/backend/fast'
+require 'i18n/backend/simple'
+require 'i18n/backend/memoize'
 
 module FrenchRails
-  module Backend
-    class Simple
-      include I18n::Backend::Base
-      include I18n::Backend::Fast
-
-      # The french grammar rules are not the same that for english.
-      # For our concern, the main difference is 0:
-      # in english, 0 is plural, but in french, it's singular.
-      #
-      def pluralize(locale, entry, count)
-        return entry unless entry.is_a?(Hash) and count
-        key = :zero if count == 0 && entry.has_key?(:zero)
-        key ||= count <= 1 ? :one : :other
-        raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
-        entry[key]
-      end
-
+  module Pluralization
+    # The french grammar rules are not the same that for english.
+    # For our concern, the main difference is 0:
+    # in english, 0 is plural, but in french, it's singular.
+    #
+    def pluralize(locale, entry, count)
+      return entry unless entry.is_a?(Hash) and count
+      key = :zero if count == 0 && entry.has_key?(:zero)
+      key ||= count <= 1 ? :one : :other
+      raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
+      entry[key]
     end
   end
 end
 
+class I18n::Backend::Simple
+  include FrenchRails::Pluralization
+  include I18n::Backend::Memoize
+end

data/lib/french_rails/i18n.rb

@@ -1,3 +1,2 @@
-I18n.backend = FrenchRails::Backend::Simple.new
 I18n.load_path << Dir[File.join(File.dirname(__FILE__), '..', '..', 'locales', '*.{rb,yml}')]
 I18n.default_locale = :fr

data/locales/fr_actionpack.yml

@@ -4,14 +4,29 @@ fr:
       separator: ","
       delimiter: " "
       precision: 3
+      significant: false
+      strip_insignificant_zeros: false
     currency:
       format:
         format: "%n %u"
         unit: "€"
+        separator: ","
+        delimiter: " "
         precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
     human:
       format:
+        delimiter: ""
         precision: 2
+        significant: true
+        strip_insignificant_zeros: true
       storage_units:
         format: "%n %u"
         units:
@@ -22,6 +37,15 @@ fr:
           mb: "Mo"
           gb: "Go"
           tb: "To"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: Millier
+          million: Million
+          billion: Milliard
+          trillion: Mille milliard
+          quadrillion: Million de milliard
 
   datetime:
     distance_in_words:
@@ -29,35 +53,38 @@ fr:
       less_than_x_seconds:
         zero:  "moins d'une seconde"
         one:   "moins d'une seconde"
-        other: "moins de {{count}} secondes"
+        other: "moins de %{count} secondes"
       x_seconds:
         one:   "1 seconde"
-        other: "{{count}} secondes"
+        other: "%{count} secondes"
       less_than_x_minutes:
         zero:  "moins d'une minute"
         one:   "moins d'une minute"
-        other: "moins de {{count}} minutes"
+        other: "moins de %{count} minutes"
       x_minutes:
         one:   "1 minute"
-        other: "{{count}} minutes"
+        other: "%{count} minutes"
       about_x_hours:
         one:   "environ une heure"
-        other: "environ {{count}} heures"
+        other: "environ %{count} heures"
       x_days:
         one:   "1 jour"
-        other: "{{count}} jours"
+        other: "%{count} jours"
       about_x_months:
         one:   "environ un mois"
-        other: "environ {{count}} mois"
+        other: "environ %{count} mois"
       x_months:
         one:   "1 mois"
-        other: "{{count}} mois"
+        other: "%{count} mois"
       about_x_years:
         one:   "environ un an"
-        other: "environ {{count}} ans"
+        other: "environ %{count} ans"
       over_x_years:
         one:   "plus d'un an"
-        other: "plus de {{count}} ans"
+        other: "plus de %{count} ans"
+      almost_x_years:
+        one:   "presqu'un an"
+        other: "presque %{count} ans"
     prompts:
       year:   "Année"
       month:  "Mois"
@@ -69,15 +96,14 @@ fr:
   errors:
     template:
       header:
-        one:   "Impossible d'enregistrer ce {{model}} : 1 erreur"
-        other: "Impossible d'enregistrer ce {{model}} : {{count}} erreurs"
+        one:   "Impossible d'enregistrer ce %{model} : 1 erreur"
+        other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
       body: "Veuillez vérifier les champs suivants : "
 
   helpers:
     select:
       prompt: "Veuillez sélectionner"
     submit:
-      create: "Créer {{model}}"
-      update: "Modifier {{model}}"
-      submit: "Enregistrer {{model}}"
-
+      create: "Créer un %{model}"
+      update: "Modifier ce %{model}"
+      submit: "Enregistrer ce %{model}"

data/locales/fr_activemodel.yml

@@ -1,6 +1,6 @@
 fr:
   errors:
-    format: "Le {{attribute}} {{message}}"
+    format: "Le %{attribute} %{message}"
     messages:
       inclusion: "n'est pas inclus(e) dans la liste"
       exclusion: "n'est pas disponible"
@@ -9,14 +9,15 @@ fr:
       accepted: "doit être accepté(e)"
       empty: "doit être rempli(e)"
       blank: "doit être rempli(e)"
-      too_long: "est trop long (pas plus de {{count}} caractères)"
-      too_short: "est trop court (au moins {{count}} caractères)"
-      wrong_length: "ne fait pas la bonne longueur (doit comporter {{count}} caractères)"
+      too_long: "est trop long (pas plus de %{count} caractères)"
+      too_short: "est trop court (au moins %{count} caractères)"
+      wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
       not_a_number: "n'est pas un nombre"
-      greater_than: "doit être supérieur à {{count}}"
-      greater_than_or_equal_to: "doit être supérieur ou égal à {{count}}"
-      equal_to: "doit être égal à {{count}}"
-      less_than: "doit être inférieur à {{count}}"
-      less_than_or_equal_to: "doit être inférieur ou égal à {{count}}"
+      not_an_integer: "doit être un nombre entier"
+      greater_than: "doit être supérieur à %{count}"
+      greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
+      equal_to: "doit être égal à %{count}"
+      less_than: "doit être inférieur à %{count}"
+      less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
       odd: "doit être impair"
       even: "doit être pair"

data/locales/fr_activerecord.yml

@@ -6,4 +6,4 @@ fr:
     errors:
       messages:
         taken: "n'est pas disponible"
-        record_invalid: "Échec de la validation : {{errors}}"
+        record_invalid: "Échec de la validation : %{errors}"

data/locales/fr_responders.yml

@@ -3,12 +3,11 @@ fr:
   flash:
     actions:
       create:
-        notice: "{{resource_name}} créé(e)"
-        alert:  "{{resource_name}} impossible à créer"
+        notice: "%{resource_name} créé(e)"
+        alert:  "%{resource_name} impossible à créer"
       update:
-        notice: "{{resource_name}} mis(e) à jour"
-        alert:  "{{resource_name}} impossible à mettre à jour"
+        notice: "%{resource_name} mis(e) à jour"
+        alert:  "%{resource_name} impossible à mettre à jour"
       destroy:
-        notice: "{{resource_name}} supprimé(e)"
-        alert:  "{{resource_name}} impossible à supprimer"
-
+        notice: "%{resource_name} supprimé(e)"
+        alert:  "%{resource_name} impossible à supprimer"

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: french_rails
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Bruno Michel
@@ -9,11 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +01:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
-description: A plugin for Ruby on Rails for simple french localization
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id001
+description: A Rails3 plugin for simple french localization
 email: bmichel@menfin.info
 executables: []
 
@@ -22,51 +43,52 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .document
-- .gitignore
 - MIT-LICENSE
 - README
-- Rakefile
-- VERSION
-- french_rails.gemspec
 - init.rb
 - lib/french_rails.rb
+- lib/french_rails/i18n.rb
+- lib/french_rails/backend/simple.rb
 - lib/french_rails/action_dispatch/resources_path_names.rb
 - lib/french_rails/action_view/text_helper.rb
-- lib/french_rails/backend/simple.rb
-- lib/french_rails/i18n.rb
 - locales/fr_actionpack.yml
 - locales/fr_activemodel.yml
-- locales/fr_activerecord.yml
 - locales/fr_activesupport.yml
 - locales/fr_responders.yml
+- locales/fr_activerecord.yml
 has_rdoc: true
 homepage: http://github.com/nono/french-rails
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Simple french localization for Rails
+summary: Simple french localization for Rails3
 test_files: []
 

data/.document

@@ -1,6 +0,0 @@
-README.rdoc
-lib/**/*.rb
-locales/*
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1 +0,0 @@
-pkg

data/Rakefile

@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "french_rails"
-    gem.summary = %Q{Simple french localization for Rails}
-    gem.description = %Q{A plugin for Ruby on Rails for simple french localization}
-    gem.email = "bmichel@menfin.info"
-    gem.homepage = "http://github.com/nono/french-rails"
-    gem.authors = ["Bruno Michel"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-task :default => :check_dependencies

data/VERSION

@@ -1 +0,0 @@
-0.2.1

data/french_rails.gemspec

@@ -1,54 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{french_rails}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bruno Michel"]
-  s.date = %q{2010-02-16}
-  s.description = %q{A plugin for Ruby on Rails for simple french localization}
-  s.email = %q{bmichel@menfin.info}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "french_rails.gemspec",
-     "init.rb",
-     "lib/french_rails.rb",
-     "lib/french_rails/action_dispatch/resources_path_names.rb",
-     "lib/french_rails/action_view/text_helper.rb",
-     "lib/french_rails/backend/simple.rb",
-     "lib/french_rails/i18n.rb",
-     "locales/fr_actionpack.yml",
-     "locales/fr_activemodel.yml",
-     "locales/fr_activerecord.yml",
-     "locales/fr_activesupport.yml",
-     "locales/fr_responders.yml"
-  ]
-  s.homepage = %q{http://github.com/nono/french-rails}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Simple french localization for Rails}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-