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

Side by Side Diff: lib/utils.js

Issue 29338190: Issue 3697 - Fall back to i18n.getUILanguage if @ui_locale isn't supported (Closed)
Patch Set: Update the adblockplusui dependency. Add a comment. Change regexp. Created Aug. 29, 2017, 1:34 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
« dependencies ('K') | « lib/notificationHelper.js ('k') | no next file » | no next file with comments »
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 25 matching lines...) Expand all
36 }; 36 };
37 document.addEventListener("DOMContentLoaded", onDOMContentLoaded); 37 document.addEventListener("DOMContentLoaded", onDOMContentLoaded);
38 } 38 }
39 else 39 else
40 { 40 {
41 setTimeout(callback, 0); 41 setTimeout(callback, 0);
42 } 42 }
43 }, 43 },
44 get appLocale() 44 get appLocale()
45 { 45 {
46 let locale = ext.i18n.getMessage("@@ui_locale").replace(/_/g, "-"); 46 let locale = ext.i18n.getUILanguage().replace(/_/g, "-");
Sebastian Noack 2017/08/30 00:22:12 I just noticed, getUILanguage() as opposed to getM
47 Object.defineProperty(this, "appLocale", {value: locale, enumerable: true}); 47 Object.defineProperty(this, "appLocale", {value: locale, enumerable: true});
48 return this.appLocale; 48 return this.appLocale;
49 }, 49 },
50 get readingDirection()
51 {
52 let direction = ext.i18n.getMessage("@@bidi_dir");
53 if (!direction)
54 // This fallback is only necessary for Microsoft Edge
55 direction = /^(?:ar|fa|he|ug|ur)\b/.test(this.appLocale) ? "rtl" : "ltr";
56 Object.defineProperty(
57 this,
58 "readingDirection",
59 {value: direction, enumerable: true});
60 return this.readingDirection;
61 },
50 generateChecksum(lines) 62 generateChecksum(lines)
51 { 63 {
52 // We cannot calculate MD5 checksums yet :-( 64 // We cannot calculate MD5 checksums yet :-(
53 return null; 65 return null;
54 }, 66 },
55 checkLocalePrefixMatch(prefixes) 67 checkLocalePrefixMatch(prefixes)
56 { 68 {
57 if (!prefixes) 69 if (!prefixes)
58 return null; 70 return null;
59 71
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 { 122 {
111 let docLink = require("prefs").Prefs.documentation_link; 123 let docLink = require("prefs").Prefs.documentation_link;
112 return docLink.replace(/%LINK%/g, linkID) 124 return docLink.replace(/%LINK%/g, linkID)
113 .replace(/%LANG%/g, Utils.appLocale); 125 .replace(/%LANG%/g, Utils.appLocale);
114 }, 126 },
115 127
116 yield() 128 yield()
117 { 129 {
118 } 130 }
119 }; 131 };
OLDNEW
« dependencies ('K') | « lib/notificationHelper.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld