From b31038dc086923ec393ad6be4a115c3a92da664c Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 24 Jan 2012 17:43:16 -0800 Subject: [PATCH 1/8] Use WM list of share services --- .../Plugins/ShareKitConfiguration/WMSHKConfigurator.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m b/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m index 7901a593..caa5569a 100644 --- a/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m +++ b/Wikipedia-iOS/Plugins/ShareKitConfiguration/WMSHKConfigurator.m @@ -74,5 +74,11 @@ - (NSString*)twitterUsername { return @""; } +// Name of the plist file that defines the class names of the sharers to use. Usually should not be changed, but +// this allows you to subclass a sharer and have the subclass be used. +- (NSString*)sharersPlistName { + return @"WMSHKSharers.plist"; +} + @end From 20bb9d49e24036066f034edad7184eb8aaf1f910 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Thu, 26 Jan 2012 11:27:32 -0800 Subject: [PATCH 2/8] Fix typo in placeholder param --- assets/www/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/www/index.html b/assets/www/index.html index 2152012c..f6dab604 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -164,7 +164,7 @@
- +
From 4d91af5b91b4c7cad639ead541d4efe33fcc1ab5 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Thu, 26 Jan 2012 11:28:46 -0800 Subject: [PATCH 3/8] Turn the Home button into an actual button and add a title for it as well. Accessibility !!!! --- assets/www/index.html | 2 +- assets/www/messages/messages-en.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/www/index.html b/assets/www/index.html index f6dab604..1ae5e05a 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -162,7 +162,7 @@
-
+
diff --git a/assets/www/messages/messages-en.properties b/assets/www/messages/messages-en.properties index 78cf25c8..fd49ad58 100644 --- a/assets/www/messages/messages-en.properties +++ b/assets/www/messages/messages-en.properties @@ -10,6 +10,7 @@ clear-all-history-prompt = Clear history? clear-all-saved-pages-prompt = Clear all saved pages? saved-page-removed = $1 has been removed. saved-pages-title = Saved pages +menu-home = Wikipedia homepage menu-language = Read in… menu-savePage = Save page menu-savedPages = Saved pages From 9edc3b9f79ddf53c916310c0f073171e0ed6952a Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Thu, 26 Jan 2012 12:05:09 -0800 Subject: [PATCH 4/8] Convert most button divs into actual buttons with translatable titles. --- assets/www/index.html | 12 ++++++------ assets/www/messages/messages-en.properties | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/assets/www/index.html b/assets/www/index.html index 1ae5e05a..d2627c48 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -177,7 +177,7 @@
About
-
+
@@ -195,7 +195,7 @@
Saved Pages
-
+
@@ -208,7 +208,7 @@
History
-
+
@@ -227,7 +227,7 @@
Settings
-
+
@@ -239,7 +239,7 @@
Read article in...
-
+
@@ -255,7 +255,7 @@
Nearby
-
+
diff --git a/assets/www/messages/messages-en.properties b/assets/www/messages/messages-en.properties index fd49ad58..ba81c057 100644 --- a/assets/www/messages/messages-en.properties +++ b/assets/www/messages/messages-en.properties @@ -2,6 +2,7 @@ sitename = Wikipedia spinner-loading = Loading… spinner-retrieving = Retrieving content from $1… +saved-pages-close = Close saved pages screen saved-pages-max-warning = You have reached the maximum number of saved pages. page-saved = $1 saved. page-already-saved = $1 already saved. @@ -25,6 +26,7 @@ menu-about = About menu-cancel = Cancel menu-output = Output menu-sources = Sources +settings-close = Close settings screen settings-title = Settings settings-app-version-label = Application version: settings-android-version-label = Android version: @@ -36,6 +38,7 @@ settings-font-size-desc = Set page font size settings-font-size-smaller = Small settings-font-size-normal = Normal settings-font-size-larger = Large +langlinks-close = Close read in other languages screen langlinks-title = Read page in… error-not-available = Sorry, this page is not available. error-offline = You are offline and the page has not been previously saved. @@ -45,11 +48,14 @@ error-not-found = Sorry, no page by that name exists. error-not-found-reason = You might have mis-spelt the title, or the page has not been created. error-search-again = Please search for another term. about-page-label = About Us +history-close = Close history screen history-title = History +about-close = Close about screen about-page-title = About about-version = Version about-copyright = This application is copyright (C) Wikimedia Foundation and contributing developers about-license = This application is free software under the GNU General Public License. You are welcome to distribute and modify it under certain conditions. See http://www.gnu.org/licenses/old-licenses/gpl-2.0.html for details. The source code is available at https://github.com/Wikimedia/WikipediaMobile +nearby-close = Close nearby pages screen nearby-title = Nearby pages app-description = Official Wikipedia App for Android. Wikipedia is the free encyclopedia containing more than 20 million articles in 280 languages, and is the most comprehensive and widely used reference work humans have ever compiled.\n\nFeatures: Save article to read later or offline, Search articles nearby, Share articles using Android "Share" function, Read article in a different language, Full screen search search-results-did-you-mean-label = Did you mean: From 2b4e0505e1286e9df91510f14155d10d6e2bbbe4 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Thu, 26 Jan 2012 12:07:01 -0800 Subject: [PATCH 5/8] Bind labels to the select elements --- assets/www/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/www/index.html b/assets/www/index.html index d2627c48..896cd9cc 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -51,7 +51,7 @@