summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/Clipperz/PM/Strings.js
Side-by-side diff
Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/Strings.js') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/js/Clipperz/PM/Strings.js27
1 files changed, 10 insertions, 17 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/Strings.js b/frontend/gamma/js/Clipperz/PM/Strings.js
index a051365..7e855ff 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings.js
@@ -1,25 +1,23 @@
/*
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
For further information about its features and functionalities please
refer to http://www.clipperz.com.
-* Clipperz Community Edition is free software: you can redistribute
- it and/or modify it under the terms of the GNU Affero General Public
- License as published by the Free Software Foundation, either version
- 3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
- be useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.
* You should have received a copy of the GNU Affero General Public
- License along with Clipperz Community Edition. If not, see
- <http://www.gnu.org/licenses/>.
+ License along with Clipperz. If not, see http://www.gnu.org/licenses/.
*/
@@ -241,22 +239,17 @@ Clipperz.PM.Strings.getValue = function (aKeyPath, someKeyValues) {
result = Clipperz.PM.Strings.stringsObjectStore.getValue(aKeyPath);
-//try {
if (typeof(result) == 'string') {
if (typeof (someKeyValues) != 'undefined') {
var key;
for (key in someKeyValues) {
result = result.replace( new RegExp(key), someKeyValues[key]);
- // result.replace(, '');
}
}
result = result.replace(new RegExp('\n'), '<br>');
}
-//} catch (exception) {
-// console.log("####", result, aKeyPath, someKeyValues, exception);
-//}
return result;
}