From 47a9566bb29709f0900ecab230e8a03542943c27 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 6 Apr 2017 21:55:52 +0200
Subject: [PATCH] Update moment.js to 2.18.1

---
 3rdparty/moment_locales.js | 33 +++++++++++++++++----------------
 docs/CHANGES.md            |  1 +
 package.json               |  2 +-
 src/config.js              | 25 ++++++++-----------------
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/3rdparty/moment_locales.js b/3rdparty/moment_locales.js
index 33c014834..c68e376c9 100644
--- a/3rdparty/moment_locales.js
+++ b/3rdparty/moment_locales.js
@@ -9,22 +9,23 @@
 (function (root, factory) {
     define("moment_with_locales", [
         'moment',   // Everything below can be removed except for moment itself.
-        'moment_af',
-        'moment_de',
-        'moment_es',
-        'moment_fr',
-        'moment_he',
-        'moment_hu',
-        'moment_id',
-        'moment_it',
-        'moment_ja',
-        'moment_nb',
-        'moment_nl',
-        'moment_pl',
-        'moment_pt-br',
-        'moment_ru',
-        'moment_uk',
-        'moment_zh'
+        'moment/locale/af',
+        'moment/locale/de',
+        'moment/locale/es',
+        'moment/locale/fr',
+        'moment/locale/he',
+        'moment/locale/hu',
+        'moment/locale/id',
+        'moment/locale/it',
+        'moment/locale/ja',
+        'moment/locale/nb',
+        'moment/locale/nl',
+        'moment/locale/pl',
+        'moment/locale/pt-br',
+        'moment/locale/ru',
+        'moment/locale/uk',
+        // 'moment/locale/zh' (No longer in locales, now only with
+        // country codes, e.g. zh-cn.js zh-hk.js zh-tw.js).
         ], function (moment) {
             return moment;
         });
diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index bec2db18b..ba08efeab 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -3,6 +3,7 @@
 ## 3.0.2 (Unreleased)
 
 - Update Jasmine from 1.3.1 to 2.5.3 and Phantomjs from 1.9.7-1 to 2.1.14 [jcbrand]
+- Update moment.js to 2.18.1 [jcbrand]
 
 ## 3.0.1 (2017-04-04)
 
diff --git a/package.json b/package.json
index 7136cbeed..31de1c1a0 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "jshint": "^2.9.4",
     "lodash": "^4.17.4",
     "lodash-template-loader": "^2.0.0",
-    "moment": "~2.13.0",
+    "moment": "~2.18.1",
     "npm": "^4.1.1",
     "otr": "0.2.16",
     "phantomjs-prebuilt": "~2.1.14",
diff --git a/src/config.js b/src/config.js
index 65e6f70d2..6e5c74b2e 100644
--- a/src/config.js
+++ b/src/config.js
@@ -26,7 +26,6 @@ require.config({
         "jquery-private":           "src/jquery-private",
         "jquery.browser":           "node_modules/jquery.browser/dist/jquery.browser",
         "jquery.easing":            "node_modules/jquery-easing/jquery.easing.1.3.umd", // XXX: Only required for https://conversejs.org website
-        "moment":                   "node_modules/moment/moment",
         "pluggable":                "node_modules/pluggable.js/dist/pluggable",
         "polyfill":                 "src/polyfill",
         "sizzle":                   "node_modules/jquery/sizzle/dist/sizzle",
@@ -91,22 +90,6 @@ require.config({
         "zh":        "locale/zh/LC_MESSAGES/converse.json",
 
         "moment_with_locales": "3rdparty/moment_locales",
-        'moment_af':        "node_modules/moment/locale/af",
-        'moment_de':        "node_modules/moment/locale/de",
-        'moment_es':        "node_modules/moment/locale/es",
-        'moment_fr':        "node_modules/moment/locale/fr",
-        'moment_he':        "node_modules/moment/locale/he",
-        'moment_hu':        "node_modules/moment/locale/hu",
-        'moment_id':        "node_modules/moment/locale/id",
-        'moment_it':        "node_modules/moment/locale/it",
-        'moment_ja':        "node_modules/moment/locale/ja",
-        'moment_nb':        "node_modules/moment/locale/nb",
-        'moment_nl':        "node_modules/moment/locale/nl",
-        'moment_pl':        "node_modules/moment/locale/pl",
-        'moment_pt-br':     "node_modules/moment/locale/pt-br",
-        'moment_ru':        "node_modules/moment/locale/ru",
-        'moment_uk':        "node_modules/moment/locale/uk",
-        'moment_zh':        "node_modules/moment/locale/zh-cn",
 
         // Templates
         "action":                   "src/templates/action",
@@ -174,6 +157,14 @@ require.config({
         "trimmed_chat":             "src/templates/trimmed_chat"
     },
 
+    packages: [{
+        name: 'moment',
+        // This location is relative to baseUrl. Choose bower_components
+        // or node_modules, depending on how moment was installed.
+        location: 'node_modules/moment',
+        main: 'moment'
+    }],
+
     map: {
         // '*' means all modules will get 'jquery-private'
         // for their 'jquery' dependency.