krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade lodash to v4 and lint more files (#8495)

Browse Source 
* common: import lodash modules separately

* remove test/content from .eslintignore, fix with eslint --fix content/index

* lint test/content

* lint content/index except for lodash methods

* upgrade server/models

* upgrade server/middlewares and server/libs

* port server/controllers/top-level

* port server/controllers/api-v3

* port views and tests

* client old port lodash and _(, missing _.

* upgrade client-old

* port common/script (root level files only)

* port common/script/fns

* port common/libs

* port common/script/ops

* port common/script/content and common/script/libs/shops.js

* misc fixes

* misc fixes

* misc fixes

* more tests fixes

* fix payments test stubbing, down to 2 failing tests

* remove more instances of lodash wrapping

* fix bug where toObject does not clone object

* fix tests

* upgrade migration or add lodash 4 note

* update shrinkwrap

* fix linting

* upgrade eslint-config-habitrpg

* update shrinkwrap

* recompile shrinkwrap
This commit is contained in:
Matteo Pagliazzi
2017-03-01 17:10:48 +01:00
committed by GitHub
parent ef02e59590
commit 98c019a0b6
150 changed files with 4996 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/common/script/i18n.js
View File

@@ -1,4 +1,6 @@
import _ from 'lodash';
import isString from 'lodash/isString';
import clone from 'lodash/clone';
import template from 'lodash/template';
let i18n = {
strings: null,
@@ -10,7 +12,7 @@ function t (stringName) {
let vars = arguments[1];
let locale;
if (_.isString(arguments[1])) {
if (isString(arguments[1])) {
vars = null;
locale = arguments[1];
} else if (arguments[2]) {
@@ -31,13 +33,13 @@ function t (stringName) {
string = i18n.translations[locale] && i18n.translations[locale][stringName];
}
let clonedVars = _.clone(vars) || {};
let clonedVars = clone(vars) || {};
clonedVars.locale = locale;
if (string) {
try {
return _.template(string)(clonedVars);
return template(string)(clonedVars);
} catch (_error) {
return 'Error processing the string. Please see Help > Report a Bug.';
}
@@ -51,7 +53,7 @@ function t (stringName) {
}
try {
return _.template(stringNotFound)({
return template(stringNotFound)({
string: stringName,
});
} catch (_error) {