Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/notificationHelper.js

Issue 29338190: Issue 3697 - Fall back to i18n.getUILanguage if @ui_locale isn't supported (Closed)
Patch Set: Rebase and just use i18n.getUILanguage() Created Aug. 25, 2017, 11:22 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | lib/utils.js » ('j') | lib/utils.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 } 206 }
207 else if ("Notification" in window && activeNotification.type != "question") 207 else if ("Notification" in window && activeNotification.type != "question")
208 { 208 {
209 if (linkCount > 0) 209 if (linkCount > 0)
210 message += " " + ext.i18n.getMessage("notification_without_buttons"); 210 message += " " + ext.i18n.getMessage("notification_without_buttons");
211 211
212 let widget = new Notification( 212 let widget = new Notification(
213 title, 213 title,
214 { 214 {
215 lang: Utils.appLocale, 215 lang: Utils.appLocale,
216 dir: ext.i18n.getMessage("@@bidi_dir"), 216 dir: Utils.readingDirection,
217 body: message, 217 body: message,
218 icon: iconUrl 218 icon: iconUrl
219 } 219 }
220 ); 220 );
221 221
222 widget.addEventListener("click", openNotificationLinks); 222 widget.addEventListener("click", openNotificationLinks);
223 widget.addEventListener("close", notificationClosed); 223 widget.addEventListener("close", notificationClosed);
224 } 224 }
225 else 225 else
226 { 226 {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 let methods = displayMethods[notificationType] || defaultDisplayMethods; 272 let methods = displayMethods[notificationType] || defaultDisplayMethods;
273 return methods.includes(method); 273 return methods.includes(method);
274 }; 274 };
275 275
276 ext.pages.onLoading.addListener(page => 276 ext.pages.onLoading.addListener(page =>
277 { 277 {
278 NotificationStorage.showNext(stringifyURL(page.url)); 278 NotificationStorage.showNext(stringifyURL(page.url));
279 }); 279 });
280 280
281 NotificationStorage.addShowListener(showNotification); 281 NotificationStorage.addShowListener(showNotification);
OLDNEW
« no previous file with comments | « no previous file | lib/utils.js » ('j') | lib/utils.js » ('J')

Powered by Google App Engine
This is Rietveld