| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 /** @module filterValidation */ | 18 /** @module filterValidation */ |
| 19 | 19 |
| 20 "use strict"; | 20 "use strict"; |
| 21 | 21 |
| 22 const {Filter, InvalidFilter, ElemHideBase, ElemHideEmulationFilter} = | 22 const {Filter, InvalidFilter, ElemHideBase, ElemHideEmulationFilter} = |
| 23 require("filterClasses"); | 23 require("filterClasses"); |
| 24 const {Utils} = require("utils"); | |
| 25 | 24 |
| 26 /** | 25 /** |
| 27 * An error returned by | 26 * An error returned by |
| 28 * {@link module:filterValidation.parseFilter parseFilter()} or | 27 * {@link module:filterValidation.parseFilter parseFilter()} or |
| 29 * {@link module:filterValidation.parseFilters parseFilters()} | 28 * {@link module:filterValidation.parseFilters parseFilters()} |
| 30 * indicating that a given filter cannot be parsed, | 29 * indicating that a given filter cannot be parsed, |
| 31 * contains an invalid CSS selector or is a filter list header. | 30 * contains an invalid CSS selector or is a filter list header. |
| 32 * | 31 * |
| 33 * @param {string} type See documentation in the constructor below. | 32 * @param {string} type See documentation in the constructor below. |
| 34 * @param {Object} [details] Contains the "reason" and / or "selector" | 33 * @param {Object} [details] Contains the "reason" and / or "selector" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 65 |
| 67 /** | 66 /** |
| 68 * Returns a detailed translated error message. | 67 * Returns a detailed translated error message. |
| 69 * | 68 * |
| 70 * @return {string} | 69 * @return {string} |
| 71 */ | 70 */ |
| 72 toString() | 71 toString() |
| 73 { | 72 { |
| 74 let message; | 73 let message; |
| 75 if (this.reason) | 74 if (this.reason) |
| 76 message = Utils.getString(this.reason); | 75 message = browser.i18n.getMessage(this.reason); |
| 77 else | 76 else |
| 78 { | 77 { |
| 79 message = browser.i18n.getMessage( | 78 message = browser.i18n.getMessage( |
| 80 this.type.replace(/-/g, "_"), | 79 this.type.replace(/-/g, "_"), |
| 81 "selector" in this ? "'" + this.selector + "'" : null | 80 "selector" in this ? "'" + this.selector + "'" : null |
| 82 ); | 81 ); |
| 83 } | 82 } |
| 84 | 83 |
| 85 if (this.lineno) | 84 if (this.lineno) |
| 86 { | 85 { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 183 |
| 185 if (error) | 184 if (error) |
| 186 { | 185 { |
| 187 error.lineno = i + 1; | 186 error.lineno = i + 1; |
| 188 errors.push(error); | 187 errors.push(error); |
| 189 } | 188 } |
| 190 } | 189 } |
| 191 | 190 |
| 192 return {filters, errors}; | 191 return {filters, errors}; |
| 193 }; | 192 }; |
| OLD | NEW |