rails-timeago 1.4.3 → 2.0.0.beta1

data/README.md

@@ -8,7 +8,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rails-timeago'
+gem 'rails-timeago', '~> 2.0.0.beta1'
 ```
 
 And then execute:
@@ -25,6 +25,10 @@ To use bundled jQuery Timeago plugin add this require statement to your applicat
 
 This will also convert all matching time tags on page load.
 
+Use the following to also include all available locale files:
+
+	//= require rails-timeago-all
+
 ## Usage
 
 Use the timeago_tag helper like any other regular tag helper:
@@ -60,7 +64,6 @@ Force time ago tag ignoring limit option.
 String that will be returned if time is nil.
 (default: '-')
 
-
 All other options will be given as options to the time tag helper.
 The above options can be assigned globally as defaults using
 
@@ -68,60 +71,42 @@ The above options can be assigned globally as defaults using
 Rails::Timeago.default_options :limit => proc { 20.days.ago }, :nojs => true
 ```
 
-A global limit should always be given as a block that will be evaluated each time
-the rails timeago_tag helper is called. That avoids the limit becoming smaller the
-longer the application runs.
+A global limit should always be given as a block that will be evaluated each time the rails timeago_tag helper is called. That avoids the limit becoming smaller the longer the application runs.
 
 ## I18n
 
