Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190124
Change subject: Fix for RTL lang bracket problem in About page license links.
......................................................................
Fix for RTL lang bracket problem in About page license links.
Fix for "licence" typo.
Change-Id: I019e25eebbb10b5dc123a994ca88cb281fe02e15
---
M wikipedia/View Controllers/About/AboutViewController.m
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/24/190124/1
diff --git a/wikipedia/View Controllers/About/AboutViewController.m
b/wikipedia/View Controllers/About/AboutViewController.m
index 7855c81..63ff47d 100644
--- a/wikipedia/View Controllers/About/AboutViewController.m
+++ b/wikipedia/View Controllers/About/AboutViewController.m
@@ -30,7 +30,7 @@
static NSString* const kWMFLibrariesKey = @"libraries";
static NSString* const kWMFLibraryNameKey = @"Name";
static NSString* const kWMFLibraryURLKey = @"Source URL";
-static NSString* const kWMFLibraryLicenseTextKey = @"Licence Text";
+static NSString* const kWMFLibraryLicenseTextKey = @"License Text";
static NSString* const kWMFLicenseScheme = @"wmflicense";
static NSString* const kWMFLicenseRedirectScheme = @"about";
@@ -182,7 +182,8 @@
NSString* licenseLink = [[self class]
linkHTMLForURLString:licenseURLPath
title:MWLocalizedString(@"about-libraries-license", nil)];
- return [sourceLink stringByAppendingFormat:@" (%@)", licenseLink];
+ // Note: "‎" solves RTL lang "bi-directional bracket problem".
See http://stackoverflow.com/a/7931735
+ return [sourceLink stringByAppendingFormat:@" (%@)‎",
licenseLink];
}];
return [libraries componentsJoinedByString:@", "];
@@ -215,12 +216,12 @@
#pragma mark - License Search
-- (NSString*)licenceTextForLicenseURL:(NSURL*)licenseURL{
+- (NSString*)licenseTextForLicenseURL:(NSURL*)licenseURL{
- return [self licenceTextForLibraryName:[licenseURL host]];
+ return [self licenseTextForLibraryName:[licenseURL host]];
}
-- (NSString*)licenceTextForLibraryName:(NSString*)libraryName{
+- (NSString*)licenseTextForLibraryName:(NSString*)libraryName{
NSString* license = [self.podLibraryLicenses bk_match:^BOOL(NSString* key,
NSString* license) {
@@ -334,7 +335,7 @@
if([[self class] isLicenseURL:requestURL]){
- NSString* licenseText = [self licenceTextForLicenseURL:requestURL];
+ NSString* licenseText = [self licenseTextForLicenseURL:requestURL];
[self.webView loadHTMLString:licenseText baseURL:nil];
return NO;
--
To view, visit https://gerrit.wikimedia.org/r/190124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I019e25eebbb10b5dc123a994ca88cb281fe02e15
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
