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.js | 27 |
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 @@ | |||
1 | /* | 1 | /* |
2 | 2 | ||
3 | Copyright 2008-2011 Clipperz Srl | 3 | Copyright 2008-2013 Clipperz Srl |
4 | 4 | ||
5 | This file is part of Clipperz Community Edition. | 5 | This file is part of Clipperz, the online password manager. |
6 | Clipperz Community Edition is an online password manager. | ||
7 | For further information about its features and functionalities please | 6 | For further information about its features and functionalities please |
8 | refer to http://www.clipperz.com. | 7 | refer to http://www.clipperz.com. |
9 | 8 | ||
10 | * Clipperz Community Edition is free software: you can redistribute | 9 | * Clipperz is free software: you can redistribute it and/or modify it |
11 | it and/or modify it under the terms of the GNU Affero General Public | 10 | under the terms of the GNU Affero General Public License as published |
12 | License as published by the Free Software Foundation, either version | 11 | by the Free Software Foundation, either version 3 of the License, or |
13 | 3 of the License, or (at your option) any later version. | 12 | (at your option) any later version. |
14 | 13 | ||
15 | * Clipperz Community Edition is distributed in the hope that it will | 14 | * Clipperz is distributed in the hope that it will be useful, but |
16 | be useful, but WITHOUT ANY WARRANTY; without even the implied | 15 | WITHOUT ANY WARRANTY; without even the implied warranty of |
17 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
18 | See the GNU Affero General Public License for more details. | 17 | See the GNU Affero General Public License for more details. |
19 | 18 | ||
20 | * You should have received a copy of the GNU Affero General Public | 19 | * You should have received a copy of the GNU Affero General Public |
21 | License along with Clipperz Community Edition. If not, see | 20 | License along with Clipperz. If not, see http://www.gnu.org/licenses/. |
22 | <http://www.gnu.org/licenses/>. | ||
23 | 21 | ||
24 | */ | 22 | */ |
25 | 23 | ||
@@ -241,22 +239,17 @@ Clipperz.PM.Strings.getValue = function (aKeyPath, someKeyValues) { | |||
241 | 239 | ||
242 | result = Clipperz.PM.Strings.stringsObjectStore.getValue(aKeyPath); | 240 | result = Clipperz.PM.Strings.stringsObjectStore.getValue(aKeyPath); |
243 | 241 | ||
244 | //try { | ||
245 | if (typeof(result) == 'string') { | 242 | if (typeof(result) == 'string') { |
246 | if (typeof (someKeyValues) != 'undefined') { | 243 | if (typeof (someKeyValues) != 'undefined') { |
247 | varkey; | 244 | varkey; |
248 | 245 | ||
249 | for (key in someKeyValues) { | 246 | for (key in someKeyValues) { |
250 | result = result.replace( new RegExp(key), someKeyValues[key]); | 247 | result = result.replace( new RegExp(key), someKeyValues[key]); |
251 | // result.replace(, ''); | ||
252 | } | 248 | } |
253 | } | 249 | } |
254 | 250 | ||
255 | result = result.replace(new RegExp('\n'), '<br>'); | 251 | result = result.replace(new RegExp('\n'), '<br>'); |
256 | } | 252 | } |
257 | //} catch (exception) { | ||
258 | //console.log("####", result, aKeyPath, someKeyValues, exception); | ||
259 | //} | ||
260 | 253 | ||
261 | return result; | 254 | return result; |
262 | } | 255 | } |