Mhurd has submitted this change and it was merged.
Change subject: Fix 'Today' link
......................................................................
Fix 'Today' link
was using obsolete now-unused property; switch to fetching the main page
on demand from the current language
Change-Id: Ifae364417d67aa0846e827ca698f0cb76abc9a1a
---
M wikipedia/Session/SessionSingleton.h
M wikipedia/View Controllers/Navigation/Center/CenterNavController.m
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Mhurd: Verified; Looks good to me, approved
diff --git a/wikipedia/Session/SessionSingleton.h
b/wikipedia/Session/SessionSingleton.h
index 93401b2..f2f6d72 100644
--- a/wikipedia/Session/SessionSingleton.h
+++ b/wikipedia/Session/SessionSingleton.h
@@ -18,7 +18,7 @@
//@property (strong, nonatomic) NSString *site;
//@property (strong, nonatomic) NSString *domain;
// Note: "domainMainArticleTitle" is readonly because it gets set whenever
"domain" changes.
-@property (strong, nonatomic, readonly) NSString *domainMainArticleTitle;
+//@property (strong, nonatomic, readonly) NSString *domainMainArticleTitle;
//@property (strong, nonatomic) NSString *domainName;
//@property (strong, nonatomic) NSString *currentArticleTitle;
//@property (strong, nonatomic) NSString *currentArticleDomain;
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
index 81420ef..fbd1379 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
@@ -151,7 +151,7 @@
-(void)loadTodaysArticle
{
- NSString *mainArticleTitle = [SessionSingleton
sharedInstance].domainMainArticleTitle;
+ NSString *mainArticleTitle = [WikipediaAppUtils
mainArticleTitleForCode:[SessionSingleton sharedInstance].site.language];
if (mainArticleTitle) {
MWKTitle *pageTitle = [[SessionSingleton sharedInstance].site
titleWithString:mainArticleTitle];
// Invalidate cache so present day main page article is always
retrieved.
@@ -221,7 +221,7 @@
-(void)switchPreferredLanguageToId:(NSString *)languageId name:(NSString *)name
{
- NSString *mainArticleTitle = [SessionSingleton
sharedInstance].domainMainArticleTitle;
+ NSString *mainArticleTitle = [WikipediaAppUtils
mainArticleTitleForCode:[SessionSingleton sharedInstance].site.language];
if (mainArticleTitle) {
MWKSite *site = [[MWKSite alloc] initWithDomain:@"wikipedia.org"
language:languageId];
MWKTitle *pageTitle = [site titleWithString:mainArticleTitle];
--
To view, visit https://gerrit.wikimedia.org/r/178568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifae364417d67aa0846e827ca698f0cb76abc9a1a
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
