From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sun, 8 Sep 2013 18:17:37 +0000 (-0700)
Subject: Merge branch 'feature/umd-lang' into develop
X-Git-Tag: 2.2.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4c9175491d1f6005ce78b5f9bcd4f985ef18a68;p=thirdparty%2Fmoment.git

Merge branch 'feature/umd-lang' into develop

Conflicts:
	lang/nb.js
---

c4c9175491d1f6005ce78b5f9bcd4f985ef18a68
diff --cc lang/nb.js
index e4ea6df2c,b32e93fc3..700710178
--- a/lang/nb.js
+++ b/lang/nb.js
@@@ -1,47 -1,56 +1,57 @@@
  // moment.js language configuration
  // language : norwegian bokmål (nb)
 -// author : Espen Hovlandsdal : https://github.com/rexxars
 +// authors : Espen Hovlandsdal : https://github.com/rexxars
 +//           Sigurd Gartmann : https://github.com/sigurdga
  
- require('../moment').lang('nb', {
-     months : "januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),
-     monthsShort : "jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"),
-     weekdays : "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),
-     weekdaysShort : "sø._ma._ti._on._to._fr._lø.".split("_"),
-     weekdaysMin : "sø_ma_ti_on_to_fr_lø".split("_"),
-     longDateFormat : {
-         LT : "H.mm",
-         L : "DD.MM.YYYY",
-         LL : "D. MMMM YYYY",
-         LLL : "D. MMMM YYYY [kl.] LT",
-         LLLL : "dddd D. MMMM YYYY [kl.] LT"
-     },
-     calendar : {
-         sameDay: '[i dag kl.] LT',
-         nextDay: '[i morgen kl.] LT',
-         nextWeek: 'dddd [kl.] LT',
-         lastDay: '[i går kl.] LT',
-         lastWeek: '[forrige] dddd [kl.] LT',
-         sameElse: 'L'
-     },
-     relativeTime : {
-         future : "om %s",
-         past : "for %s siden",
-         s : "noen sekunder",
-         m : "ett minutt",
-         mm : "%d minutter",
-         h : "en time",
-         hh : "%d timer",
-         d : "en dag",
-         dd : "%d dager",
-         M : "en måned",
-         MM : "%d måneder",
-         y : "ett år",
-         yy : "%d år"
-     },
-     ordinal : '%d.',
-     week : {
-         dow : 1, // Monday is the first day of the week.
-         doy : 4  // The week that contains Jan 4th is the first week of the year.
+ (function (factory) {
+     if (typeof define === 'function' && define.amd) {
+         define(['moment'], factory); // AMD
+     } else if (typeof exports === 'object') {
+         factory(require('../moment')); // Node
+     } else {
+         factory(window.moment); // Browser global
      }
- });
+ }(function (moment) {
+     moment.lang('nb', {
+         months : "januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),
 -        monthsShort : "jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),
++        monthsShort : "jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"),
+         weekdays : "søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),
 -        weekdaysShort : "søn_man_tir_ons_tor_fre_lør".split("_"),
++        weekdaysShort : "sø._ma._ti._on._to._fr._lø.".split("_"),
+         weekdaysMin : "sø_ma_ti_on_to_fr_lø".split("_"),
+         longDateFormat : {
 -            LT : "HH:mm",
++            LT : "H.mm",
+             L : "DD.MM.YYYY",
 -            LL : "D MMMM YYYY",
 -            LLL : "D MMMM YYYY LT",
 -            LLLL : "dddd D MMMM YYYY LT"
++            LL : "D. MMMM YYYY",
++            LLL : "D. MMMM YYYY [kl.] LT",
++            LLLL : "dddd D. MMMM YYYY [kl.] LT"
+         },
+         calendar : {
 -            sameDay: '[I dag klokken] LT',
 -            nextDay: '[I morgen klokken] LT',
 -            nextWeek: 'dddd [klokken] LT',
 -            lastDay: '[I går klokken] LT',
 -            lastWeek: '[Forrige] dddd [klokken] LT',
++            sameDay: '[i dag kl.] LT',
++            nextDay: '[i morgen kl.] LT',
++            nextWeek: 'dddd [kl.] LT',
++            lastDay: '[i går kl.] LT',
++            lastWeek: '[forrige] dddd [kl.] LT',
+             sameElse: 'L'
+         },
+         relativeTime : {
+             future : "om %s",
+             past : "for %s siden",
+             s : "noen sekunder",
+             m : "ett minutt",
+             mm : "%d minutter",
+             h : "en time",
+             hh : "%d timer",
+             d : "en dag",
+             dd : "%d dager",
+             M : "en måned",
+             MM : "%d måneder",
+             y : "ett år",
+             yy : "%d år"
+         },
+         ordinal : '%d.',
+         week : {
+             dow : 1, // Monday is the first day of the week.
+             doy : 4  // The week that contains Jan 4th is the first week of the year.
+         }
+     });
+ }));