Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146338
Change subject: Tweak 'last modified' text
......................................................................
Tweak 'last modified' text
* unbreak into a single line (better for i18n also)
Change-Id: I4debd797903051c671bdad57783e25f42e6e5e89
---
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
3 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/38/146338/1
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index ceb70f1..112a0c4 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1648,20 +1648,22 @@
NSString *ts = [WikipediaAppUtils relativeTimestamp:date];
NSString *recent = (fabs([date timeIntervalSinceNow]) < 60*60*24) ?
@"recent" : @"";
- NSString *lm = [MWLocalizedString(@"lastmodified-timestamp", nil)
stringByReplacingOccurrencesOfString:@"$1" withString:ts];
- NSString *by;
+ NSString *lm;
if (username && ![username isEqualToString:@""]) {
- by = [MWLocalizedString(@"lastmodified-by", nil)
stringByReplacingOccurrencesOfString:@"$1" withString:username];
+ lm = [[MWLocalizedString(@"lastmodified-by-user", nil)
+ stringByReplacingOccurrencesOfString:@"$1" withString:ts]
+ stringByReplacingOccurrencesOfString:@"$2"
withString:username];
} else {
- by = MWLocalizedString(@"lastmodified-anon", nil);
+ lm = [MWLocalizedString(@"lastmodified-by-anon", nil)
+ stringByReplacingOccurrencesOfString:@"$1" withString:ts];
}
return [NSString stringWithFormat:@"<button dir=\"%@\"
class=\"mw-last-modified mw-footer-button %@\">"
@"<div>"
@"<span><span class=\"mw-footer-icon\">%@</span></span>"
- @"<span>%@<br>%@</span>"
+ @"<span>%@</span>"
@"</div>"
- @"</button>", dir, recent, icon, lm, by];
+ @"</button>", dir, recent, icon, lm];
}
-(NSString *)renderLicenseFooter
diff --git a/wikipedia/en.lproj/Localizable.strings
b/wikipedia/en.lproj/Localizable.strings
index 9381223..a083757 100644
--- a/wikipedia/en.lproj/Localizable.strings
+++ b/wikipedia/en.lproj/Localizable.strings
@@ -154,9 +154,8 @@
"timestamp-months" = "%d months ago";
"timestamp-years" = "%d years ago";
-"lastmodified-timestamp" = "Last Modified $1";
-"lastmodified-by" = "by $1";
-"lastmodified-anon" = "by an anonymous user";
+"lastmodified-by-user" = "Modified $1 by $2";
+"lastmodified-by-anon" = "Modified $1 by an anonymous user";
"button-next" = "Next";
"button-done" = "Done";
diff --git a/wikipedia/qqq.lproj/Localizable.strings
b/wikipedia/qqq.lproj/Localizable.strings
index 49e922e..7d717e7 100644
--- a/wikipedia/qqq.lproj/Localizable.strings
+++ b/wikipedia/qqq.lproj/Localizable.strings
@@ -128,9 +128,8 @@
"timestamp-days" = "Human-readable approximate timestamp for events in the
last couple months, expressed as days";
"timestamp-months" = "Human-readable approximate timestamp for events in the
last couple years, expressed as months";
"timestamp-years" = "Human-readable approximate timestamp for events in the
distant past, expressed as years";
-"lastmodified-timestamp" = "Marker at page end for last modified time. $1 is
placeholder for a human-readable approximate timestamp";
-"lastmodified-by" = "Marker at page end for who last modified the page. $1 is
a username.";
-"lastmodified-anon" = "Marker at page end for who last modified the page when
anonymous.";
+"lastmodified-by-user" = "Marker at page end for who last modified the page.
$1 is a relative date such as '2 months ago' or 'today', $2 is a username.";
+"lastmodified-by-anon" = "Marker at page end for who last modified the page
when anonymous. $1 is a relative date such as '2 months ago' or 'today'.";
"button-next" = "Button text for next button used in various
places.\n{{Identical|Next}}";
"button-done" = "Button text for done button used in various
places.\n{{Identical|Done}}";
"button-save" = "Button text for save button used in various
places.\n{{Identical|Save}}";
--
To view, visit https://gerrit.wikimedia.org/r/146338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4debd797903051c671bdad57783e25f42e6e5e89
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
