i18n-js 3.0.0.rc5 → 3.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e90f40cb73ad416912220f5a1636794964356d
-  data.tar.gz: e912fa9f82f3c76d26fffeedfc4850fe7553c838
+  metadata.gz: 37f6e669f9c581fd9b82bf2141dc6829b1a32d21
+  data.tar.gz: 5203d02a3ce1445054f036930c7cca0bf2103809
 SHA512:
-  metadata.gz: dbea11c2d0729c00da1c121d146c0f5325e133ab6c07989fae0e922650e8f7f5503bc5f4107d46a4d3d4012f0c03d88d39ce4a87d12e05295c59d29974b6b4a8
-  data.tar.gz: a56605c1ab472757cfd446a9c0e895a47c2c9ce6ffa00a01796efb6a8f3acae793370be272c253b906778b352d199876025e67f8cf2473021acdbd0f9f26125d
+  metadata.gz: 65ee86cbca52f2b511e9f39511308ae0640d0c1fb3099f685687eabe9d2cad4b4f28e08a389fd1b8c70bd3f71c5b475f4d1d8fa28ca07e4a4820fdfc8a496bfb
+  data.tar.gz: a0f657c665ddc48f6c49b25321dd3ed15fa66407a9baa24ee91386604f98bd1fbf1bc40fdab23460f2c4246e12f8a63512ea6dd12b172c5f256651264a118aaf

data/.gitignore

@@ -1,2 +1,5 @@
 pkg
 node_modules
+Gemfile.lock
+.idea/
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2
+script: "bundle exec rake spec"
+before_install: # Need to install npm to test js
+- sudo apt-get update
+- sudo apt-get install npm
+- npm install jasmine-node@1.14.2

data/Appraisals