-**rails-timeago** provides additional localization features and includes locale
-files for the following locales taken from [jQuery Timeago](https://github.com/rmm5t/jquery-timeago).
+**rails-timeago 2** ships with a modified version of jQuery timeago that allows to include all locale files at once and set the locale via an option or per element via the `lang` attribute:
 
-> ar, bg, bs, ca, cy, cz, da, de, el, en, en-short, es, fa, fi, fr,
-> he, hr, hu, hy, id, it, ja, ko, nl, no, pl, pt, ro, ru,
-> sv, tr, uk, uz, zh-CN, zh-TW
+```erb
+<%= timeago_tag Time.zone.now, :lang => :de %>
+```
 
-**rails-timeago** will automatically include the locale file for your current
-locale if it is available. You only have to include the following method into
-your html head tag:
+The following snippet will print a script tag that set the jQuery timeago locale according to your `I18n.locale`:
 
 ```ruby
 <%= timeago_script_tag %>
 ```
 
-That will add a script include tag to include the needed locale file.
-**rails-timeago** will also add all locale files to Rails precompiled assets
-list to allow precompilation. By default all locale files will be included but
-you can specify a list by adding a initializer similar to:
+Just insert it in your application layout's html head. If you use another I18n framework for JavaScript you can also directly set `jQuery.timeago.settings.lang`.
 
-```ruby
-Rails::Timeago.locales = [:en, :de, "zh-CN", :sjn]
-```
+Do not forget to require the needed locale files by either require `rails-timeago-all` in your `application.js` file or require specific locale files:
 
-This will only add English, German, Chinese and Sindarin locale files to
-precompiled assets. *rails-timeago* will also only use these locales for
-locale file lookup for `timeago_script_tag`.
-To add your own locales add a file in JavaScript assets directory named
-`locales/jquery.timeago.<locale>.js` and add your locale to `Rails::Timeago.locales`.
+	//= require locales/jquery.timeago.de.js
+	//= require locales/jquery.timeago.ru.js
 
-**rails-timeago** provides support for custom locale file mappings. That may be
-especially useful to override the embedded `en` locale because there is no English
-locale file that can be overridden:
+*Note:* English is included in jQuery timeago library, but can be easily override by include an own file that defines `jQuery.timeago.settings.strings["en"]`. See a locale file for more details.
 
-```ruby
-Rails::Timeago.map_locale "en", "better/locales/en.js"
-```
+**rails-timeago** includes locale files for the following locales taken from [jQuery Timeago](https://github.com/rmm5t/jquery-timeago).
 
-Given that mapping rails-timeago's `timeago_script_tag` will include the mapped
-locale file into your page.
+> ar, bg, bs, ca, cy, cz, da, de, el, en, en-short, es, fa, fi, fr,
+> he, hr, hu, hy, id, it, ja, ko, mk, nl, no, pl, pt, pt-br, ro, ru,
+> sv, tr, uk, uz, zh-CN, zh-TW
 
-**Note:** Rails default `application.js` file contains a line to require all JavaScript
-in your assets directory. That will also include all your custom locale files if you
-place them in `app/assets/javascripts/locales` and will result in unexpected behavior when
-using `en` locale (see #5).
+Your customized jQuery locale files must be changed to work with **rails-timeago 2**. Instead of defining your locale strings as `jQuery.timeago.settings.strings` you need to define them like this:
 
-A workaround is to remove the `//= require_tree .` line from `application.js` or to move your
-custom locale files to `lib/assets/javascripts/locales`.
+	jQuery.timeago.settings.string["en"] = {
+		...
+	}
 
 ## License
 

data/lib/assets/javascripts/rails-timeago-all.js

@@ -0,0 +1,38 @@
+// Rails timeago bootstrap with all locales
+//= require rails-timeago
+//= require locales/jquery.timeago.de.js
+//= require locales/jquery.timeago.cy.js
+//= require locales/jquery.timeago.pl.js
+//= require locales/jquery.timeago.mk.js
+//= require locales/jquery.timeago.zh-CN.js
+//= require locales/jquery.timeago.bs.js
+//= require locales/jquery.timeago.en-short.js
+//= require locales/jquery.timeago.it.js
+//= require locales/jquery.timeago.fi.js
+//= require locales/jquery.timeago.es.js
+//= require locales/jquery.timeago.uk.js
+//= require locales/jquery.timeago.zh-TW.js
+//= require locales/jquery.timeago.hy.js
+//= require locales/jquery.timeago.ca.js
+//= require locales/jquery.timeago.pt.js
+//= require locales/jquery.timeago.el.js
+//= require locales/jquery.timeago.sv.js
+//= require locales/jquery.timeago.ar.js
+//= require locales/jquery.timeago.no.js
+//= require locales/jquery.timeago.fa.js
+//= require locales/jquery.timeago.fr.js
+//= require locales/jquery.timeago.pt-br.js
+//= require locales/jquery.timeago.tr.js
+//= require locales/jquery.timeago.he.js
+//= require locales/jquery.timeago.bg.js
+//= require locales/jquery.timeago.ko.js
+//= require locales/jquery.timeago.uz.js
+//= require locales/jquery.timeago.cz.js
+//= require locales/jquery.timeago.hu.js
+//= require locales/jquery.timeago.id.js
+//= require locales/jquery.timeago.hr.js
+//= require locales/jquery.timeago.ru.js
+//= require locales/jquery.timeago.nl.js
+//= require locales/jquery.timeago.da.js
+//= require locales/jquery.timeago.ja.js
+//= require locales/jquery.timeago.ro.js

data/lib/rails-timeago.rb

@@ -13,27 +13,6 @@ module Rails
           ActiveSupport.on_load(:action_view) do
             include Rails::Timeago::Helper
           end
-
-          if app.config.assets.locales
-            app.config.assets.precompile +=
-              app.config.assets.locales.map do |locale|
-                if ::Rails::Timeago.has_locale_file locale
-                  'locales/jquery.timeago.' + locale.to_s + '.js'
-                end
-              end
-          elsif ::Rails::Timeago.locales.empty?
-            app.config.assets.precompile +=
-              Dir[Rails::Timeago.locale_path + '*.js'].map do |f|
-                'locales/' + File.basename(f)
-              end
-          else
-            app.config.assets.precompile +=
-              ::Rails::Timeago.locales.map do |locale|
-                if ::Rails::Timeago.has_locale_file locale
-                  'locales/jquery.timeago.' + locale.to_s + '.js'
-                end
-              end
-          end
         end
       end
     end
@@ -82,77 +61,5 @@ module Rails
         @defaults
       end
     end
-
-    # Allow to map a locale to a specific url. May be useful for
-    # overriding embedded english locale:
-    #
-    #   Rails::Timeago.map_locale :en, "better/locales/en.js"
-    #
-    def self.map_locale(locale, url)
-      @locale_map ||= {}
-      @locale_map[locale.to_s] = url
-    end
-
-    def self.mapped_locale(locale)
-      @locale_map ||= {}
-      @locale_map[locale.to_s]
-    end
-
-    def self.locale_path
-      File.dirname(__FILE__) + '/../vendor/assets/javascripts/locales/'
-    end
-
-    def self.locale_file(locale)
-      locale_path + locale_file_name(locale)
-    end
-
-    def self.locale_file_name(locale)
-      'jquery.timeago.' + locale + '.js'
-    end
-
-    def self.has_locale_file(locale)
-      File.exist? locale_file(locale)
-    end
-
-    # Look up a timeago locale. If no locale is given I18n's
-    # default locale will be used. Lookup follows the given
-    # order:
-    #   1) ll-CC     (language and country)
-    #   2) ll        (only language)
-    #   3) I18n default locale
-    #   4) "en"
-    def self.lookup_locale(locale = nil)
-      locale = I18n.locale.to_s unless locale
-
-      if locale =~ /^(\w+)(\-(\w+))?$/
-        lang = $1.downcase
-        if $3
-          ctry = $3.upcase
-          return "#{lang}-#{ctry}" if has_locale "#{lang}-#{ctry}"
-        end
-        return lang if has_locale lang
-      end
-
-      return I18n.default_locale.to_s if has_locale I18n.default_locale.to_s
-      "en"
-    end
-
-    def self.has_locale(locale)
-      return locales.include? locale if locales.any?
-      return true if @locale_map and @locale_map[locale.to_s]
-      return has_locale_file locale
-    end
-
-    def self.locales
-      @locales ||= []
-    end
-
-    def self.locales=(*attrs)
-      if attrs[0].kind_of?(Array)
-        @locales = attrs[0].map(&:to_s)
-      else
-        @locales = attrs.map(&:to_s)
-      end
-    end
   end
 end

data/lib/rails-timeago/helper.rb

@@ -55,19 +55,9 @@ module Rails
         I18n.l time, :format => time_options[:format]
       end
 
-      # Return a JavaScript tag to include jQuery timeago
-      # or custom mapped locale file for current or given locale.
-      def timeago_script_tag(locale = nil)
-        locale = ::Rails::Timeago.lookup_locale locale
-
-        file = ::Rails::Timeago.mapped_locale locale
-        return javascript_include_tag file if file
-
-        if locale != 'en'
-          javascript_include_tag 'locales/' + ::Rails::Timeago.locale_file_name(locale)
-        else
-          '' # English locale is embedded in jQuery timeago plugin file.
-        end
+      # Return a JavaScript tag to set jQuery timeago locale.
+      def timeago_script_tag
+        javascript_tag "jQuery.timeago.settings.lang=\"#{I18n.locale}\";" if I18n.locale != 'en'
       end
     end
   end

data/lib/rails-timeago/version.rb

@@ -1,10 +1,10 @@
 module Rails
   module Timeago
     module VERSION
-      MAJOR = 1
-      MINOR = 4
-      PATCH = 3
-      STAGE = nil
+      MAJOR = 2
+      MINOR = 0
+      PATCH = 0
+      STAGE = 'beta1'
 
       def self.to_s
         [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join '.'

data/rails-timeago.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/jgraichen/rails-timeago"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
+  gem.files         = `git ls-files`.split("\n").reject{|file| file =~ /^scripts/}
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "rails-timeago"
   gem.require_paths = ["lib"]

data/spec/support/stub.rb

@@ -12,7 +12,7 @@ class TimeagoStub
     "%time_ago_in_words%"
   end
 
-  def javascript_include_tag(path)
-    "<script src=\"#{path}\"></script>"
+  def javascript_tag(source)
+    "<script>#{source}</script>"
   end
 end

data/spec/timeago/helper_spec.rb

@@ -87,76 +87,9 @@ describe Rails::Timeago::Helper do
   end
 
   context "#timeago_script_tag" do
-    it "should not return anything if locale is 'en' and no 'en' mapping exists" do
-      Rails::Timeago.map_locale :en, nil
+    it "should return a javascript snippet to set jQuery timeago locale" do
       I18n.locale = "en"
-      @stub.timeago_script_tag.should == ""
-    end
-
-    it "should return mapped 'en' locale file if mapping exists" do
-      Rails::Timeago.map_locale :en, "better/locale/en.js"
-
-      I18n.locale = "en"
-      @stub.timeago_script_tag.should == '<script src="better/locale/en.js"></script>'
-
-      Rails::Timeago.map_locale :en, nil
-    end
-
-    it "should return javascript tag with locale file" do
-      I18n.locale = "de"
-      @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.de.js"></script>'
-    end
-
-    it "should return javascript tag with mapped locale file" do
-      Rails::Timeago.map_locale :de, "deutsch.js"
-
-      I18n.locale = "de"
-      @stub.timeago_script_tag.should == '<script src="deutsch.js"></script>'
-
-      Rails::Timeago.map_locale :de, nil
-    end
-
-    it "should return javascript tag with full locale file if available" do
-      I18n.locale = "zh-CN"
-      @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.zh-CN.js"></script>'
-    end
-
-    it "should return javascript tag with lang locale file if available" do
-      I18n.locale = "nl-NL"
-      @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.nl.js"></script>'
-    end
-
-    it "should return javascript tag with formatted locale file" do
-      I18n.locale = "zh-cn"
-      @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.zh-CN.js"></script>'
-    end
-
-    context "with global locale configuration" do
-      before { Rails::Timeago.locales = [:de, :en, "zh-CN", "tlh", "nl"] }
-      after  { Rails::Timeago.locales = [] }
-
-      it "should include full locale if available" do
-        I18n.locale = "zh-CN"
-        @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.zh-CN.js"></script>'
-      end
-
-      it "should include lang locale if available" do
-        I18n.locale = "nl-NL"
-        @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.nl.js"></script>'
-      end
-
-      it "should include default locale for not specified locales" do
-        I18n.locale = :ar
-        I18n.default_locale = :de
-        @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.de.js"></script>'
-
-        I18n.default_locale = :en
-      end
-
-      it "should find added locales that does not have a locale file in gem" do
-        I18n.locale = "tlh"
-        @stub.timeago_script_tag.should == '<script src="locales/jquery.timeago.tlh.js"></script>'
-    end
+      @stub.timeago_script_tag.should == '<script>jQuery.timeago.settings.lang="en";</script>'
     end
   end
 end

data/vendor/assets/javascripts/jquery.timeago.js

@@ -3,7 +3,7 @@
  * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
  *
  * @name timeago
- * @version 0.11.3
+ * @version 0.11.4
  * @requires jQuery v1.2.3+
  * @author Ryan McGeary
  * @license MIT License - http://www.opensource.org/licenses/mit-license.php
@@ -31,7 +31,8 @@
     settings: {
       refreshMillis: 60000,
       allowFuture: false,
-      strings: {
+      lang: "en",
+      strings: { "en": {
         prefixAgo: null,
         prefixFromNow: null,
         suffixAgo: "ago",
@@ -49,10 +50,10 @@
         years: "%d years",
         wordSeparator: " ",
         numbers: []
-      }
+      }}
     },
-    inWords: function(distanceMillis) {
-      var $l = this.settings.strings;
+    inWords: function(distanceMillis, lang) {
+      var $l = this.settings.strings[lang] || this.settings.strings[this.settings.lang] || this.settings.strings["en"];
       var prefix = $l.prefixAgo;
       var suffix = $l.suffixAgo;
       if (this.settings.allowFuture) {
@@ -91,7 +92,7 @@
     },
     parse: function(iso8601) {
       var s = $.trim(iso8601);
-      s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
+      s = s.replace(/\.\d+/,""); // remove milliseconds
       s = s.replace(/-/,"/").replace(/-/,"/");
       s = s.replace(/T/," ").replace(/Z/," UTC");
       s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
@@ -121,7 +122,7 @@
   function refresh() {
     var data = prepareData(this);
     if (!isNaN(data.datetime)) {
-      $(this).text(inWords(data.datetime));
+      $(this).text(inWords(data.datetime, ($(this).attr('lang')) ? $(this).attr('lang') : $t.settings.lang));
     }
     return this;
   }
@@ -138,8 +139,8 @@
     return element.data("timeago");
   }
 
-  function inWords(date) {
-    return $t.inWords(distance(date));
+  function inWords(date, lang) {
+    return $t.inWords(distance(date), lang);
   }
 
   function distance(date) {

data/vendor/assets/javascripts/locales/jquery.timeago.ar.js

@@ -12,7 +12,7 @@
       return z; // 11+
     }
   }
-  jQuery.timeago.settings.strings = {
+  jQuery.timeago.settings.strings["ar"] = {
     prefixAgo: "منذ",
     prefixFromNow: "يتبقى",
     suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.bg.js

@@ -1,5 +1,5 @@
 // Bulgarian
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["bg"] = {
   prefixAgo: "преди",
   prefixFromNow: "след",
   suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.bs.js

@@ -14,7 +14,7 @@
     }
   };
 
-  jQuery.timeago.settings.strings = {
+  jQuery.timeago.settings.strings["bs"] = {
     prefixAgo: "prije",
     prefixFromNow: "za",
     suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.ca.js

@@ -1,5 +1,5 @@
 // Catalan
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["ca"] = {
   prefixAgo: "fa",
   prefixFromNow: "d'aqui a",
   suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.cy.js

@@ -1,5 +1,5 @@
 // Welsh
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["cy"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: "yn ôl",

data/vendor/assets/javascripts/locales/jquery.timeago.cz.js

@@ -1,5 +1,5 @@
 // Czech
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["cz"] = {
   prefixAgo: "před",
   prefixFromNow: null,
   suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.da.js

@@ -1,5 +1,5 @@
 // Danish
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["da"] = {
   prefixAgo: "for",
   prefixFromNow: "om",
   suffixAgo: "siden",

data/vendor/assets/javascripts/locales/jquery.timeago.de.js

@@ -1,5 +1,5 @@
 // German
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["de"] = {
   prefixAgo: "vor",
   prefixFromNow: "in",
   suffixAgo: "",

data/vendor/assets/javascripts/locales/jquery.timeago.el.js

@@ -1,5 +1,5 @@
 // Greek
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["el"] = {
   prefixAgo: "πριν",
   prefixFromNow: "σε",
   suffixAgo: "",

data/vendor/assets/javascripts/locales/jquery.timeago.en-short.js

@@ -1,5 +1,5 @@
 // English shortened
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["en-short"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: "",

data/vendor/assets/javascripts/locales/jquery.timeago.es.js

@@ -1,5 +1,5 @@
 // Spanish
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["es"] = {
    prefixAgo: "hace",
    prefixFromNow: "dentro de",
    suffixAgo: "",

data/vendor/assets/javascripts/locales/jquery.timeago.fa.js

@@ -2,7 +2,7 @@
 // Persian
 // Use DIR attribute for RTL text in Persian Language for ABBR tag .
 // By MB.seifollahi@gmail.com
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["fa"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: "پیش",

data/vendor/assets/javascripts/locales/jquery.timeago.fi.js

@@ -1,5 +1,5 @@
 // Finnish
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["fi"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: "sitten",

data/vendor/assets/javascripts/locales/jquery.timeago.fr.js

@@ -1,5 +1,5 @@
 // French
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["fr"] = {
    // environ ~= about, it's optional
    prefixAgo: "il y a",
    prefixFromNow: "d'ici",

data/vendor/assets/javascripts/locales/jquery.timeago.he.js

@@ -1,5 +1,5 @@
 // Hebrew
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["he"] = {
   prefixAgo: "לפני",
   prefixFromNow: "מעכשיו",
   suffixAgo: "",

data/vendor/assets/javascripts/locales/jquery.timeago.hr.js

@@ -14,7 +14,7 @@
         }
     };
 
-    jQuery.timeago.settings.strings = {
+    jQuery.timeago.settings.strings["hr"] = {
         prefixAgo: "prije",
         prefixFromNow: "za",
         suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.hu.js

@@ -1,5 +1,5 @@
 // Hungarian
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["hu"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: null,

data/vendor/assets/javascripts/locales/jquery.timeago.hy.js

@@ -1,5 +1,5 @@
 // Armenian
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["hy"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: "առաջ",

data/vendor/assets/javascripts/locales/jquery.timeago.id.js

@@ -1,5 +1,5 @@
 // Indonesian
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["id"] = {
   prefixAgo: null,
   prefixFromNow: null,
   suffixAgo: "yang lalu",

data/vendor/assets/javascripts/locales/jquery.timeago.it.js

@@ -1,5 +1,5 @@
 // Italian
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["it"] = {
   suffixAgo: "fa",
   suffixFromNow: "da ora",
   seconds: "meno di un minuto",

data/vendor/assets/javascripts/locales/jquery.timeago.ja.js

@@ -1,5 +1,5 @@
 // Japanese
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["ja"] = {
   prefixAgo: "",
   prefixFromNow: "今から",
   suffixAgo: "前",

data/vendor/assets/javascripts/locales/jquery.timeago.ko.js

@@ -1,5 +1,5 @@
 // Korean
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["ko"] = {
   suffixAgo: "전",
   suffixFromNow: "후",
   seconds: "1분 이내",

data/vendor/assets/javascripts/locales/jquery.timeago.mk.js

@@ -0,0 +1,20 @@
+// Macedonian
+(function() {
+ jQuery.timeago.settings.strings["mk"]={
+    prefixAgo: "пред",
+    prefixFromNow: "за",
+    suffixAgo: null,
+    suffixFromNow: null,
+    seconds: "%d секунди",
+    minute: "%d минута",
+    minutes: "%d минути",
+    hour: "%d час",
+    hours: "%d часа",
+    day: "%d ден",
+    days: "%d денови" ,
+    month: "%d месец",
+    months: "%d месеци",
+    year: "%d година",
+    years: "%d години"
+ }
+})();

data/vendor/assets/javascripts/locales/jquery.timeago.nl.js

@@ -1,5 +1,5 @@
 // Dutch
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["nl"] = {
   prefixAgo: null,
   prefixFromNow: "",
   suffixAgo: "geleden",

data/vendor/assets/javascripts/locales/jquery.timeago.no.js

@@ -1,5 +1,5 @@
 // Norwegian
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["no"] = {
   prefixAgo: "for",
   prefixFromNow: "om",
   suffixAgo: "siden",

data/vendor/assets/javascripts/locales/jquery.timeago.pl.js

@@ -11,7 +11,7 @@
     }
   }
 
-  jQuery.timeago.settings.strings = {
+  jQuery.timeago.settings.strings["pl"] = {
     prefixAgo: null,
     prefixFromNow: "za",
     suffixAgo: "temu",

data/vendor/assets/javascripts/locales/jquery.timeago.pt-br.js

@@ -0,0 +1,16 @@
+// Brazilian Portuguese 
+jQuery.timeago.settings.strings["pt-br"] = {
+   suffixAgo: "atrás",
+   suffixFromNow: "nesse momento",
+   seconds: "alguns segundos",
+   minute: "há um minuto",
+   minutes: "há %d minutos",
+   hour: "há uma hora",
+   hours: "há %d horas",
+   day: "há um dia",
+   days: "há %d dias",
+   month: "há um mês",
+   months: "há %d meses",
+   year: "há um ano",
+   years: "há %d anos"
+};

data/vendor/assets/javascripts/locales/jquery.timeago.pt.js

@@ -1,5 +1,5 @@
 // Portuguese
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["pt"] = {
    suffixAgo: "atrás",
    suffixFromNow: "a partir de agora",
    seconds: "menos de um minuto",

data/vendor/assets/javascripts/locales/jquery.timeago.ro.js

@@ -1,5 +1,5 @@
 // Romanian
-$.timeago.settings.strings = {
+$.timeago.settings.strings["ro"] = {
   prefixAgo: "acum",
   prefixFromNow: "in timp de",
   suffixAgo: "",

data/vendor/assets/javascripts/locales/jquery.timeago.ru.js

@@ -14,7 +14,7 @@
     }
   }
 
-  jQuery.timeago.settings.strings = {
+  jQuery.timeago.settings.strings["ru"] = {
     prefixAgo: null,
     prefixFromNow: "через",
     suffixAgo: "назад",

data/vendor/assets/javascripts/locales/jquery.timeago.sv.js

@@ -1,5 +1,5 @@
 // Swedish
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["sv"] = {
   prefixAgo: "för",
   prefixFromNow: "om",
   suffixAgo: "sedan",

data/vendor/assets/javascripts/locales/jquery.timeago.tr.js

@@ -1,5 +1,5 @@
 // Turkish
-jQuery.extend($.timeago.settings.strings, {
+jQuery.extend($.timeago.settings.strings["tr"], {
    suffixAgo: 'önce',
    suffixFromNow: null,
    seconds: '1 dakikadan',

data/vendor/assets/javascripts/locales/jquery.timeago.uk.js

@@ -14,12 +14,12 @@
     }
   }
 
-  jQuery.timeago.settings.strings = {
+  jQuery.timeago.settings.strings["uk"] = {
     prefixAgo: null,
     prefixFromNow: "через",
     suffixAgo: "тому",
     suffixFromNow: null,
-    seconds: "меньше хвилини",
+    seconds: "менше хвилини",
     minute: "хвилина",
     minutes: function(value) { return numpf(value, "%d хвилина", "%d хвилини", "%d хвилин"); },
     hour: "година",

data/vendor/assets/javascripts/locales/jquery.timeago.uz.js

@@ -1,5 +1,5 @@
 //Uzbek
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["uz"] = {
   prefixAgo: null,
   prefixFromNow: "keyin",
   suffixAgo: "avval",

data/vendor/assets/javascripts/locales/jquery.timeago.zh-CN.js

@@ -1,5 +1,5 @@
 // Simplified Chinese
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["zh-CN"] = {
   prefixAgo: null,
   prefixFromNow: "从现在开始",
   suffixAgo: "之前",

data/vendor/assets/javascripts/locales/jquery.timeago.zh-TW.js

@@ -1,5 +1,5 @@
 // Traditional Chinese, zh-tw
-jQuery.timeago.settings.strings = {
+jQuery.timeago.settings.strings["zh-TW"] = {
   prefixAgo: null,
   prefixFromNow: "從現在開始",
   suffixAgo: "之前",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails-timeago
 version: !ruby/object:Gem::Version
-  version: 1.4.3
-  prerelease: 
+  version: 2.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,6 +71,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/assets/javascripts/rails-timeago-all.js
 - lib/assets/javascripts/rails-timeago.js
 - lib/rails-timeago.rb
 - lib/rails-timeago/helper.rb
@@ -79,7 +80,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/stub.rb
 - spec/timeago/helper_spec.rb
-- spec/timeago_spec.rb
 - vendor/assets/javascripts/jquery.timeago.js
 - vendor/assets/javascripts/locales/jquery.timeago.ar.js
 - vendor/assets/javascripts/locales/jquery.timeago.bg.js
@@ -103,9 +103,11 @@ files:
 - vendor/assets/javascripts/locales/jquery.timeago.it.js
 - vendor/assets/javascripts/locales/jquery.timeago.ja.js
 - vendor/assets/javascripts/locales/jquery.timeago.ko.js
+- vendor/assets/javascripts/locales/jquery.timeago.mk.js
 - vendor/assets/javascripts/locales/jquery.timeago.nl.js
 - vendor/assets/javascripts/locales/jquery.timeago.no.js
 - vendor/assets/javascripts/locales/jquery.timeago.pl.js
+- vendor/assets/javascripts/locales/jquery.timeago.pt-br.js
 - vendor/assets/javascripts/locales/jquery.timeago.pt.js
 - vendor/assets/javascripts/locales/jquery.timeago.ro.js
 - vendor/assets/javascripts/locales/jquery.timeago.ru.js
@@ -130,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/spec/timeago_spec.rb

@@ -1,66 +0,0 @@
-
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Rails::Timeago do
-  context "#lookup_locale" do
-    it "should return full locale if available" do
-      Rails::Timeago.lookup_locale("zh-CN").should == "zh-CN"
-    end
-
-    it "should return formatted locale" do
-      Rails::Timeago.lookup_locale("zh-cn").should == "zh-CN"
-    end
-
-    it "should return lang locale if available" do
-      Rails::Timeago.lookup_locale("nl-NL").should == "nl"
-    end
-
-    it "should return locale if available" do
-      Rails::Timeago.lookup_locale("de").should == "de"
-    end
-
-    it "should lookup default locale if nothing given" do
-      I18n.locale = "ar"
-
-      Rails::Timeago.lookup_locale.should == "ar"
-    end
-
-    it "should return english locale if locale does not
-      match and default locale is not available" do
-
-      I18n.locale = "sjn"
-      Rails::Timeago.lookup_locale("tlh").should == "en"
-    end
-
-    context "with global locale configuration" do
-      before { Rails::Timeago.locales = [:de, :en, "zh-CN", "tlh"] }
-      after  { Rails::Timeago.locales = [] }
-
-      it "should return full locale if available" do
-        Rails::Timeago.lookup_locale("zh-CN").should == "zh-CN"
-      end
-
-      it "should return lang locale if available" do
-        Rails::Timeago.lookup_locale("en-US").should == "en"
-      end
-
-      it "should return use default locale if available" do
-        I18n.locale = "en"
-        Rails::Timeago.lookup_locale.should == "en"
-      end
-
-      it "should return default locale for not specified locales" do
-        I18n.locale = "ar"
-        I18n.default_locale = :de
-        Rails::Timeago.lookup_locale.should == "de"
-
-        I18n.default_locale = :en
-      end
-
-      it "should find added locales that does not have a locale file in gem" do
-        I18n.locale = "tlh"
-        Rails::Timeago.lookup_locale.should == "tlh"
-      end
-    end
-  end
-end