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

Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

Browse Source 
Conflicts:
	common/dist/scripts/habitrpg-shared.js
This commit is contained in:
Blade Barringer
2015-02-09 22:18:22 -06:00
parent a1568b0c32 fb72b10e3d
commit 45d1fb4c6e
128 changed files with 7976 additions and 7669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/script/i18n.coffee
View File

@@ -15,10 +15,13 @@ module.exports =
locale = 'en' if (!locale? or (!module.exports.strings and !module.exports.translations[locale]))
string = if (!module.exports.strings) then module.exports.translations[locale][stringName] else module.exports.strings[stringName]
clonedVars = _.clone(vars) or {};
clonedVars.locale = locale;
if string
try
_.template(string, (vars or {}))
_.template(string, (clonedVars))
catch e
'Error processing string. Please report to http://github.com/HabitRPG/habitrpg.'
else