@@ -0,0 +1,4 @@
+
+appraise "i18n-0-6" do
+  gem 'i18n', '0.6.9'
+end

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+## 3.0.0.rc6
+
+### enhancements
+
+- You can now assign `I18n.locale` & `I18n.default_locale` before loading `i18n.js` in `application.html.*`
+  (merged to `i18n-js-pika` already)
+- You can include ERB in `config/i18n-js.yml`(https://github.com/fnando/i18n-js/pull/224)
+- Add support for +00:00 style time zone designator (https://github.com/fnando/i18n-js/pull/167)
+- Add back rake task for export (`rake i18n:js:export`)
+- Not overriding translation when manually run `I18n::JS.export` (https://github.com/fnando/i18n-js/pull/171)
+- Move missing placeholder text generation into its own function (for easier debugging) (https://github.com/fnando/i18n-js/pull/169)
+- Add support for milliseconds (`lll` in `yyyy-mm-ddThh:mm:ss.lllZ`) (https://github.com/fnando/i18n-js/pull/192)
+- Add back i18n-js.yml config file generator : `rails generate i18n:js:config` (https://github.com/fnando/i18n-js/pull/225)
+
+### bug fixes
+
+- `I18n::JS.export` no longer exports locales other than those in `I18n.available_locales`, if `I18n.available_locales` is set
+- I18.t supports the base scope through the options argument
+- I18.t accepts an array as the scope
+- Fix regression: asset not being reloaded in development when translation changed
+- Requires `i18n` to be `~> 0.6`, `0.5` does not work at all
+- Fix using multi-star scope with top-level translation key (https://github.com/fnando/i18n-js/pull/221)
+
+
+## Before 3.0.0.rc5
+
+- Things happened.

data/README.md

@@ -1,6 +1,9 @@
 # I18n.js
 
-It's a small library to provide the Rails I18n translations on the Javascript.
+[![Build Status](https://travis-ci.org/fnando/i18n-js.svg?branch=master)](https://travis-ci.org/fnando/i18n-js)
+[![Code Climate](https://codeclimate.com/github/fnando/i18n-js.png)](https://codeclimate.com/github/fnando/i18n-js)
+
+It's a small library to provide the Rails I18n translations on the JavaScript.
 
 Features:
 
@@ -19,23 +22,32 @@ Features:
 
 Add the gem to your Gemfile.
 
-    source :rubygems
+    source "https://rubygems.org"
     gem "rails", "3.2.3"
     gem "i18n-js"
 
+#### Rails app with [Asset Pipeline](http://guides.rubyonrails.org/asset_pipeline.html)
+
 If you're using the [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html),
 then you must add the following line to your `app/assets/javascripts/application.js`.
 
-    //= require i18n/translations
+```javascript
+//= require i18n/translations
+```
+
+#### Rails app without [Asset Pipeline](http://guides.rubyonrails.org/asset_pipeline.html)
 
 If you're not using the asset pipeline, download the JavaScript file at
 <https://github.com/fnando/i18n-js/tree/master/lib/i18n.js> and load it on your page.
 Also load the `translations.js` file.
 
-    <%= javascript_include_tag "i18n", "translations" %>
+```erb
+<%= javascript_include_tag "i18n", "translations" %>
+```
 
 This `translations.js` file can be automatically generated by the `I18n::JS::Middleware`.
 Just add it to your `config/application.rb` file.
+Don't add this middleware if you are using [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)!
 
     config.middleware.use I18n::JS::Middleware
 
@@ -44,10 +56,53 @@ it by running the following command. Move the middleware line to your
 `config/environments/development.rb` file and run the following command before
 deploying.
 
-    $ rails runner I18n::JS.export
+    $ rake i18n:js:export
 
 This will export all translation files, including the custom scopes you may have
-defined on `config/i18n-js.yml`.
+defined on `config/i18n-js.yml`. If `I18n.available_locales` is set (e.g. in your
+Rails `config/application.rb` file) then only the specified locales will be exported.
+
+#### Export Configuration
+
+Exported translation files generated by `I18n::JS::Middleware` or `rake i18n:js:export` can be customized with config file `config/i18n-js.yml` (use `rails generate i18n:js:config` to create it). You can even get more files generated to different folders and with different translations to best suit your needs. But this does not affect anything if you use Asset Pipeline.
+
+Examples:
+```yaml
+translations:
+- file: 'public/javascripts/path-to-your-messages-file.js'
+  only: '*.date.formats'
+- file: 'public/javascripts/path-to-your-second-file.js'
+  only: ['*.activerecord', '*.admin.*.title']
+```
+
+If `only` is omitted all the translations will be saved. Also, make sure you add that initial `*`; it specifies that all languages will be exported. If you want to export only one language, you can do something like this:
+```yaml
+translations:
+- file: 'public/javascripts/en.js'
+  only: 'en.*'
+- file: 'public/javascripts/pt-BR.js'
+  only: 'pt-BR.*'
+```
+
+Optionally, you can auto generate a translation file per available locale if you specify the `%{locale}` placeholder.
+```yaml
+translations:
+- file: "public/javascripts/i18n/%{locale}.js"
+  only: '*'
+- file: "public/javascripts/frontend/i18n/%{locale}.js"
+  only: ['frontend', 'users']
+```
+
+You can also include ERB in your config file.
+```yaml
+translations:
+<% Widgets.each do |widget| %>
+- file: <%= "'#{widget.file}'" %>
+  only: <%= "'#{widget.only}'" %>
+<% end %>
+```
+
+To find more examples on how to use the configuration file please refer to the tests.
 
 #### Vanilla JavaScript
 
@@ -59,13 +114,24 @@ by hand or using your favorite programming language. More info below.
 You **don't** need to set up a thing. The default settings will work just okay. But if you want to split translations into several files or specify specific contexts, you can follow the rest of this setting up section.
 
 Set your locale is easy as
+```javascript
+I18n.defaultLocale = "pt-BR";
+I18n.locale = "pt-BR";
+I18n.currentLocale();
+// pt-BR
+```
 
-    I18n.defaultLocale = "pt-BR";
-    I18n.locale = "pt-BR";
-    I18n.currentLocale();
-    // pt-BR
+**NOTE:** You can now apply your configuration **before I18n** is loaded like this:
+```javascript
+I18n = {} // You must define this object in top namespace, which should be `window`
+I18n.defaultLocale = "pt-BR";
+I18n.locale = "pt-BR";
 
-**NOTE:** Just make sure you apply your configuration **after i18n.js** is loaded. Otherwise, your settings will be ignored.
+// Load I18n from `i18n.js`, `application.js` or whatever
+
+I18n.currentLocale();
+// pt-BR
+```
 
 In practice, you'll have something like the following in your `application.html.erb`:
 
@@ -77,7 +143,7 @@ In practice, you'll have something like the following in your `application.html.
 You can use translate your messages:
 
     I18n.t("some.scoped.translation");
-    // or translate with explicite setting of locale
+    // or translate with explicit setting of locale
     I18n.t("some.scoped.translation", {locale: "fr"});
 
 You can also interpolate values:
@@ -92,6 +158,21 @@ You can set default values for missing scopes:
     // with interpolation
     I18n.t("noun", {defaultValue: "I'm a {{noun}}", noun: "Mac"});
 
+You can also provide a list of default fallbacks for missing scopes:
+
+    // As a scope
+    I18n.t("some.missing.scope", {defaults: [{scope: "some.existing.scope"}]});
+
+    // As a simple translation
+    I18n.t("some.missing.scope", {defaults: [{message: "some.existing.scope"}]});
+
+    Default values must be provided as an array of hashs where the key is the
+    type of translation desired, a `scope` or a `message`. The translation returned
+    will be either the first scope recognized, or the first message defined.
+
+    The translation will fallback to the `defaultValue` translation if no scope
+    in `defaults` matches and if no default of type `message` is found.
+
 Translation fallback can be enabled by enabling the `I18n.fallbacks` option:
 
     <script type="text/javascript">
@@ -114,7 +195,7 @@ are three different ways of doing it so:
     I18n.locales.no = "nb";
     I18n.locales.no = function(locale){ return ["nb"]; };
 
-Pluralization is possible as well and by default provides english rules:
+Pluralization is possible as well and by default provides English rules:
 
     I18n.t("inbox.counting", {count: 10}); // You have 10 messages
 
@@ -127,7 +208,7 @@ The sample above expects the following translation:
           other: You have {{count}} new messages
           zero: You have no messages
 
-**NOTE:** Rais I18n recognizes the `zero` option.
+**NOTE:** Rails I18n recognizes the `zero` option.
 
 If you need special rules just define them for your language, for example Russian, just add a new pluralizer:
 
@@ -232,7 +313,6 @@ The accepted formats are:
     %A  - The full weekday name (Sunday)
     %b  - The abbreviated month name (Jan)
     %B  - The full month name (January)
-    %c  - The preferred local date and time representation
     %d  - Day of the month (01..31)
     %-d - Day of the month (1..31)
     %H  - Hour of the day, 24-hour clock (00..23)
@@ -256,7 +336,7 @@ Check out `spec/*.spec.js` files for more examples!
 
 ## Using I18n.js with other languages (Python, PHP, ...)
 
-The JavaScript library is language agnostic; so you can use it with PHP, Python, [you favorite language here].
+The JavaScript library is language agnostic; so you can use it with PHP, Python, [your favorite language here].
 The only requirement is that you need to set the `translations` attribute like following:
 
     I18n.translations = {};
@@ -278,10 +358,11 @@ The only requirement is that you need to set the `translations` attribute like f
 Once you've made your great commits:
 
 1. [Fork](http://help.github.com/forking/) I18n.js
-2. Create a topic branch - `git checkout -b my_branch`
-3. Push to your branch - `git push origin my_branch`
-4. [Create an Issue](http://github.com/fnando/i18n-js/issues) with a link to your branch
-5. That's it!
+2. Create a branch with a clear name
+3. Make your changes (Please also add/change spec, README and CHANGELOG if applicable)
+4. Push changes to the created branch
+5. [Create an Pull Request](http://github.com/fnando/i18n-js/pulls)
+6. That's it!
 
 Please respect the indentation rules and code style.
 And use 2 spaces, not tabs. And don't touch the versioning thing.

data/Rakefile

@@ -1,7 +1,10 @@
+require "appraisal"
+require "rubygems"
 require "bundler"
+require "rspec/core/rake_task"
+
 Bundler::GemHelper.install_tasks
 
-require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:"spec:ruby")
 
 desc "Run JavaScript specs"
@@ -11,3 +14,11 @@ end
 
 desc "Run all specs"
 task :spec => ["spec:ruby", "spec:js"]
+
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default do
+    sh "appraisal install && rake appraisal spec"
+  end
+else
+  task :default => :spec
+end

data/app/assets/javascripts/i18n.js

@@ -23,11 +23,12 @@
   };
 
   // Set default days/months translations.
-  var DAYS_AND_MONTHS = {
+  var DATE = {
       day_names: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
     , abbr_day_names: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
     , month_names: [null, "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
     , abbr_month_names: [null, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+    , meridian: ["AM", "PM"]
   };
 
   // Set default number format.
@@ -57,30 +58,59 @@
   // Set default size units.
   var SIZE_UNITS = [null, "kb", "mb", "gb", "tb"];
 
-  // Set meridian.
-  var MERIDIAN = ["AM", "PM"];
+  // Other default options
+  var DEFAULT_OPTIONS = {
+    defaultLocale: "en",
+    locale: "en",
+    defaultSeparator: ".",
+    placeholder: /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm,
+    fallbacks: false,
+    translations: {},
+  };
 
   I18n.reset = function() {
     // Set default locale. This locale will be used when fallback is enabled and
     // the translation doesn't exist in a particular locale.
-    this.defaultLocale = "en";
+    this.defaultLocale = DEFAULT_OPTIONS.defaultLocale;
 
     // Set the current locale to `en`.
-    this.locale = "en";
+    this.locale = DEFAULT_OPTIONS.locale;
 
     // Set the translation key separator.
-    this.defaultSeparator = ".";
+    this.defaultSeparator = DEFAULT_OPTIONS.defaultSeparator;
 
     // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
-    this.placeholder = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm;
+    this.placeholder = DEFAULT_OPTIONS.placeholder;
 
     // Set if engine should fallback to the default locale when a translation
     // is missing.
-    this.fallbacks = false;
+    this.fallbacks = DEFAULT_OPTIONS.fallbacks;
 
     // Set the default translation object.
-    this.translations = {};
+    this.translations = DEFAULT_OPTIONS.translations;
+  };
+
+  // Much like `reset`, but only assign options if not already assigned
+  I18n.initializeOptions = function() {
+    if (typeof(this.defaultLocale) === "undefined" && this.defaultLocale !== null)
+      this.defaultLocale = DEFAULT_OPTIONS.defaultLocale;
+
+    if (typeof(this.locale) === "undefined" && this.locale !== null)
+      this.locale = DEFAULT_OPTIONS.locale;
+
+    if (typeof(this.defaultSeparator) === "undefined" && this.defaultSeparator !== null)
+      this.defaultSeparator = DEFAULT_OPTIONS.defaultSeparator;
+
+    if (typeof(this.placeholder) === "undefined" && this.placeholder !== null)
+      this.placeholder = DEFAULT_OPTIONS.placeholder;
+
+    if (typeof(this.fallbacks) === "undefined" && this.fallbacks !== null)
+      this.fallbacks = DEFAULT_OPTIONS.fallbacks;
+
+    if (typeof(this.translations) === "undefined" && this.translations !== null)
+      this.translations = DEFAULT_OPTIONS.translations;
   };
+  I18n.initializeOptions();
 
   // Return a list of all locales that must be tried before returning the
   // missing translation message. By default, this will consider the inline option,
@@ -181,10 +211,6 @@
     }
   };
 
-  // Reset all default attributes. This is specially useful
-  // while running tests.
-  I18n.reset();
-
   // Return current locale. If no locale has been set, then
   // the current locale will be the default locale.
   I18n.currentLocale = function() {
@@ -209,6 +235,19 @@
       , translations
     ;
 
+    // Deal with the scope as an array.
+    if (scope.constructor === Array) {
+      scope = scope.join(this.defaultSeparator);
+    }
+
+    // Deal with the scope option provided through the second argument.
+    //
+    //    I18n.t('hello', {scope: 'greetings'});
+    //
+    if (options.scope) {
+      scope = [options.scope, scope].join(this.defaultSeparator);
+    }
+
     while (locales.length) {
       locale = locales.shift();
       scopes = scope.split(this.defaultSeparator);
@@ -236,6 +275,24 @@
     }
   };
 
+  // Rails changed the way the meridian is stored.
+  // It started with `date.meridian` returning an array,
+  // then it switched to `time.am` and `time.pm`.
+  // This function abstracts this difference and returns
+  // the correct meridian or the default value when none is provided.
+  I18n.meridian = function() {
+    var time = this.lookup("time");
+    var date = this.lookup("date");
+
+    if (time && time.am && time.pm) {
+      return [time.am, time.pm];
+    } else if (date && date.meridian) {
+      return date.meridian;
+    } else {
+      return DATE.meridian;
+    }
+  };
+
   // Merge serveral hash options, checking if value is set before
   // overwriting any value. The precedence is from left to right.
   //
@@ -271,12 +328,51 @@
     return options;
   };
 
+  // Generate a list of translation options for default fallbacks.
+  // `defaultValue` is also deleted from options as it is returned as part of
+  // the translationOptions array.
+  I18n.createTranslationOptions = function(scope, options) {
+    var translationOptions = [{scope: scope}];
+
+    // Defaults should be an array of hashes containing either
+    // fallback scopes or messages
+    if (this.isSet(options.defaults)) {
+      translationOptions = translationOptions.concat(options.defaults);
+    }
+
+    // Maintain support for defaultValue. Since it is always a message
+    // insert it in to the translation options as such.
+    if (this.isSet(options.defaultValue)) {
+      translationOptions.push({ message: options.defaultValue });
+      delete options.defaultValue;
+    }
+
+    return translationOptions;
+  };
+
   // Translate the given scope with the provided options.
   I18n.translate = function(scope, options) {
     options = this.prepareOptions(options);
-    var translation = this.lookup(scope, options);
 
-    if (translation === undefined || translation === null) {
+    var translationOptions = this.createTranslationOptions(scope, options);
+
+    var translation;
+    // Iterate through the translation options until a translation
+    // or message is found.
+    var translationFound =
+      translationOptions.some(function(translationOption) {
+        if (this.isSet(translationOption.scope)) {
+          translation = this.lookup(translationOption.scope, options);
+        } else if (this.isSet(translationOption.message)) {
+          translation = translationOption.message;
+        }
+
+        if (translation !== undefined && translation !== null) {
+          return true;
+        }
+      }, this);
+
+    if (!translationFound) {
       return this.missingTranslation(scope);
     }
 
@@ -306,17 +402,17 @@
     while (matches.length) {
       placeholder = matches.shift();
       name = placeholder.replace(this.placeholder, "$1");
-      value = options[name];
+      value = options[name].toString().replace(/\$/gm, "_#$#_");
 
       if (!this.isSet(options[name])) {
-        value = "[missing " + placeholder + " value]";
+        value = this.missingPlaceholder(placeholder, message);
       }
 
       regex = new RegExp(placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}"));
       message = message.replace(regex, value);
     }
 
-    return message;
+    return message.replace("_#$#_", "$");
   };
 
   // Pluralize the given scope using the `count` value.
@@ -363,6 +459,11 @@
     return message;
   };
 
+  // Return a missing placeholder message for given parameters
+  I18n.missingPlaceholder = function(placeholder, message) {
+    return "[missing " + placeholder + " value]";
+  };
+
   // Format number using localization rules.
   // The options will be retrieved from the `number.format` scope.
   // If this isn't present, then the following options will be used:
@@ -481,16 +582,17 @@
   //    yyyy-mm-dd[ T]hh:mm::ss
   //    yyyy-mm-dd[ T]hh:mm::ssZ
   //    yyyy-mm-dd[ T]hh:mm::ss+0000
+  //    yyyy-mm-dd[ T]hh:mm::ss+00:00
+  //    yyyy-mm-dd[ T]hh:mm::ss.123Z
   //
   I18n.parseDate = function(date) {
-    var matches, convertedDate;
-
+    var matches, convertedDate, fraction;
     // we have a date, so just return it.
     if (typeof(date) == "object") {
       return date;
     };
 
-    matches = date.toString().match(/(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2}))?(Z|\+0000)?/);
+    matches = date.toString().match(/(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2})([\.,]\d{1,3})?)?(Z|\+00:?00)?/);
 
     if (matches) {
       for (var i = 1; i <= 6; i++) {
@@ -500,19 +602,28 @@
       // month starts on 0
       matches[2] -= 1;
 
-      if (matches[7]) {
-        convertedDate = new Date(Date.UTC(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]));
+      fraction = matches[7] ? 1000 * ("0" + matches[7]) : null;
+
+      if (matches[8]) {
+        convertedDate = new Date(Date.UTC(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6], fraction));
       } else {
-        convertedDate = new Date(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]);
+        convertedDate = new Date(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6], fraction);
       }
     } else if (typeof(date) == "number") {
       // UNIX timestamp
       convertedDate = new Date();
       convertedDate.setTime(date);
+    } else if (date.match(/([A-Z][a-z]{2}) ([A-Z][a-z]{2}) (\d+) (\d+:\d+:\d+) ([+-]\d+) (\d+)/)) {
+      // This format `Wed Jul 20 13:03:39 +0000 2011` is parsed by
+      // webkit/firefox, but not by IE, so we must parse it manually.
+      convertedDate = new Date();
+      convertedDate.setTime(Date.parse([
+        RegExp.$1, RegExp.$2, RegExp.$3, RegExp.$6, RegExp.$4, RegExp.$5
+      ].join(" ")));
     } else if (date.match(/\d+ \d+:\d+:\d+ [+-]\d+ \d+/)) {
       // a valid javascript format with timezone info
       convertedDate = new Date();
-      convertedDate.setTime(Date.parse(date))
+      convertedDate.setTime(Date.parse(date));
     } else {
       // an arbitrary javascript string
       convertedDate = new Date();
@@ -553,15 +664,15 @@
   //     %z  - Timezone offset (+0545)
   //
   I18n.strftime = function(date, format) {
-    var options = this.lookup("date");
+    var options = this.lookup("date")
+      , meridianOptions = I18n.meridian()
+    ;
 
     if (!options) {
-      options = DAYS_AND_MONTHS;
+      options = {};
     }
 
-    if (!options.meridian) {
-      options.meridian = MERIDIAN;
-    }
+    options = this.prepareOptions(options, DATE);
 
     var weekDay = date.getDay()
       , day = date.getDate()
@@ -575,7 +686,9 @@
       , offset = date.getTimezoneOffset()
       , absOffsetHours = Math.floor(Math.abs(offset / 60))
       , absOffsetMinutes = Math.abs(offset) - (absOffsetHours * 60)
-      , timezoneoffset = (offset > 0 ? "-" : "+") + (absOffsetHours.toString().length < 2 ? "0" + absOffsetHours : absOffsetHours) + (absOffsetMinutes.toString().length < 2 ? "0" + absOffsetMinutes : absOffsetMinutes)
+      , timezoneoffset = (offset > 0 ? "-" : "+") +
+          (absOffsetHours.toString().length < 2 ? "0" + absOffsetHours : absOffsetHours) +
+          (absOffsetMinutes.toString().length < 2 ? "0" + absOffsetMinutes : absOffsetMinutes)
     ;
 
     if (hour12 > 12) {
@@ -599,7 +712,7 @@
     format = format.replace("%-m", month);
     format = format.replace("%M", padding(mins));
     format = format.replace("%-M", mins);
-    format = format.replace("%p", options.meridian[meridian]);
+    format = format.replace("%p", meridianOptions[meridian]);
     format = format.replace("%S", padding(secs));
     format = format.replace("%-S", secs);
     format = format.replace("%w", weekDay);
@@ -681,4 +794,4 @@
   I18n.t = I18n.translate;
   I18n.l = I18n.localize;
   I18n.p = I18n.pluralize;
-})(typeof(exports) === "undefined" ? (this.I18n = {}) : exports);
+})(typeof(exports) === "undefined" ? (this.I18n || (this.I18n = {})) : exports);