Bump and build 2.0.0-pre.2

BedeGaming · May 4, 2016 · 84306c8 · 84306c8
1 parent 8ecbdeb
commit 84306c8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+### v2.0.0-pre.2 [view commit logs](https://github.com/BedeGaming/orchestra/compare/v2.0.0-pre.1...v2.0.0-pre.2)
+
+#### Fixes
+
+* Translation strings can now have colons present.
+
 ### v2.0.0-pre.1 [view commit logs](https://github.com/BedeGaming/orchestra/compare/v1.5.1...v2.0.0-pre.1)
 
 #### Package Updates
@@ -91,4 +97,4 @@
 
 ### v1.0.0
 
-* Initial release.
+* Initial release.
diff --git a/dist/orchestra.js b/dist/orchestra.js
@@ -6507,7 +6507,8 @@ module.exports = require('/Users/andrewhumphreys/Documents/work/orchestra/node_m
   } else if (typeof exports !== 'undefined') {
     var _ = require('underscore');
     var Backbone = require('backbone');
-    var $ = require('jquery');
+    var $;
+    try {$ = require('jquery')} catch(e){};
     module.exports = factory(_, Backbone, $);
   } else {
     factory(root._, root.Backbone, root.jQuery);
@@ -41386,6 +41387,8 @@ var TranslateHelpers = function () {
       };
 
       _i18next2.default.use(_i18nextSprintfPostprocessor2.default).init({
+        nsSeparator: false,
+        keySeparator: false,
         lng: locale,
         resources: resources[locale]
       }, function (err, translate) {

diff --git a/dist/orchestra.js.map b/dist/orchestra.js.map
diff --git a/dist/orchestra.min.js b/dist/orchestra.min.js
diff --git a/dist/orchestra.min.js.map b/dist/orchestra.min.js.map
diff --git a/lib/helpers/translate.js b/lib/helpers/translate.js
diff --git a/lib/helpers/translate.js.map b/lib/helpers/translate.js.map