Brion VIBBER has submitted this change and it was merged.
Change subject: Barebones Wikipedia Zero support for FFOS.
......................................................................
Barebones Wikipedia Zero support for FFOS.
* This gets us by for some future state.
* It alerts the user at app startup if Wikipedia Zero is on.
* It also updates the search bar.
* Finally, it tries to account for app quiesce and not overly prompt.
* In rebooted app we would do radio and some sort of header inspection.
Change-Id: I60c7c408a0e01b81e9d0fe2108de0138804e7b74
---
M app.appcache
M js/lib/chrome.js
M js/lib/menu.js
M manifest.webapp
M messages/messages-ast.properties
M messages/messages-br.properties
M messages/messages-ca.properties
M messages/messages-cs.properties
M messages/messages-cy.properties
M messages/messages-de.properties
M messages/messages-en.properties
M messages/messages-es.properties
M messages/messages-fa.properties
M messages/messages-fr.properties
M messages/messages-he.properties
M messages/messages-hsb.properties
M messages/messages-lb.properties
M messages/messages-mk.properties
M messages/messages-nl.properties
M messages/messages-ro.properties
M messages/messages-ru.properties
M messages/messages-sv.properties
M messages/messages-uk.properties
M messages/messages-vi.properties
24 files changed, 83 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/app.appcache b/app.appcache
index dcf805c..43c11c0 100644
--- a/app.appcache
+++ b/app.appcache
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Wed Mar 19 22:41:08 UTC 2014
+# Wed Mar 26 01:05:53 UTC 2014
index.html
404.html
AUTHORS
diff --git a/js/lib/chrome.js b/js/lib/chrome.js
index f2bce57..b16ecff 100644
--- a/js/lib/chrome.js
+++ b/js/lib/chrome.js
@@ -202,7 +202,66 @@
}
function loadFirstPage() {
- var lastReadPage = localStorage["lastReadPage"];
+ var lastReadPage = localStorage["lastReadPage"],
+
+ /*
+ We'll check one time here if it's Wikipedia Zero.
+ It's possible the Wikipedia app for FFOS will have
+ been shutdown due to general system memory constraints.
+ So we may check sometimes more than we want.
+ But we do have to check in that case. The alternative
+ would be to not check, which would be wrong.
+ To mitigate this, we'll reduce checks if Wikipedia
+ Zero was known to be on within the last 15 minutes.
+ One downside is users who actively quiesce the app
+ won't get the prompt, but that's a tradeoff we'll accept,
+ as we have evidence of app quiesce from Mozilla Bugzilla,
+ whereas active quiesce in FFOS in practice is unresearched.
+ Now, as we retain the last page visited, the user
+ may not even notice that the app was shutdown. So
+ even though we may make an extra check in this post-
+ quiesced state, we shouldn't prompt the user more
+ than necessary. In a reboot of this app, we'd have
+ more visual polish (e.g., colorized UI) to make it
+ more obvious, but this is a simpler approach for now.
+ */
+
+ lang = preferencesDB.get('language') || 'en',
+ wikipediaZeroMessageUrl = window.PROTOCOL + '://' +
lang + '.m.' + window.PROJECTNAME +
'.org/w/api.php?action=zeroconfig&type=message&agent=ffos-wikipedia',
+ wikipediaZeroShownDateTime =
localStorage['wikipediaZeroShownDateTime'],
+ dateDifference,
+ showZeroInSearch = function() {
$('#searchParam').attr('placeholder', mw.msg('zero-search-hint' ).toString());
};
+
+ if (wikipediaZeroShownDateTime) {
+ dateDifference = Date.now() -
wikipediaZeroShownDateTime;
+ }
+
+ if (dateDifference && dateDifference < 1000 * 60 * 15) {
+ /*
+ Allow the page load time to start before changing
searchbar.
+ The Ajax else{} below does so by its own nature.
+ */
+ setTimeout( function() { showZeroInSearch(); }, 200)
+ } else {
+ /* More than 15 minutes has passed since W0 on, or W0
was never on. */
+ $.ajax({
+ url: wikipediaZeroMessageUrl,
+ dataType: 'jsonp',
+ success: function(json) {
+ if(json && json.message) {
+ showZeroInSearch();
+
localStorage['wikipediaZeroShownDateTime'] = Date.now();
+ alert(json.message);
+ }
+ },
+ error: function(error) {
+ console.log('Error obtaining W0
status:' + error.message);
+ }
+ });
+ }
+
+
+ /* Now, back to our regularly scheduled program */
return lastReadPage ? app.navigateToPage(lastReadPage) :
app.loadMainPage();
}
diff --git a/js/lib/menu.js b/js/lib/menu.js
index f4be605..101145b 100644
--- a/js/lib/menu.js
+++ b/js/lib/menu.js
@@ -15,7 +15,7 @@
function getAboutVersionString() {
/* window.navigator.mozApps.getSelf() turned out to be problematic here
*/
- return "3.2.6";
+ return "3.2.7";
}
var menu_items = [
diff --git a/manifest.webapp b/manifest.webapp
index 568a129..ec86944 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -1,5 +1,5 @@
{
- "version": "3.2.6",
+ "version": "3.2.7",
"name": "Wikipedia",
"description": "Wikipedia Mobile for Firefox OS",
"launch_path": "/WikipediaMobileFirefoxOS/",
diff --git a/messages/messages-ast.properties b/messages/messages-ast.properties
index b80d3b1..125feb2 100644
--- a/messages/messages-ast.properties
+++ b/messages/messages-ast.properties
@@ -106,3 +106,4 @@
confirm-button-not-now=Agora non
migrating-saved-pages-confirm-title=¿Anovar?
migrating-saved-pages-confirm-cancel=Les páxines guardaes anteriormente tarán
desactivaes fasta que s'anueven. Volverá a intentase l'anovamientu la próxima
vez que s'anicie l'aplicación.
+zero-search-hint=Guetar en Wikipedia Zero
diff --git a/messages/messages-br.properties b/messages/messages-br.properties
index f3d10dc..af1b81a 100644
--- a/messages/messages-br.properties
+++ b/messages/messages-br.properties
@@ -106,3 +106,4 @@
confirm-button-not-now=Ket diouzhtu
migrating-saved-pages-confirm-title=Hizivaat ?
migrating-saved-pages-confirm-cancel=Diweredekaet e vo ar pajennoù enrollet
betek-henn betek ma vint hizivaet. Klasket e vo hizivaat adarre kentañ tro ma
loc'ho an arload.
+zero-search-hint=Klask e Wikipedia Zero
diff --git a/messages/messages-ca.properties b/messages/messages-ca.properties
index 3b42ab5..cc57afb 100644
--- a/messages/messages-ca.properties
+++ b/messages/messages-ca.properties
@@ -107,3 +107,4 @@
confirm-button-not-now=Ara no
migrating-saved-pages-confirm-title=S'actualitza?
migrating-saved-pages-confirm-cancel=S'inhabilitaran les pàgines desades
anteriorment fins que les actualitzeu. Es tornarà a provar d'actualitzar-les la
propera vegada que l'aplicació s'iniciï.
+zero-search-hint=Cerca a Viquipèdia Zero
diff --git a/messages/messages-cs.properties b/messages/messages-cs.properties
index 33947d4..01d3331 100644
--- a/messages/messages-cs.properties
+++ b/messages/messages-cs.properties
@@ -109,3 +109,4 @@
confirm-button-not-now=Teď ne
migrating-saved-pages-confirm-title=Aktualizovat?
migrating-saved-pages-confirm-cancel=Dříve uložené stránky budou nedostupné,
dokud nebudou aktualizovány. O aktualizaci se znovu pokusíme při příštím startu
aplikace.
+zero-search-hint=Hledání ve Wikipedia Zero
\ No newline at end of file
diff --git a/messages/messages-cy.properties b/messages/messages-cy.properties
index 35c806e..99c962b 100644
--- a/messages/messages-cy.properties
+++ b/messages/messages-cy.properties
@@ -81,3 +81,4 @@
do-fulltext-search=Dangoser mwy o ganlyniadau...
share-open-browser=Agor yn y porwr
page-contributors=Ysgrifennwyd yr erthygl gan <a
id='show-page-history'>gyfranwyr</a> fel chi
+zero-search-hint=Chwiliwch yn Wicipedia Sero
diff --git a/messages/messages-de.properties b/messages/messages-de.properties
index 2d09fd2..f742cc4 100644
--- a/messages/messages-de.properties
+++ b/messages/messages-de.properties
@@ -110,3 +110,4 @@
confirm-button-not-now=Jetzt nicht
migrating-saved-pages-confirm-title=Aktualisieren?
migrating-saved-pages-confirm-cancel=Früher gespeicherte Seiten werden bis zu
dem Zeitpunkt deaktiviert, an dem sie aktualisiert wurden. Beim nächsten Start
der App wird die Aktualisierung erneut versucht werden.
+zero-search-hint=Wikipedia Zero durchsuchen
diff --git a/messages/messages-en.properties b/messages/messages-en.properties
index b16edcb..fa56570 100755
--- a/messages/messages-en.properties
+++ b/messages/messages-en.properties
@@ -109,3 +109,4 @@
migrating-saved-pages-confirm-cancel = Previously saved pages will be disabled
until you update. Will retry updating next time the app starts.
exit-wikipedia-dialog-title = Exit Wikipedia
exit-wikipedia-dialog-msg = Do you want to exit?
+zero-search-hint=Search Wikipedia Zero
diff --git a/messages/messages-es.properties b/messages/messages-es.properties
index 09dff08..487b3ef 100644
--- a/messages/messages-es.properties
+++ b/messages/messages-es.properties
@@ -109,3 +109,4 @@
confirm-button-not-now=Ahora no
migrating-saved-pages-confirm-title=¿Actualizar?
migrating-saved-pages-confirm-cancel=Las páginas guardadas anteriormente
estarán desactivadas hasta la actualización. La actualización se va a realizar
la próxima vez que se inicie la aplicación.
+zero-search-hint=Buscar en Wikipedia Zero
diff --git a/messages/messages-fa.properties b/messages/messages-fa.properties
index b99d4f5..d4f546c 100644
--- a/messages/messages-fa.properties
+++ b/messages/messages-fa.properties
@@ -68,3 +68,4 @@
search-button=جستجوی ویکیپدیا برای این عبارت
search-placeholder=جستجو
do-fulltext-search=نمایش نتایج بیشتر...
+zero-search-hint=جستجو در ویکی پدیا صفر
diff --git a/messages/messages-fr.properties b/messages/messages-fr.properties
index 3abec48..705b67b 100644
--- a/messages/messages-fr.properties
+++ b/messages/messages-fr.properties
@@ -112,3 +112,4 @@
confirm-button-not-now=Pas maintenant
migrating-saved-pages-confirm-title=Mettre à jour ?
migrating-saved-pages-confirm-cancel=Les pages déjà enregistrées seront
désactivées jusqu'à ce que vous mettez à niveau. La mise à jour sera retentée
la prochaine fois que l'application démarre.
+zero-search-hint=Rechercher dans Wikipédia Zéro
diff --git a/messages/messages-he.properties b/messages/messages-he.properties
index 5d79fdb..97dd6fd 100644
--- a/messages/messages-he.properties
+++ b/messages/messages-he.properties
@@ -108,3 +108,4 @@
confirm-button-not-now=לא עכשיו
migrating-saved-pages-confirm-title=לעדכן?
migrating-saved-pages-confirm-cancel=דפים שנשמרו בעבר לא יהיהו זמינים עד
העדכון. ייעשה ניסיון לעדכן בפעם הבאה שהיישום מופעל.
+zero-search-hint=חיפוש בוויקיפדיה אפס
diff --git a/messages/messages-hsb.properties b/messages/messages-hsb.properties
index d337653..d670cd4 100644
--- a/messages/messages-hsb.properties
+++ b/messages/messages-hsb.properties
@@ -106,3 +106,4 @@
confirm-button-not-now=Nic nětko
migrating-saved-pages-confirm-title=Aktualizować?
migrating-saved-pages-confirm-cancel=Prjedy składowane strony budu so hač k
aktualizaciji znjemóžnjeć. Aktualizacija so znowa spyta, hdyž aplikacija
přichodny raz startuje.
+zero-search-hint=Wikipediju Zero přepytać
diff --git a/messages/messages-lb.properties b/messages/messages-lb.properties
index 6a04ad6..82d625f 100644
--- a/messages/messages-lb.properties
+++ b/messages/messages-lb.properties
@@ -100,3 +100,4 @@
confirm-button-yes=Jo
confirm-button-not-now=Net elo
migrating-saved-pages-confirm-title=Aktualiséieren?
+zero-search-hint=Op Wikipedia Zero sichen
diff --git a/messages/messages-mk.properties b/messages/messages-mk.properties
index 5e5c725..482afb1 100644
--- a/messages/messages-mk.properties
+++ b/messages/messages-mk.properties
@@ -107,3 +107,4 @@
confirm-button-not-now=Не сега
migrating-saved-pages-confirm-title=Да подновам?
migrating-saved-pages-confirm-cancel=Претходно зачуваните страници ќе бидат
оневозможени додека не го извршите надградувањето. Ќе се обидам повторно со
надградувањето при следното отворање на прилогот.
+zero-search-hint=Пребарај ја Википедија Нулта
diff --git a/messages/messages-nl.properties b/messages/messages-nl.properties
index a38638a..1a3bc79 100644
--- a/messages/messages-nl.properties
+++ b/messages/messages-nl.properties
@@ -110,3 +110,4 @@
confirm-button-not-now=Nu niet
migrating-saved-pages-confirm-title=Bijwerken?
migrating-saved-pages-confirm-cancel=Eerder opgeslagen pagina's zijn niet
beschikbaar totdat u deze bijwerkt. Als de toepassing de volgende keer wordt
gestart, wordt opnieuw een poging gedaan.
+zero-search-hint=In Wikipedia Zero zoeken
diff --git a/messages/messages-ro.properties b/messages/messages-ro.properties
index fa4caec..b2a0328 100644
--- a/messages/messages-ro.properties
+++ b/messages/messages-ro.properties
@@ -106,3 +106,4 @@
confirm-button-not-now=Nu acum
migrating-saved-pages-confirm-title=Actualizați?
migrating-saved-pages-confirm-cancel=Paginile salvate anterior nu vor fi
disponibile până când nu le reînnoiți. Se va reîncerca actualizarea lor la
următoarea pornire a aplicației.
+zero-search-hint=Căutare în Wikipedia Zero
diff --git a/messages/messages-ru.properties b/messages/messages-ru.properties
index 6b0729e..fa4e0c2 100644
--- a/messages/messages-ru.properties
+++ b/messages/messages-ru.properties
@@ -101,3 +101,4 @@
win8-tile-featured-article=Избранные статьи
confirm-button-yes=Да
confirm-button-not-now=Не сейчас
+zero-search-hint=Поиск по Wikipedia Zero
diff --git a/messages/messages-sv.properties b/messages/messages-sv.properties
index c31c280..14c1c32 100644
--- a/messages/messages-sv.properties
+++ b/messages/messages-sv.properties
@@ -109,3 +109,4 @@
confirm-button-not-now=Inte nu
migrating-saved-pages-confirm-title=Uppdatera?
migrating-saved-pages-confirm-cancel=Tidigare sparade sidor kommer att vara
inaktiverade tills du uppdaterar. Försöker uppdatera nästa gång appen startas.
+zero-search-hint=Sök på Wikipedia Zero
diff --git a/messages/messages-uk.properties b/messages/messages-uk.properties
index 0fbd60e..2716039 100644
--- a/messages/messages-uk.properties
+++ b/messages/messages-uk.properties
@@ -106,3 +106,4 @@
confirm-button-yes=Так
confirm-button-not-now=Не зараз
migrating-saved-pages-confirm-title=Оновити?
+zero-search-hint=Пошук по Вікіпедії Zero
diff --git a/messages/messages-vi.properties b/messages/messages-vi.properties
index a2ade73..a2fdb67 100644
--- a/messages/messages-vi.properties
+++ b/messages/messages-vi.properties
@@ -107,3 +107,4 @@
confirm-button-not-now=Chưa
migrating-saved-pages-confirm-title=Cập nhật?
migrating-saved-pages-confirm-cancel=Các trang đã lưu trước đây sẽ vô hiệu cho
đến khi được nâng cấp. Chương trình sẽ thử nâng cấp lại lần khởi động sau.
+zero-search-hint=Tìm trong Wikipedia Miễn phí
--
To view, visit https://gerrit.wikimedia.org/r/120975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60c7c408a0e01b81e9d0fe2108de0138804e7b74
Gerrit-PatchSet: 3
Gerrit-Project: apps/firefox/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
