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

Delta Between Two Patch Sets: lib/utils.js

Issue 29338190: Issue 3697 - Fall back to i18n.getUILanguage if @ui_locale isn't supported (Closed)
Left Patch Set: Rebase and just use i18n.getUILanguage() Created Aug. 25, 2017, 11:22 p.m.
Right Patch Set: Address the nits Created Aug. 30, 2017, 10:59 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/notificationHelper.js ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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.getUILanguage().replace(/_/g, "-"); 46 let locale = ext.i18n.getUILanguage();
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() 50 get readingDirection()
51 { 51 {
52 let direction = ext.i18n.getMessage("@@bidi_dir"); 52 let direction = ext.i18n.getMessage("@@bidi_dir");
53 // This fallback is only necessary for Microsoft Edge
53 if (!direction) 54 if (!direction)
Sebastian Noack 2017/08/26 07:16:47 We probably should add a comment that this fallbac
54 direction = /^(ar|fa|he|ug|ur)(_|$)/.test(this.appLocale) ? "rtl" : "ltr"; 55 direction = /^(?:ar|fa|he|ug|ur)\b/.test(this.appLocale) ? "rtl" : "ltr";
55 Object.defineProperty( 56 Object.defineProperty(
56 this, 57 this,
57 "readingDirection", 58 "readingDirection",
58 {value: direction, enumerable: true}); 59 {value: direction, enumerable: true}
60 );
59 return this.readingDirection; 61 return this.readingDirection;
60 }, 62 },
61 generateChecksum(lines) 63 generateChecksum(lines)
62 { 64 {
63 // We cannot calculate MD5 checksums yet :-( 65 // We cannot calculate MD5 checksums yet :-(
64 return null; 66 return null;
65 }, 67 },
66 checkLocalePrefixMatch(prefixes) 68 checkLocalePrefixMatch(prefixes)
67 { 69 {
68 if (!prefixes) 70 if (!prefixes)
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 { 123 {
122 let docLink = require("prefs").Prefs.documentation_link; 124 let docLink = require("prefs").Prefs.documentation_link;
123 return docLink.replace(/%LINK%/g, linkID) 125 return docLink.replace(/%LINK%/g, linkID)
124 .replace(/%LANG%/g, Utils.appLocale); 126 .replace(/%LANG%/g, Utils.appLocale);
125 }, 127 },
126 128
127 yield() 129 yield()
128 { 130 {
129 } 131 }
130 }; 132 };
LEFTRIGHT

Powered by Google App Engine
This is Rietveld