[MediaWiki-commits] [Gerrit] Revert Honor system font size setting in WebView - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138373
Change subject: Revert Honor system font size setting in WebView
..
Revert Honor system font size setting in WebView
Feature appears to be broken; huge fonts on xxhdpi devices. Needs to get the
'dp' size of an 'sp' or something, rather than the raw pixel size?
This reverts commit ad4d74ce79dbfe29eb32b2205c71d5d256c2287c.
Change-Id: I0a3a143681884a3ec3639486ac58c26e81d15315
---
M wikipedia/res/values/dimens.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
2 files changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/73/138373/1
diff --git a/wikipedia/res/values/dimens.xml b/wikipedia/res/values/dimens.xml
index 7bce777..a6dd140 100644
--- a/wikipedia/res/values/dimens.xml
+++ b/wikipedia/res/values/dimens.xml
@@ -4,7 +4,4 @@
dimen name=activity_horizontal_margin16dp/dimen
dimen name=activity_vertical_margin16dp/dimen
-!-- Default font size for WebView text based on system settings --
-dimen name=textSize8sp/dimen
-
/resources
\ No newline at end of file
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 2bed615..a3df5a3 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -1,7 +1,6 @@
package org.wikipedia.page;
import android.content.Intent;
-import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -271,10 +270,6 @@
// disable TOC drawer until the page is loaded
tocDrawer.setSlidingEnabled(false);
searchArticlesFragment.setTocEnabled(false);
-
-// Adjust font size based on system settings
-float fontSize = getResources().getDimension(R.dimen.textSize);
-webView.getSettings().setDefaultFontSize((int) fontSize);
if (Build.VERSION.SDK_INT = Build.VERSION_CODES.HONEYCOMB) {
// Enable Pinch-Zoom
--
To view, visit https://gerrit.wikimedia.org/r/138373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a3a143681884a3ec3639486ac58c26e81d15315
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/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
[MediaWiki-commits] [Gerrit] Fix for edit pencil not working if user not logged in. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Fix for edit pencil not working if user not logged in.
..
Fix for edit pencil not working if user not logged in.
Change-Id: I8dae0e3212905e21134787ef6fad094cf0d8c764
---
M wikipedia/EventLogging/EditFunnel.m
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/EventLogging/EditFunnel.m
b/wikipedia/EventLogging/EditFunnel.m
index c13125e..bdf428b 100644
--- a/wikipedia/EventLogging/EditFunnel.m
+++ b/wikipedia/EventLogging/EditFunnel.m
@@ -26,7 +26,8 @@
{
NSMutableDictionary *dict = [eventData mutableCopy];
dict[@editSessionToken] = self.editSessionToken;
-dict[@userName] = [SessionSingleton
sharedInstance].keychainCredentials.userName;
+NSString *userName = [SessionSingleton
sharedInstance].keychainCredentials.userName;
+dict[@userName] = userName ? userName : @;
//dict[@pageNS] = @0; // @todo allow other types or ...? // Android
doesn't send this?
return [NSDictionary dictionaryWithDictionary: dict];
}
--
To view, visit https://gerrit.wikimedia.org/r/139024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8dae0e3212905e21134787ef6fad094cf0d8c764
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Getting Wikipedia and The Free Encyclopedia into qqq. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Getting Wikipedia and The Free Encyclopedia into qqq.
..
Getting Wikipedia and The Free Encyclopedia into qqq.
Change-Id: I40ad568948c1a8598a441153719502eb9089036b
---
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
diff --git a/wikipedia/en.lproj/Localizable.strings
b/wikipedia/en.lproj/Localizable.strings
index e6d4f44..c16a57e 100644
--- a/wikipedia/en.lproj/Localizable.strings
+++ b/wikipedia/en.lproj/Localizable.strings
@@ -166,6 +166,8 @@
onboarding-login = Log in;
onboarding-already-have-account = Already have an account? $1;
onboarding-skip = Skip;
+onboarding-wikipedia = Wikipedia;
+onboarding-free-encyclopedia = The Free Encyclopedia;
preference_title_eventlogging_opt_in = Send usage reports;
preference_summary_eventlogging_opt_in = Allow Wikimedia to collect
information about how you use the app to make the app better;
diff --git a/wikipedia/qqq.lproj/Localizable.strings
b/wikipedia/qqq.lproj/Localizable.strings
index 3f85940..b9f2a8f 100644
--- a/wikipedia/qqq.lproj/Localizable.strings
+++ b/wikipedia/qqq.lproj/Localizable.strings
@@ -153,6 +153,8 @@
onboarding-login = {{Identical|Log in}};
onboarding-already-have-account = Button text prompting first time users to
log in to existing account. Parameters:\n* $1 - login button text;
onboarding-skip = Button text allowing first time users to skip the other
onboarding choices;
+onboarding-wikipedia = Wikipedia logo text;
+onboarding-free-encyclopedia = Subtext for the Wikipedia logo;
preference_title_eventlogging_opt_in = Title of preference that when
checked enables data collection of user behavior.;
preference_summary_eventlogging_opt_in = Description of preference that
when checked enables data collection of user behavior.;
page_protected_autoconfirmed = Brief description of Wikipedia
'autoconfirmed' protection level, shown when editing a page that is protected.;
--
To view, visit https://gerrit.wikimedia.org/r/149349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40ad568948c1a8598a441153719502eb9089036b
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid disabling deselection of text with a tap - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150286
Change subject: Avoid disabling deselection of text with a tap
..
Avoid disabling deselection of text with a tap
We were running event.preventDefault() on touchend when tapping
on non-links. This had the side effect of breaking the automatic
handling of deselection of selected text when tapping.
Doesn't seem to be a need to prevent default behavior here, so
took it out.
Bug: 68681
Change-Id: I3579c045d2021ad30f67c04c9ec0c7f76b1a79fc
---
M wikipedia/assets/bundle.js
M www/js/listeners.js
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/86/150286/1
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index f0f7d23..bae0d4f 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -270,7 +270,8 @@
} else {
var anchorTarget = findParent(event.target, 'A');
if ( anchorTarget (anchorTarget.tagName != A) ) {
-event.preventDefault();
+// Do NOT prevent default behavior -- this is needed to for
instance
+// handle deselection of text.
bridge.sendMessage( 'nonAnchorTouchEndedWithoutDragging', {
id: event.target.getAttribute( id ), tagName: event.target.tagName});
}
}
diff --git a/www/js/listeners.js b/www/js/listeners.js
index a2fef82..9c31409 100644
--- a/www/js/listeners.js
+++ b/www/js/listeners.js
@@ -174,7 +174,8 @@
} else {
var anchorTarget = findParent(event.target, 'A');
if ( anchorTarget (anchorTarget.tagName != A) ) {
-event.preventDefault();
+// Do NOT prevent default behavior -- this is needed to for
instance
+// handle deselection of text.
bridge.sendMessage( 'nonAnchorTouchEndedWithoutDragging', {
id: event.target.getAttribute( id ), tagName: event.target.tagName});
}
}
--
To view, visit https://gerrit.wikimedia.org/r/150286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3579c045d2021ad30f67c04c9ec0c7f76b1a79fc
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
[MediaWiki-commits] [Gerrit] Fix RTL edit pencil for iOS - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150639
Change subject: Fix RTL edit pencil for iOS
..
Fix RTL edit pencil for iOS
Needed to use consistent style classes with Android app.
Bug: 67611
Change-Id: I25e643d59011bb03b99da9e44f19556d618d0032
---
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/bundle.js
M wikipedia/assets/index.html
M www/index.html
M www/js/listeners.js
5 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/39/150639/1
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 1ab10f4..c9c6467 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1604,6 +1604,7 @@
[SessionSingleton sharedInstance].currentArticleTitle = article.title;
[SessionSingleton sharedInstance].currentArticleDomain = article.domain;
MWLanguageInfo *languageInfo = [MWLanguageInfo
languageInfoForCode:article.domain];
+NSString *uidir = ([WikipediaAppUtils isDeviceLanguageRTL] ? @rtl :
@ltr);
NSNumber *langCount = article.languagecount;
NSDate *lastModified = article.lastmodified;
@@ -1670,7 +1671,8 @@
[self.bridge sendMessage: @setLanguage
withPayload: @{
@lang: languageInfo.code,
- @dir: languageInfo.dir
+ @dir: languageInfo.dir,
+ @uidir: uidir
}];
[self.bridge sendMessage:@append withPayload:@{@html: htmlStr}];
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index f0f7d23..06207d6 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -101,9 +101,11 @@
//TODO: move makeTablesNotBlockIfSafeToDoSo, hideAudioTags and
reduceWeirdWebkitMargin out into own js object.
bridge.registerListener( setLanguage, function( payload ){
-var body = document.querySelector( body );
-body.lang = payload.lang;
-body.dir = payload.dir;
+var html = document.querySelector( html );
+html.lang = payload.lang;
+html.dir = payload.dir;
+html.classList.add( 'content-' + payload.dir );
+html.classList.add( 'ui-' + payload.uidir );
document.querySelector('base').href = 'https://' + payload.lang +
'.wikipedia.org/';
} );
diff --git a/wikipedia/assets/index.html b/wikipedia/assets/index.html
index a207b8b..fa2661b 100644
--- a/wikipedia/assets/index.html
+++ b/wikipedia/assets/index.html
@@ -1,4 +1,4 @@
-html class=content-ltr ui-ltr dir=ltr
+html
head
script src=bundle.js/script
diff --git a/www/index.html b/www/index.html
index a207b8b..fa2661b 100644
--- a/www/index.html
+++ b/www/index.html
@@ -1,4 +1,4 @@
-html class=content-ltr ui-ltr dir=ltr
+html
head
script src=bundle.js/script
diff --git a/www/js/listeners.js b/www/js/listeners.js
index a2fef82..8373884 100644
--- a/www/js/listeners.js
+++ b/www/js/listeners.js
@@ -5,9 +5,11 @@
//TODO: move makeTablesNotBlockIfSafeToDoSo, hideAudioTags and
reduceWeirdWebkitMargin out into own js object.
bridge.registerListener( setLanguage, function( payload ){
-var body = document.querySelector( body );
-body.lang = payload.lang;
-body.dir = payload.dir;
+var html = document.querySelector( html );
+html.lang = payload.lang;
+html.dir = payload.dir;
+html.classList.add( 'content-' + payload.dir );
+html.classList.add( 'ui-' + payload.uidir );
document.querySelector('base').href = 'https://' + payload.lang +
'.wikipedia.org/';
} );
--
To view, visit https://gerrit.wikimedia.org/r/150639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25e643d59011bb03b99da9e44f19556d618d0032
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
[MediaWiki-commits] [Gerrit] Fix content direction on edit preview - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150640
Change subject: Fix content direction on edit preview
..
Fix content direction on edit preview
Change-Id: Ib4bc147bceb32d2458094784ee1871eff2e4fbc1
---
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/40/150640/1
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index 70078aa..204d14b 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -32,6 +32,7 @@
#import LoginViewController.h
#import UIScrollView+ScrollSubviewToLocation.h
#import AbuseFilterAlert.h
+#import MWLanguageInfo.h
typedef enum {
CANNED_SUMMARY_TYPOS = 0,
@@ -439,6 +440,9 @@
[self showAlert:MWLocalizedString(@wikitext-preview-changes, nil)];
Section *section = (Section *)[articleDataContext_.mainContext
objectWithID:self.sectionID];
+MWLanguageInfo *languageInfo = [MWLanguageInfo
languageInfoForCode:section.article.domain];
+NSString *uidir = ([WikipediaAppUtils isDeviceLanguageRTL] ? @rtl :
@ltr);
+
PreviewWikiTextOp *previewWikiTextOp =
[[PreviewWikiTextOp alloc] initWithDomain: section.article.domain
title: section.article.title
@@ -450,7 +454,14 @@
[self fadeAlert];
[self resetBridge];
-
+
+[self.bridge sendMessage: @setLanguage
+ withPayload: @{
+@lang: languageInfo.code,
+@dir: languageInfo.dir,
+@uidir: uidir
+}];
+
[self.bridge sendMessage:@append withPayload:@{@html: result ?
result : @}];
isAleadyPreviewing = NO;
--
To view, visit https://gerrit.wikimedia.org/r/150640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4bc147bceb32d2458094784ee1871eff2e4fbc1
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
[MediaWiki-commits] [Gerrit] Save scroll position across rotation better - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150740
Change subject: Save scroll position across rotation better
..
Save scroll position across rotation better
When rotating, we now check for the element that's at the top of the
screen, estimate how far into it we were (by percentage of height),
and return us to the recalculated position after rotating.
Bug: 68683
Change-Id: Ibdd0f59bde682da46040fa3b0a5b8daab4822721
---
M wikipedia/View Controllers/WebView/WebViewController.m
1 file changed, 39 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/40/150740/1
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 1ab10f4..bd48251 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -72,7 +72,7 @@
@property (nonatomic) BOOL unsafeToScroll;
-@property (nonatomic) NSInteger indexOfFirstOnscreenSectionBeforeRotate;
+@property (nonatomic) float relativeScrollOffsetBeforeRotate;
@property (nonatomic) NSUInteger sectionToEditId;
@property (strong, nonatomic) NSDictionary *adjacentHistoryIDs;
@@ -142,8 +142,6 @@
self.zeroStatusLabel.text = @;
self.sectionToEditId = 0;
-
-self.indexOfFirstOnscreenSectionBeforeRotate = -1;
[[NSNotificationCenter defaultCenter] addObserver: self
selector:
@selector(webViewFinishedLoading)
@@ -710,6 +708,15 @@
point.y += 2;
+[self tocScrollWebViewToPoint:point
+ duration:duration
+ thenHideTOC:hideTOC];
+}
+
+-(void)tocScrollWebViewToPoint: (CGPoint)point
+ duration: (CGFloat)duration
+ thenHideTOC: (BOOL)hideTOC
+{
[UIView animateWithDuration: duration
delay: 0.0f
options: UIViewAnimationOptionBeginFromCurrentState
@@ -1763,14 +1770,17 @@
-(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
duration:(NSTimeInterval)duration
{
-NSManagedObjectID *articleID = [articleDataContext_.mainContext
getArticleIDForTitle: [SessionSingleton sharedInstance].currentArticleTitle
-
domain: [SessionSingleton sharedInstance].currentArticleDomain];
-if (articleID) {
-Article *article = (Article *)[articleDataContext_.mainContext
objectWithID:articleID];
-
-self.indexOfFirstOnscreenSectionBeforeRotate = [self.webView
getIndexOfTopOnScreenElementWithPrefix:@section_heading_and_content_block_
count:article.section.count];
-}
-//self.view.alpha = 0.0f;
+NSString *js = @(function() {
+ @_topElement = document.elementFromPoint(
window.innerWidth / 2, 0 );
+ @if (_topElement) {
+ @var rect = _topElement.getBoundingClientRect();
+ @return rect.top / rect.height;
+ @} else {
+ @return 0;
+ @}
+ @})();
+float relativeScrollOffset = [[self.webView
stringByEvaluatingJavaScriptFromString:js] floatValue];
+self.relativeScrollOffsetBeforeRotate = relativeScrollOffset;
[self tocHideWithDuration:@0.0f];
@@ -1781,20 +1791,29 @@
{
[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-[self
performSelector:@selector(scrollToIndexOfFirstOnscreenSectionBeforeRotate)
withObject:nil afterDelay:0.1f];
+[self scrollToElementOnScreenBeforeRotate];
[self updateWebViewContentAndScrollInsets];
}
--(void)scrollToIndexOfFirstOnscreenSectionBeforeRotate{
-if(self.indexOfFirstOnscreenSectionBeforeRotate == -1)return;
-NSString *elementId = [NSString
stringWithFormat:@section_heading_and_content_block_%ld,
(long)self.indexOfFirstOnscreenSectionBeforeRotate];
-
-[self tocScrollWebViewToSectionWithElementId: elementId
-duration: 0.2
- thenHideTOC: NO];
+-(void)scrollToElementOnScreenBeforeRotate
+{
+NSString *js = @(function() {
+ @if (_topElement) {
+ @var rect = _topElement.getBoundingClientRect();
+ @return (window.scrollY + rect.top) - (%f *
rect.height);
+ @} else {
+ @return 0;
+ @}
+ @})();
+NSString *js2 = [NSString stringWithFormat:js,
self.relativeScrollOffsetBeforeRotate, self.relativeScrollOffsetBeforeRotate];
+int finalScrollOffset = [[self.webView
stringByEvaluatingJavaScriptFromString:js2]
[MediaWiki-commits] [Gerrit] Fix user-agent for EventLogging - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150972
Change subject: Fix user-agent for EventLogging
..
Fix user-agent for EventLogging
Change-Id: Ia1712ef3ed6de4344e2efbdabdc84d5fc9446c2c
---
M wikipedia/Data/Operations/LogEventOp.m
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/72/150972/1
diff --git a/wikipedia/Data/Operations/LogEventOp.m
b/wikipedia/Data/Operations/LogEventOp.m
index bd946fe..d718130 100644
--- a/wikipedia/Data/Operations/LogEventOp.m
+++ b/wikipedia/Data/Operations/LogEventOp.m
@@ -5,6 +5,7 @@
#import NSURLRequest+DictionaryRequest.h
#import NSString+Extras.h
#import SessionSingleton.h
+#import WikipediaAppUtils.h
#define LOG_ENDPOINT @https://bits.wikimedia.org/event.gif;
@@ -35,7 +36,9 @@
NSLog(@%@, payloadJsonString);
NSString *encodedPayloadJsonString = [payloadJsonString
urlEncodedUTF8String];
NSString *urlString = [NSString stringWithFormat:@%@?%@;,
LOG_ENDPOINT, encodedPayloadJsonString];
-self.request = [[NSURLRequest alloc] initWithURL:[NSURL
URLWithString:urlString]];
+NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
initWithURL:[NSURL URLWithString:urlString]];
+[request addValue:[WikipediaAppUtils versionedUserAgent]
forHTTPHeaderField:@User-Agent];
+self.request = request;
self.completionBlock = ^(){
//NSLog(@EVENT LOGGING COMPLETED);
--
To view, visit https://gerrit.wikimedia.org/r/150972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1712ef3ed6de4344e2efbdabdc84d5fc9446c2c
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
[MediaWiki-commits] [Gerrit] Refs now appear in panel. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Refs now appear in panel.
..
Refs now appear in panel.
Change-Id: Id6e68071f72e5f6e75d0dab5bb7edd1599025708
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Base.lproj/Main_iPhone.storyboard
A wikipedia/View Controllers/References/ReferenceGradientView.h
A wikipedia/View Controllers/References/ReferenceGradientView.m
A wikipedia/View Controllers/References/ReferenceVC.h
A wikipedia/View Controllers/References/ReferenceVC.m
A wikipedia/View Controllers/References/ReferencesVC.h
A wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/TableOfContents/TOCViewController.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/index.html
M www/index.html
13 files changed, 1,042 insertions(+), 7 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 4a0c454..fed55a2 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -82,6 +82,7 @@
047E74141860509000916964 /* SavedPagesResultPrototypeView.xib
in Resources */ = {isa = PBXBuildFile; fileRef = 047E74131860509000916964 /*
SavedPagesResultPrototypeView.xib */; };
047ED63918C13E4900442BE3 /* PreviewWebView.m in Sources */ =
{isa = PBXBuildFile; fileRef = 047ED63818C13E4900442BE3 /* PreviewWebView.m */;
};
047FF5471889078C009DB293 /* Image+Convenience.m in Sources */ =
{isa = PBXBuildFile; fileRef = 047FF5461889078C009DB293 /* Image+Convenience.m
*/; };
+ 04821CD119895EDC007558F6 /* ReferenceGradientView.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 04821CD019895EDC007558F6 /*
ReferenceGradientView.m */; };
048A26771906268100395F53 /* PaddedLabel.m in Sources */ = {isa
= PBXBuildFile; fileRef = 048A26761906268100395F53 /* PaddedLabel.m */; };
0493C2CC1952373100EBB973 /* CoreDataHousekeeping.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 0493C2CB1952373100EBB973 /*
CoreDataHousekeeping.m */; };
0493C2D419526A0100EBB973 /* WikiFont-Glyphs.ttf in Resources */
= {isa = PBXBuildFile; fileRef = 0493C2D319526A0100EBB973 /*
WikiFont-Glyphs.ttf */; };
@@ -122,6 +123,8 @@
04C91CEF195520990035ED1B /* logo-onboarding-subti...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 04C91CED195520990035ED1B /*
logo-onboarding-subti...@2x.png */; };
04C91CF219554B310035ED1B /* logo-onboarding.png in Resources */
= {isa = PBXBuildFile; fileRef = 04C91CF019554B310035ED1B /*
logo-onboarding.png */; };
04C91CF319554B310035ED1B /* logo-onboard...@2x.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 04C91CF119554B310035ED1B /*
logo-onboard...@2x.png */; };
+ 04CCA0C01983086D000E982A /* ReferencesVC.m in Sources */ = {isa
= PBXBuildFile; fileRef = 04CCA0BF1983086D000E982A /* ReferencesVC.m */; };
+ 04CCA0C319830A44000E982A /* ReferenceVC.m in Sources */ = {isa
= PBXBuildFile; fileRef = 04CCA0C219830A44000E982A /* ReferenceVC.m */; };
04CCCFEE1935093A00E3F60C /* SecondaryMenuRowView.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 04CCCFEA1935093A00E3F60C /*
SecondaryMenuRowView.m */; };
04CCCFEF1935093A00E3F60C /* SecondaryMenuRowView.xib in
Resources */ = {isa = PBXBuildFile; fileRef = 04CCCFEB1935093A00E3F60C /*
SecondaryMenuRowView.xib */; };
04CCCFF01935093A00E3F60C /* SecondaryMenuViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04CCCFED1935093A00E3F60C /*
SecondaryMenuViewController.m */; };
@@ -330,6 +333,8 @@
047ED63818C13E4900442BE3 /* PreviewWebView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= PreviewWebView.m; sourceTree = group; };
047FF5451889078C009DB293 /* Image+Convenience.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
Image+Convenience.h; sourceTree = group; };
047FF5461889078C009DB293 /* Image+Convenience.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= Image+Convenience.m; sourceTree = group; };
+ 04821CCF19895EDC007558F6 /* ReferenceGradientView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ReferenceGradientView.h; sourceTree = group; };
+ 04821CD019895EDC007558F6 /* ReferenceGradientView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= ReferenceGradientView.m; sourceTree = group; };
048A26751906268100395F53 /* PaddedLabel.h */ = {isa =
[MediaWiki-commits] [Gerrit] Fix regression in iOS 6 making links unclickable - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150987
Change subject: Fix regression in iOS 6 making links unclickable
..
Fix regression in iOS 6 making links unclickable
Accidentally used an NSString method introduced in iOS 7!
Change-Id: Ic2b27af3b293b52fdbdaa1438d6434b451e9c730
---
M wikipedia/View Controllers/References/ReferenceVC.m
M wikipedia/View Controllers/WebView/WebViewController.m
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/87/150987/1
diff --git a/wikipedia/View Controllers/References/ReferenceVC.m
b/wikipedia/View Controllers/References/ReferenceVC.m
index fe45c8a..f8e0d3c 100644
--- a/wikipedia/View Controllers/References/ReferenceVC.m
+++ b/wikipedia/View Controllers/References/ReferenceVC.m
@@ -51,7 +51,7 @@
{
NSString *href = requestURL.path;
NSString *encodedTitle = [href
substringWithRange:NSMakeRange(6, href.length - 6)];
-NSString *title = [encodedTitle
stringByRemovingPercentEncoding];
+NSString *title = [encodedTitle
stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
MWPageTitle *pageTitle = [MWPageTitle
titleWithString:title];
[self.webVC navigateToPage: pageTitle
domain: [SessionSingleton
sharedInstance].currentArticleDomain
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 0b02456..0148948 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -833,7 +833,7 @@
[weakSelf animateTopAndBottomMenuReveal];
NSString *encodedTitle = [href substringWithRange:NSMakeRange(6,
href.length - 6)];
-NSString *title = [encodedTitle stringByRemovingPercentEncoding];
+NSString *title = [encodedTitle
stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
MWPageTitle *pageTitle = [MWPageTitle titleWithString:title];
[weakSelf navigateToPage: pageTitle
--
To view, visit https://gerrit.wikimedia.org/r/150987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2b27af3b293b52fdbdaa1438d6434b451e9c730
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
[MediaWiki-commits] [Gerrit] URL udpate in css - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150988
Change subject: URL udpate in css
..
URL udpate in css
Change-Id: I6ac69b5372537c4a046e16fecb4db5dff922f1fa
---
M wikipedia/assets/abusefilter.css
M wikipedia/assets/preview.css
M wikipedia/assets/styles.css
3 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/88/150988/1
diff --git a/wikipedia/assets/abusefilter.css b/wikipedia/assets/abusefilter.css
index 72cd4ad..07bf36d 100644
--- a/wikipedia/assets/abusefilter.css
+++ b/wikipedia/assets/abusefilter.css
@@ -283,7 +283,7 @@
}
a.external {
background-image:
url(data:image/png;base64,iVBORw0KGgoNSUhEUgoKCAYAAACNMs+9VElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAElFTkSuQmCC);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf14/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-07-17T16:45:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-07-24T17:20:00Z)!ie;
/* We don't need the !ie hack because this old IE uses the fallback already
*/
background-image: -webkit-linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
background-image: linear-gradient(transparent,transparent),
[MediaWiki-commits] [Gerrit] Updated iOS glyphs. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Updated iOS glyphs. .. Updated iOS glyphs. Change-Id: I41c715d20bf48cc97b2b909cc07f2ca9fe0fbf98 --- M wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf b/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf index 8968a46..5cee1e6 100644 --- a/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf +++ b/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf Binary files differ diff --git a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m index b161df6..d4660d3 100644 --- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m +++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m @@ -55,7 +55,7 @@ UIColor *buttonColor = [UIColor blackColor]; CGFloat buttonTextSize = 34; -CGFloat baseLineOffset = (NSFoundationVersionNumber NSFoundationVersionNumber_iOS_6_1) ? 2.0 : 8.0; +CGFloat baseLineOffset = (NSFoundationVersionNumber NSFoundationVersionNumber_iOS_6_1) ? 2.0 : 7.0; BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL]; @@ -76,7 +76,7 @@ [self.rightButton.label setWikiText: IOS_WIKIGLYPH_SHARE color: buttonColor size: buttonTextSize - baselineOffset: baseLineOffset + baselineOffset: baseLineOffset + 1.0 ]; self.rightButton.tag = BOTTOM_MENU_BUTTON_SHARE; -- To view, visit https://gerrit.wikimedia.org/r/151003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41c715d20bf48cc97b2b909cc07f2ca9fe0fbf98 Gerrit-PatchSet: 2 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only scroll refs up if ref link would have been covered by r... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Only scroll refs up if ref link would have been covered by refs
panel.
..
Only scroll refs up if ref link would have been covered by refs panel.
Also centers the scrolled up ref link to the vertical center of the
part of the article web view visible above the refs panel.
Change-Id: If4faf645bcbf1c48f790d02a5f1bb6fa148b2f1c
---
M wikipedia/View Controllers/References/ReferencesVC.m
1 file changed, 20 insertions(+), 6 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View Controllers/References/ReferencesVC.m
b/wikipedia/View Controllers/References/ReferencesVC.m
index 3b4fe6a..3c8b48b 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.m
+++ b/wikipedia/View Controllers/References/ReferencesVC.m
@@ -296,16 +296,30 @@
NSNumber *n = self.payload[@refsIndex];
if (!n) return;
NSArray *a = self.payload[@linkId];
-if (!a) return;
+if (!a || (a.count == 0)) return;
+NSString *firstLinkId = a[0];
+if ([firstLinkId isEqualToString:@fake_refs_id]) return;
+
NSString *elementId = a[n.integerValue];
if (!elementId) return;
CGRect r = [self.webVC.webView
getScreenRectForHtmlElementWithId:elementId];
if (!CGRectIsNull(r)) {
-CGPoint p = CGPointMake(
-self.webVC.webView.scrollView.contentOffset.x,
-self.webVC.webView.scrollView.contentOffset.y
+ (r.origin.y - 70)
-);
-[self.webVC.webView.scrollView setContentOffset:p animated:YES];
+
+CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.view.bounds.size.height;
+
+// Only scroll up if the refs link would be below the refs panel.
+if ((r.origin.y + r.size.height) (vSpaceAboveRefsPanel)) {
+
+// Calculate the distance needed to scroll the refs link to the
vertical center of the
+// part of the article web view not covered by the refs panel.
+CGFloat distanceFromVerticalCenter = ((vSpaceAboveRefsPanel) /
2.0) - (r.size.height / 2.0);
+
+CGPoint p = CGPointMake(
+
self.webVC.webView.scrollView.contentOffset.x,
+
self.webVC.webView.scrollView.contentOffset.y + (r.origin.y -
distanceFromVerticalCenter)
+);
+[self.webVC.webView.scrollView setContentOffset:p animated:YES];
+}
};
}
--
To view, visit https://gerrit.wikimedia.org/r/151031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4faf645bcbf1c48f790d02a5f1bb6fa148b2f1c
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump ver to 4.0.1 - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151105 Change subject: Bump ver to 4.0.1 .. Bump ver to 4.0.1 Change-Id: I30f662e86b366a04180f0895de8d39a456c0664c --- M wikipedia/Wikipedia-Info.plist 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/05/151105/1 diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index a35092e..12de9a8 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -17,11 +17,11 @@ keyCFBundlePackageType/key stringAPPL/string keyCFBundleShortVersionString/key - string4.0/string + string4.0.1/string keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0/string + string4.0.1/string keyLSRequiresIPhoneOS/key true/ keyUIAppFonts/key -- To view, visit https://gerrit.wikimedia.org/r/151105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30f662e86b366a04180f0895de8d39a456c0664c 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
[MediaWiki-commits] [Gerrit] Workaround crasher when lastmodified date is bogus - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151109
Change subject: Workaround crasher when lastmodified date is bogus
..
Workaround crasher when lastmodified date is bogus
We still need to track down the cause, will add reporting logic later
Change-Id: I75d1dcbb8fd971c80d3bfd81419475078462544b
---
M wikipedia/Data/Operations/DownloadSectionsOp.m
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/09/151109/1
diff --git a/wikipedia/Data/Operations/DownloadSectionsOp.m
b/wikipedia/Data/Operations/DownloadSectionsOp.m
index 228adc6..d815f72 100644
--- a/wikipedia/Data/Operations/DownloadSectionsOp.m
+++ b/wikipedia/Data/Operations/DownloadSectionsOp.m
@@ -113,6 +113,10 @@
NSString *lastmodifiedDateString =
weakSelf.jsonRetrieved[@mobileview][@lastmodified];
NSDate *lastmodifiedDate = [lastmodifiedDateString
getDateFromIso8601DateString];
+if (!lastmodifiedDate) {
+NSLog(@Bad lastmodified date, will show as recently modified
as a workaround);
+lastmodifiedDate = [[NSDate alloc] init];
+}
NSDictionary *lastmodifiedbyDict =
weakSelf.jsonRetrieved[@mobileview][@lastmodifiedby];
NSString *lastmodifiedby = @;
--
To view, visit https://gerrit.wikimedia.org/r/151109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75d1dcbb8fd971c80d3bfd81419475078462544b
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
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Manual import of translations from TWN
..
Manual import of translations from TWN
Change-Id: I3eaaee9aca58d8cb44481c84cb5bdac45886ca2b
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/assets/bundle.js
M wikipedia/bn.lproj/Localizable.strings
M wikipedia/bn.lproj/Main_iPhone.strings
M wikipedia/ce.lproj/Main_iPhone.strings
A wikipedia/cs.lproj/InfoPlist.strings
A wikipedia/cs.lproj/Localizable.strings
A wikipedia/cs.lproj/Main_iPhone.strings
M wikipedia/de.lproj/Main_iPhone.strings
M wikipedia/diq.lproj/Main_iPhone.strings
M wikipedia/es.lproj/Localizable.strings
M wikipedia/es.lproj/Main_iPhone.strings
M wikipedia/fr.lproj/Main_iPhone.strings
M wikipedia/he.lproj/Main_iPhone.strings
M wikipedia/hu.lproj/Main_iPhone.strings
M wikipedia/id.lproj/Localizable.strings
M wikipedia/id.lproj/Main_iPhone.strings
M wikipedia/it.lproj/Localizable.strings
M wikipedia/it.lproj/Main_iPhone.strings
M wikipedia/lb.lproj/Main_iPhone.strings
M wikipedia/mk.lproj/Main_iPhone.strings
M wikipedia/nl.lproj/Localizable.strings
M wikipedia/pl.lproj/Localizable.strings
M wikipedia/pl.lproj/Main_iPhone.strings
M wikipedia/pt.lproj/Main_iPhone.strings
M wikipedia/qqq.lproj/Main_iPhone.strings
M wikipedia/ro.lproj/Localizable.strings
M wikipedia/ro.lproj/Main_iPhone.strings
M wikipedia/ru.lproj/Main_iPhone.strings
M wikipedia/sr-ec.lproj/Localizable.strings
M wikipedia/sv.lproj/Localizable.strings
M wikipedia/sv.lproj/Main_iPhone.strings
A wikipedia/ta.lproj/Main_iPhone.strings
M wikipedia/tr.lproj/Main_iPhone.strings
M wikipedia/vi.lproj/Localizable.strings
M wikipedia/vi.lproj/Main_iPhone.strings
M wikipedia/zh-hans.lproj/Localizable.strings
M wikipedia/zh-hans.lproj/Main_iPhone.strings
M wikipedia/zh-hant.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Main_iPhone.strings
40 files changed, 806 insertions(+), 214 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index fed55a2..c1bbcb4 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1646,7 +1646,7 @@
ORGANIZATIONNAME = Wikimedia Foundation;
TargetAttributes = {
D4991434181D51DE00E6073C = {
- DevelopmentTeam = D5RR3ZF62D;
+ DevelopmentTeam = AKK7J2GV64;
};
};
};
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index cee5d40..0d5d71a 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -573,4 +573,4 @@
}
}
-},{}]},{},[1,2,3,4,5,6,7,8])
+},{}]},{},[1,2,3,4,5,6,7,8])
\ No newline at end of file
diff --git a/wikipedia/bn.lproj/Localizable.strings
b/wikipedia/bn.lproj/Localizable.strings
index 1120c6d..bb3872e 100644
--- a/wikipedia/bn.lproj/Localizable.strings
+++ b/wikipedia/bn.lproj/Localizable.strings
@@ -6,8 +6,7 @@
article-languages-label = ভাষা নির্বাচন করুন;
article-languages-cancel = বাতিল;
article-languages-downloading = নিবন্ধের ভাষাসমূহ লোড হচ্ছে...;
-// Fuzzy
-article-languages-filter-placeholder = ছাকনী;
+article-languages-filter-placeholder = ভাষা ছাকনী;
history-label = সাম্প্রতিক;
history-section-today = আজ;
history-section-yesterday = গতকাল;
@@ -18,10 +17,8 @@
zero-webpage-url =
https://wikimediafoundation.org/wiki/Wikipedia_Zero_App_FAQ;;
zero-interstitial-title = উইকিপিডিয়া জিরো প্রস্থান হচ্ছে;
zero-interstitial-leave-app = ডাটা চার্জ প্রযোজ্য হতে পারে। অন্য
ওয়েবসাইটিতে যেতে চান?;
-// Fuzzy
-zero-interstitial-continue = অগ্রসর হোন;
-// Fuzzy
-zero-interstitial-cancel = বাতিল;
+zero-interstitial-continue = ছেড়ে চলুন;
+zero-interstitial-cancel = এখানে থাকুন;
zero-learn-more = এই উইকিপিডিয়া অ্যাপের জন্য ডাটা চার্জ প্রযোজ্য নয়।;
zero-learn-more-learn-more = আরও পড়ুন;
zero-learn-more-no-thanks = খারিজ;
@@ -87,6 +84,7 @@
main-menu-terms-of-use = ব্যবহারের শর্তাবলী;
main-menu-rate-app = অ্যাপটি মূল্যায়ন করুন;
main-menu-heading-zero = উইকিপিডিয়া জিরো;
+main-menu-heading-legal = আইনী তথ্য;
main-menu-show-today = আজ;
saved-pages-title = সংরক্ষিত পাতা;
page-history-title = পাতার ইতিহাস;
@@ -107,6 +105,7 @@
edit-summary-choice-added-missing-info = অনুপস্থিত তথ্য যোগ করা হয়েছে;
edit-summary-choice-other = অন্যান্য;
edit-summary-field-placeholder-text = কীভাবে আপনি নিবন্ধনটি উন্নত করেছেন?;
+edit-summary-title = কীভাবে আপনি পাতাটি উন্নত করেছেন?;
fetching-random-article = অজানা নিবন্ধ আনা হচ্ছে;
article-pull-to-refresh-prompt = নিবন্ধ পুনঃসতেজ করতে টানুন;
article-pull-to-refresh-is-refreshing = নিবন্ধ পুনঃসতেজ হচ্ছে;
@@ -133,10 +132,13 @@
onboarding-already-have-account = ইতিমধ্যে একটি অ্যাকাউন্ট
[MediaWiki-commits] [Gerrit] here, have a change gerrit - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151146 Change subject: here, have a change gerrit .. here, have a change gerrit Change-Id: Ic997ecdd9515904142ace68b5af7493a62addbdc --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/46/151146/1 diff --git a/README.md b/README.md index 704acd6..d202cfe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (late 2013) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (late 2013-mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic997ecdd9515904142ace68b5af7493a62addbdc Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1 Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] here, have a change gerrit - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: here, have a change gerrit .. here, have a change gerrit Change-Id: Ic997ecdd9515904142ace68b5af7493a62addbdc --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 704acd6..d202cfe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (late 2013) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (late 2013-mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic997ecdd9515904142ace68b5af7493a62addbdc Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1 Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Here hvae another update gerrit - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151147 Change subject: Here hvae another update gerrit .. Here hvae another update gerrit Change-Id: I0aa78ff0328ed357204322c6b6de713e0a0f0f33 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/47/151147/1 diff --git a/README.md b/README.md index d202cfe..622bf23 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (late 2013-mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0aa78ff0328ed357204322c6b6de713e0a0f0f33 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1 Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Here hvae another update gerrit - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Here hvae another update gerrit .. Here hvae another update gerrit Change-Id: I0aa78ff0328ed357204322c6b6de713e0a0f0f33 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/README.md b/README.md index d202cfe..622bf23 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (late 2013-mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0aa78ff0328ed357204322c6b6de713e0a0f0f33 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1 Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Branch for v4.0? - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151151 Change subject: Branch for v4.0? .. Branch for v4.0? Change-Id: I77031b54343771899714f98223b79d94d96507bd --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/51/151151/1 diff --git a/README.md b/README.md index 704acd6..622bf23 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (late 2013) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77031b54343771899714f98223b79d94d96507bd Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0 Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Branch for v4.0? - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Branch for v4.0? .. Branch for v4.0? Change-Id: I77031b54343771899714f98223b79d94d96507bd --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 704acd6..622bf23 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (late 2013) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77031b54343771899714f98223b79d94d96507bd Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0 Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] another branch test? - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151153 Change subject: another branch test? .. another branch test? Change-Id: I3b10e466d4c3bc7caf8ebc207fb630afa31a73e6 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/53/151153/1 diff --git a/README.md b/README.md index 622bf23..bf92d4f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (mid 2014...) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b10e466d4c3bc7caf8ebc207fb630afa31a73e6 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1-rc Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] another branch test? - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: another branch test? .. another branch test? Change-Id: I3b10e466d4c3bc7caf8ebc207fb630afa31a73e6 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 622bf23..bf92d4f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wikipedia-iOS -New (mid 2014) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +New (mid 2014...) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). -- To view, visit https://gerrit.wikimedia.org/r/151153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b10e466d4c3bc7caf8ebc207fb630afa31a73e6 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1-rc Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cherry-pick: More fixes related to the random crash fix. - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151183 Change subject: Cherry-pick: More fixes related to the random crash fix. .. Cherry-pick: More fixes related to the random crash fix. Change-Id: I8f6bf7484042db1d3f5c44144bf4c9eedc6b5f1c --- M wikipedia/View Controllers/History/HistoryViewController.m M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m M wikipedia/View Controllers/SavedPages/SavedPagesViewController.m 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/83/151183/1 diff --git a/wikipedia/View Controllers/History/HistoryViewController.m b/wikipedia/View Controllers/History/HistoryViewController.m index 1f7bfb8..829628e 100644 --- a/wikipedia/View Controllers/History/HistoryViewController.m +++ b/wikipedia/View Controllers/History/HistoryViewController.m @@ -404,7 +404,7 @@ animated: YES discoveryMethod: DISCOVERY_METHOD_SEARCH invalidatingCache: NO - popToWebVC: YES]; + popToWebVC: NO]; [self popModalToRoot]; } diff --git a/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m index 573673f..c69007e 100644 --- a/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m +++ b/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m @@ -701,7 +701,7 @@ animated: YES discoveryMethod: DISCOVERY_METHOD_SEARCH invalidatingCache: YES - popToWebVC: YES]; + popToWebVC: NO]; } } diff --git a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m index 8465c65..4e28937 100644 --- a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m +++ b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m @@ -262,7 +262,7 @@ animated: YES discoveryMethod: DISCOVERY_METHOD_SEARCH invalidatingCache: NO - popToWebVC: YES]; + popToWebVC: NO]; [self popModalToRoot]; } -- To view, visit https://gerrit.wikimedia.org/r/151183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f6bf7484042db1d3f5c44144bf4c9eedc6b5f1c Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1-rc Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Mhurd mh...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cherry-pick: More fixes related to the random crash fix. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Cherry-pick: More fixes related to the random crash fix. .. Cherry-pick: More fixes related to the random crash fix. Change-Id: I8f6bf7484042db1d3f5c44144bf4c9eedc6b5f1c --- M wikipedia/View Controllers/History/HistoryViewController.m M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m M wikipedia/View Controllers/SavedPages/SavedPagesViewController.m 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/View Controllers/History/HistoryViewController.m b/wikipedia/View Controllers/History/HistoryViewController.m index 1f7bfb8..829628e 100644 --- a/wikipedia/View Controllers/History/HistoryViewController.m +++ b/wikipedia/View Controllers/History/HistoryViewController.m @@ -404,7 +404,7 @@ animated: YES discoveryMethod: DISCOVERY_METHOD_SEARCH invalidatingCache: NO - popToWebVC: YES]; + popToWebVC: NO]; [self popModalToRoot]; } diff --git a/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m index 573673f..c69007e 100644 --- a/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m +++ b/wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m @@ -701,7 +701,7 @@ animated: YES discoveryMethod: DISCOVERY_METHOD_SEARCH invalidatingCache: YES - popToWebVC: YES]; + popToWebVC: NO]; } } diff --git a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m index 8465c65..4e28937 100644 --- a/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m +++ b/wikipedia/View Controllers/SavedPages/SavedPagesViewController.m @@ -262,7 +262,7 @@ animated: YES discoveryMethod: DISCOVERY_METHOD_SEARCH invalidatingCache: NO - popToWebVC: YES]; + popToWebVC: NO]; [self popModalToRoot]; } -- To view, visit https://gerrit.wikimedia.org/r/151183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f6bf7484042db1d3f5c44144bf4c9eedc6b5f1c Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1-rc Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Mhurd mh...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made refs panel lazy loaded. Disabled refs js hook for now. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Made refs panel lazy loaded. Disabled refs js hook for now.
..
Made refs panel lazy loaded. Disabled refs js hook for now.
Change-Id: I8237be404e271f6d37a9a22be2c33a973425ef02
---
M wikipedia/Base.lproj/Main_iPhone.storyboard
M wikipedia/View Controllers/References/ReferenceVC.m
M wikipedia/View Controllers/References/ReferencesVC.h
M wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/bundle.js
M www/js/listeners.js
8 files changed, 69 insertions(+), 22 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard
b/wikipedia/Base.lproj/Main_iPhone.storyboard
index f8853c8..2f9eeb3 100644
--- a/wikipedia/Base.lproj/Main_iPhone.storyboard
+++ b/wikipedia/Base.lproj/Main_iPhone.storyboard
@@ -1205,9 +1205,6 @@
constraints
constraint firstAttribute=height
constant=200 id=Z6r-VJ-hik/
/constraints
-connections
-segue destination=1wG-t8-xjS
kind=embed identifier=ReferencesVC_embed id=fwM-jR-p9Z/
-/connections
/containerView
/subviews
color key=backgroundColor red=1 green=1
blue=1 alpha=1 colorSpace=calibratedRGB/
diff --git a/wikipedia/View Controllers/References/ReferenceVC.m
b/wikipedia/View Controllers/References/ReferenceVC.m
index f8e0d3c..c8c435c 100644
--- a/wikipedia/View Controllers/References/ReferenceVC.m
+++ b/wikipedia/View Controllers/References/ReferenceVC.m
@@ -18,6 +18,11 @@
@implementation ReferenceVC
+-(void)dealloc
+{
+NSLog(@dealloc'ing REFERENCE VC!);
+}
+
- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest
*)request navigationType:(UIWebViewNavigationType)navigationType
{
NSString *domain = [SessionSingleton sharedInstance].currentArticleDomain;
diff --git a/wikipedia/View Controllers/References/ReferencesVC.h
b/wikipedia/View Controllers/References/ReferencesVC.h
index b413baa..ec3c79a 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.h
+++ b/wikipedia/View Controllers/References/ReferencesVC.h
@@ -12,6 +12,8 @@
@property (weak, nonatomic) WebViewController *webVC;
+@property (assign) CGFloat panelHeight;
+
-(void)reset;
@end
diff --git a/wikipedia/View Controllers/References/ReferencesVC.m
b/wikipedia/View Controllers/References/ReferencesVC.m
index 3c8b48b..afb76b1 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.m
+++ b/wikipedia/View Controllers/References/ReferencesVC.m
@@ -55,6 +55,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
+self.panelHeight = 0;
self.refs = @[@];
self.linkIds = @[];
self.linkText = @[];
@@ -305,7 +306,7 @@
CGRect r = [self.webVC.webView
getScreenRectForHtmlElementWithId:elementId];
if (!CGRectIsNull(r)) {
-CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.view.bounds.size.height;
+CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.panelHeight;
// Only scroll up if the refs link would be below the refs panel.
if ((r.origin.y + r.size.height) (vSpaceAboveRefsPanel)) {
diff --git a/wikipedia/View Controllers/WebView/WebViewController.h
b/wikipedia/View Controllers/WebView/WebViewController.h
index 68ca8d9..c4fe24a 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.h
+++ b/wikipedia/View Controllers/WebView/WebViewController.h
@@ -13,7 +13,7 @@
@property (nonatomic) BOOL bottomMenuHidden;
@property (nonatomic) BOOL referencesHidden;
--(void)referencesShow;
+-(void)referencesShow:(NSDictionary *)payload;
-(void)referencesHide;
// Reloads the current article from the core data cache.
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index b6cc728..18f5e7d 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -93,7 +93,7 @@
@property (nonatomic) BOOL unsafeToToggleTOC;
@property (weak, nonatomic) BottomMenuViewController *bottomMenuViewController;
-@property (weak, nonatomic) ReferencesVC *referencesVC;
+@property (strong, nonatomic) ReferencesVC *referencesVC;
@property (weak, nonatomic) IBOutlet UIView *referencesContainerView;
@property (strong, nonatomic) NSLayoutConstraint
*bottomBarViewBottomConstraint;
@@ -145,6 +145,7 @@
[super viewDidLoad];
self.zeroStatusLabel.text = @;
+self.referencesVC =
[MediaWiki-commits] [Gerrit] Made refs panel lazy loaded. Disabled refs js hook for now. - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151200
Change subject: Made refs panel lazy loaded. Disabled refs js hook for now.
..
Made refs panel lazy loaded. Disabled refs js hook for now.
Change-Id: I8237be404e271f6d37a9a22be2c33a973425ef02
(cherry picked from commit 358dd833026fb64d526d8cfe550f0e3d9a002494)
---
M wikipedia/Base.lproj/Main_iPhone.storyboard
M wikipedia/View Controllers/References/ReferenceVC.m
M wikipedia/View Controllers/References/ReferencesVC.h
M wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/bundle.js
M www/js/listeners.js
8 files changed, 69 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/00/151200/1
diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard
b/wikipedia/Base.lproj/Main_iPhone.storyboard
index f8853c8..2f9eeb3 100644
--- a/wikipedia/Base.lproj/Main_iPhone.storyboard
+++ b/wikipedia/Base.lproj/Main_iPhone.storyboard
@@ -1205,9 +1205,6 @@
constraints
constraint firstAttribute=height
constant=200 id=Z6r-VJ-hik/
/constraints
-connections
-segue destination=1wG-t8-xjS
kind=embed identifier=ReferencesVC_embed id=fwM-jR-p9Z/
-/connections
/containerView
/subviews
color key=backgroundColor red=1 green=1
blue=1 alpha=1 colorSpace=calibratedRGB/
diff --git a/wikipedia/View Controllers/References/ReferenceVC.m
b/wikipedia/View Controllers/References/ReferenceVC.m
index f8e0d3c..c8c435c 100644
--- a/wikipedia/View Controllers/References/ReferenceVC.m
+++ b/wikipedia/View Controllers/References/ReferenceVC.m
@@ -18,6 +18,11 @@
@implementation ReferenceVC
+-(void)dealloc
+{
+NSLog(@dealloc'ing REFERENCE VC!);
+}
+
- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest
*)request navigationType:(UIWebViewNavigationType)navigationType
{
NSString *domain = [SessionSingleton sharedInstance].currentArticleDomain;
diff --git a/wikipedia/View Controllers/References/ReferencesVC.h
b/wikipedia/View Controllers/References/ReferencesVC.h
index b413baa..ec3c79a 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.h
+++ b/wikipedia/View Controllers/References/ReferencesVC.h
@@ -12,6 +12,8 @@
@property (weak, nonatomic) WebViewController *webVC;
+@property (assign) CGFloat panelHeight;
+
-(void)reset;
@end
diff --git a/wikipedia/View Controllers/References/ReferencesVC.m
b/wikipedia/View Controllers/References/ReferencesVC.m
index 3c8b48b..afb76b1 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.m
+++ b/wikipedia/View Controllers/References/ReferencesVC.m
@@ -55,6 +55,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
+self.panelHeight = 0;
self.refs = @[@];
self.linkIds = @[];
self.linkText = @[];
@@ -305,7 +306,7 @@
CGRect r = [self.webVC.webView
getScreenRectForHtmlElementWithId:elementId];
if (!CGRectIsNull(r)) {
-CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.view.bounds.size.height;
+CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.panelHeight;
// Only scroll up if the refs link would be below the refs panel.
if ((r.origin.y + r.size.height) (vSpaceAboveRefsPanel)) {
diff --git a/wikipedia/View Controllers/WebView/WebViewController.h
b/wikipedia/View Controllers/WebView/WebViewController.h
index 68ca8d9..c4fe24a 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.h
+++ b/wikipedia/View Controllers/WebView/WebViewController.h
@@ -13,7 +13,7 @@
@property (nonatomic) BOOL bottomMenuHidden;
@property (nonatomic) BOOL referencesHidden;
--(void)referencesShow;
+-(void)referencesShow:(NSDictionary *)payload;
-(void)referencesHide;
// Reloads the current article from the core data cache.
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index b6cc728..18f5e7d 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -93,7 +93,7 @@
@property (nonatomic) BOOL unsafeToToggleTOC;
@property (weak, nonatomic) BottomMenuViewController *bottomMenuViewController;
-@property (weak, nonatomic) ReferencesVC *referencesVC;
+@property (strong, nonatomic) ReferencesVC *referencesVC;
@property (weak, nonatomic) IBOutlet UIView *referencesContainerView;
@property (strong, nonatomic) NSLayoutConstraint
[MediaWiki-commits] [Gerrit] Made refs panel lazy loaded. Disabled refs js hook for now. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Made refs panel lazy loaded. Disabled refs js hook for now.
..
Made refs panel lazy loaded. Disabled refs js hook for now.
Change-Id: I8237be404e271f6d37a9a22be2c33a973425ef02
(cherry picked from commit 358dd833026fb64d526d8cfe550f0e3d9a002494)
---
M wikipedia/Base.lproj/Main_iPhone.storyboard
M wikipedia/View Controllers/References/ReferenceVC.m
M wikipedia/View Controllers/References/ReferencesVC.h
M wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/bundle.js
M www/js/listeners.js
8 files changed, 69 insertions(+), 22 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard
b/wikipedia/Base.lproj/Main_iPhone.storyboard
index f8853c8..2f9eeb3 100644
--- a/wikipedia/Base.lproj/Main_iPhone.storyboard
+++ b/wikipedia/Base.lproj/Main_iPhone.storyboard
@@ -1205,9 +1205,6 @@
constraints
constraint firstAttribute=height
constant=200 id=Z6r-VJ-hik/
/constraints
-connections
-segue destination=1wG-t8-xjS
kind=embed identifier=ReferencesVC_embed id=fwM-jR-p9Z/
-/connections
/containerView
/subviews
color key=backgroundColor red=1 green=1
blue=1 alpha=1 colorSpace=calibratedRGB/
diff --git a/wikipedia/View Controllers/References/ReferenceVC.m
b/wikipedia/View Controllers/References/ReferenceVC.m
index f8e0d3c..c8c435c 100644
--- a/wikipedia/View Controllers/References/ReferenceVC.m
+++ b/wikipedia/View Controllers/References/ReferenceVC.m
@@ -18,6 +18,11 @@
@implementation ReferenceVC
+-(void)dealloc
+{
+NSLog(@dealloc'ing REFERENCE VC!);
+}
+
- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest
*)request navigationType:(UIWebViewNavigationType)navigationType
{
NSString *domain = [SessionSingleton sharedInstance].currentArticleDomain;
diff --git a/wikipedia/View Controllers/References/ReferencesVC.h
b/wikipedia/View Controllers/References/ReferencesVC.h
index b413baa..ec3c79a 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.h
+++ b/wikipedia/View Controllers/References/ReferencesVC.h
@@ -12,6 +12,8 @@
@property (weak, nonatomic) WebViewController *webVC;
+@property (assign) CGFloat panelHeight;
+
-(void)reset;
@end
diff --git a/wikipedia/View Controllers/References/ReferencesVC.m
b/wikipedia/View Controllers/References/ReferencesVC.m
index 3c8b48b..afb76b1 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.m
+++ b/wikipedia/View Controllers/References/ReferencesVC.m
@@ -55,6 +55,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
+self.panelHeight = 0;
self.refs = @[@];
self.linkIds = @[];
self.linkText = @[];
@@ -305,7 +306,7 @@
CGRect r = [self.webVC.webView
getScreenRectForHtmlElementWithId:elementId];
if (!CGRectIsNull(r)) {
-CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.view.bounds.size.height;
+CGFloat vSpaceAboveRefsPanel = self.webVC.view.bounds.size.height -
self.panelHeight;
// Only scroll up if the refs link would be below the refs panel.
if ((r.origin.y + r.size.height) (vSpaceAboveRefsPanel)) {
diff --git a/wikipedia/View Controllers/WebView/WebViewController.h
b/wikipedia/View Controllers/WebView/WebViewController.h
index 68ca8d9..c4fe24a 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.h
+++ b/wikipedia/View Controllers/WebView/WebViewController.h
@@ -13,7 +13,7 @@
@property (nonatomic) BOOL bottomMenuHidden;
@property (nonatomic) BOOL referencesHidden;
--(void)referencesShow;
+-(void)referencesShow:(NSDictionary *)payload;
-(void)referencesHide;
// Reloads the current article from the core data cache.
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index b6cc728..18f5e7d 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -93,7 +93,7 @@
@property (nonatomic) BOOL unsafeToToggleTOC;
@property (weak, nonatomic) BottomMenuViewController *bottomMenuViewController;
-@property (weak, nonatomic) ReferencesVC *referencesVC;
+@property (strong, nonatomic) ReferencesVC *referencesVC;
@property (weak, nonatomic) IBOutlet UIView *referencesContainerView;
@property (strong, nonatomic) NSLayoutConstraint
*bottomBarViewBottomConstraint;
@@ -145,6 +145,7 @@
[super
[MediaWiki-commits] [Gerrit] v4.0.1-rc branch point (hopefully not broken) - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/151202 Change subject: v4.0.1-rc branch point (hopefully not broken) .. v4.0.1-rc branch point (hopefully not broken) Change-Id: I822a232201855c1afae916de55c3ec00939d060d --- M Wikipedia.xcodeproj/project.pbxproj 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/02/151202/1 diff --git a/Wikipedia.xcodeproj/project.pbxproj b/Wikipedia.xcodeproj/project.pbxproj index c1bbcb4..439a8ee 100644 --- a/Wikipedia.xcodeproj/project.pbxproj +++ b/Wikipedia.xcodeproj/project.pbxproj @@ -2249,8 +2249,8 @@ ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = iPhone Developer; - CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer; + CODE_SIGN_IDENTITY = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); + CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = wikipedia/Wikipedia-Prefix.pch; HEADER_SEARCH_PATHS = ( @@ -2344,8 +2344,8 @@ ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = iPhone Developer; - CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer; + CODE_SIGN_IDENTITY = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); + CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = wikipedia/Wikipedia-Prefix.pch; HEADER_SEARCH_PATHS = ( @@ -2367,8 +2367,8 @@ ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = iPhone Developer; - CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer; + CODE_SIGN_IDENTITY = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); + CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = wikipedia/Wikipedia-Prefix.pch; HEADER_SEARCH_PATHS = ( -- To view, visit https://gerrit.wikimedia.org/r/151202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I822a232201855c1afae916de55c3ec00939d060d Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1-rc-nonbroken Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] v4.0.1-rc branch point (hopefully not broken) - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: v4.0.1-rc branch point (hopefully not broken) .. v4.0.1-rc branch point (hopefully not broken) Change-Id: I822a232201855c1afae916de55c3ec00939d060d --- M Wikipedia.xcodeproj/project.pbxproj 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/Wikipedia.xcodeproj/project.pbxproj b/Wikipedia.xcodeproj/project.pbxproj index c1bbcb4..439a8ee 100644 --- a/Wikipedia.xcodeproj/project.pbxproj +++ b/Wikipedia.xcodeproj/project.pbxproj @@ -2249,8 +2249,8 @@ ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = iPhone Developer; - CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer; + CODE_SIGN_IDENTITY = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); + CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = wikipedia/Wikipedia-Prefix.pch; HEADER_SEARCH_PATHS = ( @@ -2344,8 +2344,8 @@ ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = iPhone Developer; - CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer; + CODE_SIGN_IDENTITY = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); + CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = wikipedia/Wikipedia-Prefix.pch; HEADER_SEARCH_PATHS = ( @@ -2367,8 +2367,8 @@ ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = iPhone Developer; - CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer; + CODE_SIGN_IDENTITY = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); + CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Distribution: Wikimedia Foundation (AKK7J2GV64); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = wikipedia/Wikipedia-Prefix.pch; HEADER_SEARCH_PATHS = ( -- To view, visit https://gerrit.wikimedia.org/r/151202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I822a232201855c1afae916de55c3ec00939d060d Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: v4.0.1-rc-nonbroken Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Null protection for section op. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Null protection for section op.
..
Null protection for section op.
Change-Id: I42fde6f0e7d7baa2d2d9b8798496deedfb27a235
---
M wikipedia/Data/Operations/DownloadSectionsOp.m
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Data/Operations/DownloadSectionsOp.m
b/wikipedia/Data/Operations/DownloadSectionsOp.m
index d815f72..dbdc6bb 100644
--- a/wikipedia/Data/Operations/DownloadSectionsOp.m
+++ b/wikipedia/Data/Operations/DownloadSectionsOp.m
@@ -113,7 +113,7 @@
NSString *lastmodifiedDateString =
weakSelf.jsonRetrieved[@mobileview][@lastmodified];
NSDate *lastmodifiedDate = [lastmodifiedDateString
getDateFromIso8601DateString];
-if (!lastmodifiedDate) {
+if (!lastmodifiedDate || [lastmodifiedDate isNull]) {
NSLog(@Bad lastmodified date, will show as recently modified
as a workaround);
lastmodifiedDate = [[NSDate alloc] init];
}
@@ -147,6 +147,7 @@
protectionStatus = protectionDict[@edit][0];
}
}
+if (!protectionStatus || [protectionStatus isNull])
protectionStatus = @;
NSMutableDictionary *output = @{
@sections: outputSections,
--
To view, visit https://gerrit.wikimedia.org/r/151259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42fde6f0e7d7baa2d2d9b8798496deedfb27a235
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Null protection for section op. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Null protection for section op.
..
Null protection for section op.
Change-Id: I42fde6f0e7d7baa2d2d9b8798496deedfb27a235
(cherry picked from commit fcadf7f2d6cc116e3975a7ae788f3553d5168502)
---
M wikipedia/Data/Operations/DownloadSectionsOp.m
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Data/Operations/DownloadSectionsOp.m
b/wikipedia/Data/Operations/DownloadSectionsOp.m
index d815f72..dbdc6bb 100644
--- a/wikipedia/Data/Operations/DownloadSectionsOp.m
+++ b/wikipedia/Data/Operations/DownloadSectionsOp.m
@@ -113,7 +113,7 @@
NSString *lastmodifiedDateString =
weakSelf.jsonRetrieved[@mobileview][@lastmodified];
NSDate *lastmodifiedDate = [lastmodifiedDateString
getDateFromIso8601DateString];
-if (!lastmodifiedDate) {
+if (!lastmodifiedDate || [lastmodifiedDate isNull]) {
NSLog(@Bad lastmodified date, will show as recently modified
as a workaround);
lastmodifiedDate = [[NSDate alloc] init];
}
@@ -147,6 +147,7 @@
protectionStatus = protectionDict[@edit][0];
}
}
+if (!protectionStatus || [protectionStatus isNull])
protectionStatus = @;
NSMutableDictionary *output = @{
@sections: outputSections,
--
To view, visit https://gerrit.wikimedia.org/r/151260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42fde6f0e7d7baa2d2d9b8798496deedfb27a235
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: v4.0.1-rc-nonbroken
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Null protection for section op. - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151260
Change subject: Null protection for section op.
..
Null protection for section op.
Change-Id: I42fde6f0e7d7baa2d2d9b8798496deedfb27a235
(cherry picked from commit fcadf7f2d6cc116e3975a7ae788f3553d5168502)
---
M wikipedia/Data/Operations/DownloadSectionsOp.m
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/60/151260/1
diff --git a/wikipedia/Data/Operations/DownloadSectionsOp.m
b/wikipedia/Data/Operations/DownloadSectionsOp.m
index d815f72..dbdc6bb 100644
--- a/wikipedia/Data/Operations/DownloadSectionsOp.m
+++ b/wikipedia/Data/Operations/DownloadSectionsOp.m
@@ -113,7 +113,7 @@
NSString *lastmodifiedDateString =
weakSelf.jsonRetrieved[@mobileview][@lastmodified];
NSDate *lastmodifiedDate = [lastmodifiedDateString
getDateFromIso8601DateString];
-if (!lastmodifiedDate) {
+if (!lastmodifiedDate || [lastmodifiedDate isNull]) {
NSLog(@Bad lastmodified date, will show as recently modified
as a workaround);
lastmodifiedDate = [[NSDate alloc] init];
}
@@ -147,6 +147,7 @@
protectionStatus = protectionDict[@edit][0];
}
}
+if (!protectionStatus || [protectionStatus isNull])
protectionStatus = @;
NSMutableDictionary *output = @{
@sections: outputSections,
--
To view, visit https://gerrit.wikimedia.org/r/151260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42fde6f0e7d7baa2d2d9b8798496deedfb27a235
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: v4.0.1-rc-nonbroken
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: I771c3bec329145d6807b387c594e89e81f6324e0 --- M wikipedia/ast.lproj/InfoPlist.strings M wikipedia/ast.lproj/Localizable.strings M wikipedia/ast.lproj/Main_iPhone.strings M wikipedia/br.lproj/Localizable.strings M wikipedia/br.lproj/Main_iPhone.strings M wikipedia/ca.lproj/Localizable.strings M wikipedia/ca.lproj/Main_iPhone.strings M wikipedia/cs.lproj/Localizable.strings M wikipedia/de.lproj/Localizable.strings M wikipedia/es.lproj/Localizable.strings M wikipedia/fr.lproj/Localizable.strings M wikipedia/he.lproj/Localizable.strings M wikipedia/id.lproj/Localizable.strings M wikipedia/it.lproj/Localizable.strings M wikipedia/lb.lproj/Localizable.strings M wikipedia/mk.lproj/Localizable.strings M wikipedia/nl.lproj/Localizable.strings M wikipedia/nl.lproj/Main_iPhone.strings M wikipedia/pl.lproj/Localizable.strings M wikipedia/pl.lproj/Main_iPhone.strings M wikipedia/pt.lproj/Localizable.strings M wikipedia/pt.lproj/Main_iPhone.strings M wikipedia/ro.lproj/Localizable.strings M wikipedia/ru.lproj/Localizable.strings M wikipedia/sco.lproj/Localizable.strings M wikipedia/sr-ec.lproj/Localizable.strings M wikipedia/sr-ec.lproj/Main_iPhone.strings M wikipedia/sv.lproj/Localizable.strings M wikipedia/tr.lproj/Localizable.strings M wikipedia/zh-hans.lproj/Localizable.strings 30 files changed, 263 insertions(+), 65 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/ast.lproj/InfoPlist.strings b/wikipedia/ast.lproj/InfoPlist.strings index 5ca6de0..c512b72 100644 --- a/wikipedia/ast.lproj/InfoPlist.strings +++ b/wikipedia/ast.lproj/InfoPlist.strings @@ -2,4 +2,4 @@ // Exported from translatewiki.net // Author: Xuacu -CFBundleDisplayName = Uiquipedia; +CFBundleDisplayName = Wikipedia; diff --git a/wikipedia/ast.lproj/Localizable.strings b/wikipedia/ast.lproj/Localizable.strings index f4891e8..9074827 100644 --- a/wikipedia/ast.lproj/Localizable.strings +++ b/wikipedia/ast.lproj/Localizable.strings @@ -90,6 +90,13 @@ main-menu-send-feedback = Unviar comentariu sobro la app; main-menu-show-page-history = Historial de los cambios a $1; main-menu-credits = Créditos; +main-menu-zero-faq = FAQ de Wikipedia Zero; +main-menu-privacy-policy = Política d'intimidá; +main-menu-terms-of-use = Condiciones d'usu; +main-menu-rate-app = Calificar app; +main-menu-heading-zero = Wikipedia Zero; +main-menu-heading-legal = Xíriga llegal; +main-menu-show-today = Güei; saved-pages-title = Páxines guardaes; page-history-title = Historial de la páxina; page-history-downloading = Cargando l'historial de la páxina...; @@ -132,6 +139,8 @@ timestamp-days = hai %d díes; timestamp-months = hai %d meses; timestamp-years = hai %d años; +lastmodified-by-user = Cambiada $1 por $2; +lastmodified-by-anon = Cambiada $1 por un usuariu anónimu; button-next = Siguiente; button-done = Fecho; button-save = Guardar; @@ -139,6 +148,8 @@ onboarding-login = Identificase; onboarding-already-have-account = ¿Yá tienes una cuenta? $1; onboarding-skip = Saltar; +onboarding-wikipedia = Wikipedia; +onboarding-free-encyclopedia = La enciclopedia llibre; preference_title_eventlogging_opt_in = Unviar informes d'usu; preference_summary_eventlogging_opt_in = Permite a Wikimedia collechar información tocante a cómo uses la app p'ameyorala; page_protected_autoconfirmed = Esta páxina ta semiprotexida.; @@ -149,3 +160,12 @@ license-footer-text = El conteníu ta disponible baxo $1; license-footer-name = CC-BY-SA 3.0; table-of-contents-heading = Conteníu; +abuse-filter-warning-heading = Esto nun paez una edición constructiva. ¿Tas seguro de que quies guardala?; +abuse-filter-warning-subheading = La to edición pue contener unu o más de los siguientes:; +abuse-filter-warning-caps = Escribir TOO EN MAYÚSCULES; +abuse-filter-warning-blanking = Dexar en blanco los artículos o facer spam; +abuse-filter-warning-irrelevant = Enllaces o imaxes esternos irrelevantes; +abuse-filter-warning-repeat = Caráuteres reptíos; +abuse-filter-disallow-heading = Nun pues guardar esta edición. Por favor vuelvi atrás y cámbiala.; +abuse-filter-disallow-unconstructive = Un filtru automático identificó esta edición como potencialmente non constructiva o como intentu de vandalismu.; +abuse-filter-disallow-notable = Wikipedia ye una enciclopedia y sólo cabe equí el conteníu neutral y notable.; diff --git a/wikipedia/ast.lproj/Main_iPhone.strings b/wikipedia/ast.lproj/Main_iPhone.strings index 5750769..c43b42e 100644 --- a/wikipedia/ast.lproj/Main_iPhone.strings +++ b/wikipedia/ast.lproj/Main_iPhone.strings @@ -2,7 +2,22 @@ // Exported from translatewiki.net // Author: Xuacu -7Wa-ox-cAd.normalTitle = Guardar; -AIA-vO-cLI.placeholder = Escriba'l testu captcha de la imaxe d'arriba;
[MediaWiki-commits] [Gerrit] Work in progress: accessibility fixes - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151788
Change subject: Work in progress: accessibility fixes
..
Work in progress: accessibility fixes
* adds localizable accessibility labels to wiki glyph buttons
* adds button and link traits to some places where they belong
Lots more to improve still...
Bug: 69120
Change-Id: I9ddb8b277194afc947dd04a2bf810892dfc419a1
---
M wikipedia/MenuButton/MenuButton.m
M wikipedia/MenuButton/WikiGlyphButton.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
8 files changed, 60 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/88/151788/1
diff --git a/wikipedia/MenuButton/MenuButton.m
b/wikipedia/MenuButton/MenuButton.m
index 4d93521..8d3bebf 100755
--- a/wikipedia/MenuButton/MenuButton.m
+++ b/wikipedia/MenuButton/MenuButton.m
@@ -57,6 +57,8 @@
[self addSubview:self.label];
self.margin = margin;
[self constrainLabel];
+self.isAccessibilityElement = YES;
+self.accessibilityTraits = UIAccessibilityTraitButton;
}
return self;
}
diff --git a/wikipedia/MenuButton/WikiGlyphButton.m
b/wikipedia/MenuButton/WikiGlyphButton.m
index 80f18a8..31709dc 100644
--- a/wikipedia/MenuButton/WikiGlyphButton.m
+++ b/wikipedia/MenuButton/WikiGlyphButton.m
@@ -30,6 +30,8 @@
self.clipsToBounds = YES;
self.label = [[WikiGlyphLabel alloc] init];
self.label.translatesAutoresizingMaskIntoConstraints = NO;
+self.isAccessibilityElement = YES;
+self.accessibilityTraits = UIAccessibilityTraitButton;
[self addSubview:self.label];
[self constrainLabel];
}
@@ -43,6 +45,11 @@
{
_enabled = enabled;
self.alpha = (enabled) ? 1.0 : 0.2;
+if (enabled) {
+self.accessibilityTraits = self.accessibilityTraits
(~UIAccessibilityTraitNotEnabled);
+} else {
+self.accessibilityTraits = self.accessibilityTraits |
UIAccessibilityTraitNotEnabled;
+}
}
-(void)constrainLabel
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index d4660d3..7113632 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -63,6 +63,7 @@
color: buttonColor
size: buttonTextSize
baselineOffset: baseLineOffset];
+self.backButton.accessibilityLabel =
MWLocalizedString(@menu-back-accessibility-label, nil);
self.backButton.tag = BOTTOM_MENU_BUTTON_PREVIOUS;
[self.forwardButton.label setWikiText: isRTL ? IOS_WIKIGLYPH_BACKWARD :
IOS_WIKIGLYPH_FORWARD
@@ -70,6 +71,7 @@
size: buttonTextSize
baselineOffset: baseLineOffset
];
+self.forwardButton.accessibilityLabel =
MWLocalizedString(@menu-forward-accessibility-label, nil);
self.forwardButton.tag = BOTTOM_MENU_BUTTON_NEXT;
// self.forwardButton.label.transform = CGAffineTransformMakeScale(-1, 1);
@@ -79,6 +81,7 @@
baselineOffset: baseLineOffset + 1.0
];
self.rightButton.tag = BOTTOM_MENU_BUTTON_SHARE;
+self.rightButton.accessibilityLabel =
MWLocalizedString(@menu-share-accessibility-label, nil);
self.allButtons = @[self.backButton, self.forwardButton, self.rightButton];
diff --git a/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m
index fc76834..c25bcd6 100644
--- a/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
@@ -73,6 +73,7 @@
size: 64
baselineOffset: 2.0
];
+self.moreButton.accessibilityLabel =
MWLocalizedString(@menu-more-accessibility-label, nil);
self.moreButton.label.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index c69007e..cc4b487 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@
[MediaWiki-commits] [Gerrit] Followup fix to fawiki AbuseFilter config - change (operations/mediawiki-config)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/152033 Change subject: Followup fix to fawiki AbuseFilter config .. Followup fix to fawiki AbuseFilter config Array needs to be set, not have another array appended as an item. Bug: 69073 Change-Id: I6385f4897bd1aca33f963cc6e4ef1c82c54c7259 --- M docroot/bits/WikipediaMobileFirefoxOS M wmf-config/abusefilter.php 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/33/152033/1 diff --git a/docroot/bits/WikipediaMobileFirefoxOS b/docroot/bits/WikipediaMobileFirefoxOS index 197eb24..cf4550e 16 --- a/docroot/bits/WikipediaMobileFirefoxOS +++ b/docroot/bits/WikipediaMobileFirefoxOS -Subproject commit 197eb243543e88827401ee47f69cf98bdbfd0cf9 +Subproject commit cf4550ee40eead816c4bb0d7aae2403d016b97a4 diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index 99c74e6..fb0f050 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -166,7 +166,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions[] = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); $wgAbuseFilterAnonBlockDuration = '3 months'; $wgAbuseFilterBlockDuration = 'indefinite'; $wgAbuseFilterNotifications = false; -- To view, visit https://gerrit.wikimedia.org/r/152033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6385f4897bd1aca33f963cc6e4ef1c82c54c7259 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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
[MediaWiki-commits] [Gerrit] Work in progress: add extensible metadata to search results ... - change (mediawiki/core)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152727
Change subject: Work in progress: add extensible metadata to search results
API
..
Work in progress: add extensible metadata to search results API
* Adds getMetadata() on SearchResult base class
** currently includes the non-default existing fields as examples
** also includes the newest Cirrus-specific fields, will want to migrate those
* If srprop=metadata passed to list=search, this array gets included if
non-empty
** appears as metadata subelement of p in XML
** appears as 'metadata':{} key in JSON
Change-Id: I88ee54b52dbd320d8f6a9cc4ae3fd7ed634a7d50
---
M includes/api/ApiQuerySearch.php
M includes/search/SearchResult.php
2 files changed, 46 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/27/152727/1
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 5ed5873..90131a7 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -179,6 +179,9 @@
if ( isset( $prop['hasrelated'] )
$result-hasRelated() ) {
$vals['hasrelated'] = '';
}
+ if ( isset( $prop['metadata'] )
$result-getMetadata() ) {
+ $vals['metadata'] =
$result-getMetadata();
+ }
// Add item to results and see whether it fits
$fit = $apiResult-addValue( array( 'query',
$this-getModuleName() ),
@@ -294,6 +297,7 @@
'sectiontitle',
'sectionsnippet',
'hasrelated',
+ 'metadata',
),
ApiBase::PARAM_ISMULTI = true,
),
diff --git a/includes/search/SearchResult.php b/includes/search/SearchResult.php
index d51bff7..7d41a96 100644
--- a/includes/search/SearchResult.php
+++ b/includes/search/SearchResult.php
@@ -265,4 +265,46 @@
function isFileMatch() {
return false;
}
+
+ /**
+* Get additional metadata fields, totally extensible by the engine.
+* Exposed to API search query only when asking for 'srprop=metadata'
+*
+* Recommend using key = string pairs, keep it simple!
+*
+* @return array
+*/
+ function getMetadata() {
+ // Old fields that aren't in the default set
+ // Not sure if we want to keep these? But good to demo with.
+ $metadata = array();
+ if ( $this-getTitleSnippet() !== '') {
+ $metadata['titleSnippet'] = $this-getTitleSnippet();
+ }
+ if ( $this-getRedirectTitle() != '' ) {
+ $metadata['redirectTitle'] = $this-getRedirectTitle();
+ }
+ if ( $this-getRedirectSnippet() != '' ) {
+ $metadata['redirectSnippet'] =
$this-getRedirectSnippet();
+ }
+ if ( $this-getSectionTitle() !== null ) {
+ $metadata['sectionTitle'] =
$this-getSectionTitle()-getFragment();
+ }
+ if ( $this-getSectionSnippet() != '') {
+ $metadata['sectionSnippet'] =
$this-getSectionSnippet();
+ }
+ if ( $this-hasRelated() ) {
+ $metadata['sectionSnippet'] = '';
+ }
+
+ // New fields, definitely want these going in here
+ // Probably will kill the old getters/setters
+ if ( $this-isFileMatch() ) {
+ $metadata['isFileMatch'] = '';
+ }
+ if ( $this-getInterwikiNamespaceText() !== '' ) {
+ $metadata['interwikiNamespaceText'] =
$this-getInterwikiNamespaceText();
+ }
+ return $metadata;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/152727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88ee54b52dbd320d8f6a9cc4ae3fd7ed634a7d50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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
[MediaWiki-commits] [Gerrit] Re-enable references panel. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Re-enable references panel.
..
Re-enable references panel.
Change-Id: I03519019e62b32625cbd4dd4d0384d9020c6d66d
---
M wikipedia/View Controllers/References/ReferenceVC.m
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/bundle.js
M www/js/listeners.js
4 files changed, 24 insertions(+), 10 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View Controllers/References/ReferenceVC.m
b/wikipedia/View Controllers/References/ReferenceVC.m
index c8c435c..660bc5e 100644
--- a/wikipedia/View Controllers/References/ReferenceVC.m
+++ b/wikipedia/View Controllers/References/ReferenceVC.m
@@ -136,7 +136,7 @@
[self.referenceWebView loadHTMLString:html baseURL:[NSURL
URLWithString:@]];
-CGFloat topInset = 32;
+CGFloat topInset = 35;
CGFloat bottomInset = (NSFoundationVersionNumber
NSFoundationVersionNumber_iOS_6_1) ? 0 : topInset;
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 18f5e7d..c178b5c 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -2126,6 +2126,17 @@
[self updateReferencesHeightAndBottomConstraints];
}
+-(BOOL)didFindReferencesInPayload:(NSDictionary *)payload
+{
+NSArray *refs = payload[@refs];
+if (!refs || (refs.count == 0)) return NO;
+if (refs.count == 1) {
+NSString *firstRef = refs[0];
+if ([firstRef isEqualToString:@]) return NO;
+}
+return YES;
+}
+
-(void)referencesShow:(NSDictionary *)payload
{
if (!self.referencesHidden){
@@ -2134,6 +2145,15 @@
return;
}
+// Don't show refs panel if reference data has yet to be retrieved. The
+// reference parsing javascript can't parse until the reference section
html has
+// been retrieved. If user taps a reference link while the non-lead
sections are
+// still being retrieved we need to just not show the panel rather than
showing a
+// useless blank panel.
+if (![self didFindReferencesInPayload:payload]) {
+return;
+}
+
self.referencesVC = [self.navigationController.storyboard
instantiateViewControllerWithIdentifier:@ReferencesVC];
self.referencesVC.webVC = self;
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 990bb7a..0d5d71a 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -242,13 +242,10 @@
if ( anchorTarget (anchorTarget.tagName === A) ) {
var href = anchorTarget.getAttribute( href );
-/*
if ( refs.isReference( href ) ) {
// Handle reference links with a popup view instead of scrolling
about!
refs.sendNearbyReferences( anchorTarget );
-} else
-*/
-if ( href[0] === # ) {
+} else if ( href[0] === # ) {
// If it is a link to an anchor in the current page, just scroll
to it
document.getElementById( href.substring( 1 ) ).scrollIntoView();
} else {
@@ -576,4 +573,4 @@
}
}
-},{}]},{},[1,2,3,4,5,6,7,8])
+},{}]},{},[1,2,3,4,5,6,7,8])
\ No newline at end of file
diff --git a/www/js/listeners.js b/www/js/listeners.js
index aaec41f..be833bf 100644
--- a/www/js/listeners.js
+++ b/www/js/listeners.js
@@ -146,13 +146,10 @@
if ( anchorTarget (anchorTarget.tagName === A) ) {
var href = anchorTarget.getAttribute( href );
-/*
if ( refs.isReference( href ) ) {
// Handle reference links with a popup view instead of scrolling
about!
refs.sendNearbyReferences( anchorTarget );
-} else
-*/
-if ( href[0] === # ) {
+} else if ( href[0] === # ) {
// If it is a link to an anchor in the current page, just scroll
to it
document.getElementById( href.substring( 1 ) ).scrollIntoView();
} else {
--
To view, visit https://gerrit.wikimedia.org/r/152091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03519019e62b32625cbd4dd4d0384d9020c6d66d
Gerrit-PatchSet: 3
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Untested tweak for Chinese variants on Android app - change (translatewiki)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/153031 Change subject: Untested tweak for Chinese variants on Android app .. Untested tweak for Chinese variants on Android app Bug: 69304 Change-Id: I06d4ef059e72d15ed9fd00986ac9d0d9bb7ddd8d --- M groups/Wikimedia/WikimediaMobile-android.yaml 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/31/153031/1 diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml b/groups/Wikimedia/WikimediaMobile-android.yaml index 8799e3a..e90aff1 100644 --- a/groups/Wikimedia/WikimediaMobile-android.yaml +++ b/groups/Wikimedia/WikimediaMobile-android.yaml @@ -8,6 +8,8 @@ FILES: class: AndroidXmlFFS codeMap: + zh-hans: zh-rCN + zh-hant: zh-rTW qqq: qq MANGLER: @@ -195,7 +197,8 @@ - yi - yo - za - - zh + - zh-hans + - zh-hant - zu --- BASIC: -- To view, visit https://gerrit.wikimedia.org/r/153031 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06d4ef059e72d15ed9fd00986ac9d0d9bb7ddd8d Gerrit-PatchSet: 1 Gerrit-Project: translatewiki 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
[MediaWiki-commits] [Gerrit] Work in progress: allow pinch-zoom on image viewer overlay - change (mediawiki...MobileFrontend)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153543
Change subject: Work in progress: allow pinch-zoom on image viewer overlay
..
Work in progress: allow pinch-zoom on image viewer overlay
Switches position:fixed to position:absolute in ImageOverlay,
and adds an Overlay property 'allowZoom' which can be set to
true to disable the disabling of scroll and zoom behavior.
Briefly tested on iOS 7.1 simulator. May explode on other systems.
Bug: 69414
Change-Id: I6de82009409a28c46b36be13f67129c30f4e0891
---
M javascripts/common/Overlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
M less/modules/mediaViewer.less
3 files changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/43/153543/1
diff --git a/javascripts/common/Overlay.js b/javascripts/common/Overlay.js
index d30f969..3991df4 100644
--- a/javascripts/common/Overlay.js
+++ b/javascripts/common/Overlay.js
@@ -25,6 +25,10 @@
* @type {Boolean}
*/
fullScreen: true,
+ /**
+* @type {Boolean}
+*/
+ allowZoom: false,
/**
* use '#mw-mf-viewport' rather than 'body' - for some reasons
this has
@@ -88,7 +92,9 @@
( $overlayContent.scrollTop()
=== 0 startY y ) ||
( $overlayContent.scrollTop()
=== contentLenght startY y )
) {
- ev.preventDefault();
+ if ( !self.allowZoom ) {
+ ev.preventDefault();
+ }
}
} );
@@ -138,7 +144,9 @@
if ( M.isIos ) {
$window
.on( 'touchmove.ios', function( ev ) {
- ev.preventDefault();
+ if ( !self.allowZoom ) {
+ ev.preventDefault();
+ }
} )
.on( 'resize.ios', function() {
self._resizeContent(
$window.height() );
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 43362f1..5e450f0 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -14,6 +14,7 @@
className: 'overlay media-viewer',
template: M.template.get( 'modules/ImageOverlay.hogan' ),
closeOnBack: true,
+ allowZoom: true,
defaults: {
detailsMsg: mw.msg( 'mobile-frontend-media-details' ),
@@ -56,6 +57,7 @@
show: function() {
this._super();
this._positionImage();
+ M.unlockViewport();
},
_positionImage: function() {
diff --git a/less/modules/mediaViewer.less b/less/modules/mediaViewer.less
index 42a3b6b..abe09e8 100644
--- a/less/modules/mediaViewer.less
+++ b/less/modules/mediaViewer.less
@@ -6,13 +6,13 @@
padding-top: 0;
.main {
- height: auto;
- position: relative;
+ position: absolute;
width: 100%;
+ height: 100%;
}
.image-wrapper {
- position: fixed;
+ position: absolute;
left: 0;
right: 0;
top: 0;
@@ -56,7 +56,7 @@
.details {
bottom: 0;
height: auto;
- position: fixed;
+ position: absolute;
width: 100%;
padding: 8px 10px;
margin: 0;
--
To view, visit https://gerrit.wikimedia.org/r/153543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6de82009409a28c46b36be13f67129c30f4e0891
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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
[MediaWiki-commits] [Gerrit] Disabled the article loading messages. They got annoying. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Disabled the article loading messages. They got annoying.
..
Disabled the article loading messages. They got annoying.
Change-Id: If19bbd64e18425be30211558f128c9a4f9189a86
---
M wikipedia/View Controllers/WebView/WebViewController.m
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index c178b5c..3bcfb4e 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1268,7 +1268,7 @@
[self hideKeyboard];
// Show loading message
-[self showAlert:MWLocalizedString(@search-loading-section-zero, nil)];
+//[self showAlert:MWLocalizedString(@search-loading-section-zero, nil)];
if (invalidateCache) [self invalidateCacheForPageTitle:title
domain:domain];
@@ -1354,7 +1354,7 @@
// If article with sections just show them (unless needsRefresh is YES)
if (article.section.count 0 !article.needsRefresh.boolValue) {
[self displayArticle:articleID mode:DISPLAY_ALL_SECTIONS];
-[self
showAlert:MWLocalizedString(@search-loading-article-loaded, nil)];
+//[self
showAlert:MWLocalizedString(@search-loading-article-loaded, nil)];
[self fadeAlert];
return;
}
@@ -1426,7 +1426,7 @@
}];
[self displayArticle:articleID mode:DISPLAY_APPEND_NON_LEAD_SECTIONS];
-[self showAlert:MWLocalizedString(@search-loading-article-loaded,
nil)];
+//[self showAlert:MWLocalizedString(@search-loading-article-loaded,
nil)];
[self fadeAlert];
} cancelledBlock:^(NSError *error){
@@ -1581,7 +1581,7 @@
}];
[self displayArticle:articleID mode:DISPLAY_LEAD_SECTION];
-[self showAlert:MWLocalizedString(@search-loading-section-remaining,
nil)];
+//[self
showAlert:MWLocalizedString(@search-loading-section-remaining, nil)];
} cancelledBlock:^(NSError *error){
--
To view, visit https://gerrit.wikimedia.org/r/153342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If19bbd64e18425be30211558f128c9a4f9189a86
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: Ieb31c8323d2e502f2b886952b312686b3c634b9e --- M wikipedia/ast.lproj/Localizable.strings A wikipedia/av.lproj/Main_iPhone.strings M wikipedia/br.lproj/Localizable.strings M wikipedia/ca.lproj/Localizable.strings M wikipedia/ca.lproj/Main_iPhone.strings M wikipedia/ce.lproj/Localizable.strings M wikipedia/de.lproj/Localizable.strings M wikipedia/es.lproj/Localizable.strings M wikipedia/fi.lproj/Localizable.strings M wikipedia/fr.lproj/Localizable.strings M wikipedia/he.lproj/Localizable.strings M wikipedia/lb.lproj/Localizable.strings M wikipedia/mk.lproj/Localizable.strings M wikipedia/nl.lproj/Localizable.strings M wikipedia/nl.lproj/Main_iPhone.strings M wikipedia/pl.lproj/Localizable.strings M wikipedia/pt.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/ro.lproj/Localizable.strings M wikipedia/ru.lproj/Localizable.strings M wikipedia/sk.lproj/Localizable.strings M wikipedia/sk.lproj/Main_iPhone.strings M wikipedia/sv.lproj/Localizable.strings A wikipedia/wuu.lproj/InfoPlist.strings M wikipedia/zh-hans.lproj/Localizable.strings M wikipedia/zh-hant.lproj/Localizable.strings M wikipedia/zh-hant.lproj/Main_iPhone.strings 27 files changed, 275 insertions(+), 30 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/ast.lproj/Localizable.strings b/wikipedia/ast.lproj/Localizable.strings index 9074827..ea7e178 100644 --- a/wikipedia/ast.lproj/Localizable.strings +++ b/wikipedia/ast.lproj/Localizable.strings @@ -169,3 +169,14 @@ abuse-filter-disallow-heading = Nun pues guardar esta edición. Por favor vuelvi atrás y cámbiala.; abuse-filter-disallow-unconstructive = Un filtru automático identificó esta edición como potencialmente non constructiva o como intentu de vandalismu.; abuse-filter-disallow-notable = Wikipedia ye una enciclopedia y sólo cabe equí el conteníu neutral y notable.; +menu-edit-accessibility-label = Editar; +menu-close-accessibility-label = Zarrar; +menu-preview-accessibility-label = Vista previa; +menu-back-accessibility-label = Anterior; +menu-forward-accessibility-label = Siguiente; +menu-w-accessibility-label = Menú; +menu-toc-accessibility-label = Conteníu; +menu-search-accessibility-label = Guetar; +menu-cancel-accessibility-label = Encaboxar; +menu-share-accessibility-label = Compartir; +menu-more-accessibility-label = Más axustes; diff --git a/wikipedia/av.lproj/Main_iPhone.strings b/wikipedia/av.lproj/Main_iPhone.strings new file mode 100644 index 000..588cc32 --- /dev/null +++ b/wikipedia/av.lproj/Main_iPhone.strings @@ -0,0 +1,12 @@ +// Messages for Avaric (авар) +// Exported from translatewiki.net +// Author: Gazimagomedov +// Author: Аль-Гимравий + +5cT-2Y-0Ie.placeholder = ГIахьалчиясул цIар; +LfM-01-aCF.text = ЦIебесеб; +P6J-IE-CiO.text = Гъоркьо биччантезе; +PCr-0J-fBj.placeholder = Пароль; +Wff-o9-AdH.text = Жаниве лъугьине; +jiW-Cg-oL3.text = Аккаунт гьабизе; +mAk-1N-jPC.placeholder = ГIахьалчиясул цIар; diff --git a/wikipedia/br.lproj/Localizable.strings b/wikipedia/br.lproj/Localizable.strings index 5c6a429..ee951bc 100644 --- a/wikipedia/br.lproj/Localizable.strings +++ b/wikipedia/br.lproj/Localizable.strings @@ -150,3 +150,12 @@ abuse-filter-warning-subheading = E-barzh hoc'h aozadenn e c'hall bezañ unan eus an elfennoù-mañ :; abuse-filter-warning-caps = Testenn e PENNLIZHERENNOÙ; abuse-filter-warning-repeat = Arouezennoù adskrivet; +menu-edit-accessibility-label = Kemmañ; +menu-close-accessibility-label = Serriñ; +menu-preview-accessibility-label = Rakwelet; +menu-back-accessibility-label = Distreiñ; +menu-forward-accessibility-label = Treuzkas; +menu-w-accessibility-label = Lañser; +menu-search-accessibility-label = Klask; +menu-cancel-accessibility-label = Nullañ; +menu-share-accessibility-label = Rannañ; diff --git a/wikipedia/ca.lproj/Localizable.strings b/wikipedia/ca.lproj/Localizable.strings index 5a39ae4..dcf6a79 100644 --- a/wikipedia/ca.lproj/Localizable.strings +++ b/wikipedia/ca.lproj/Localizable.strings @@ -139,3 +139,13 @@ license-footer-text = El contingut està disponible sota $1; license-footer-name = CC-BY-SA 3.0; table-of-contents-heading = Continguts; +menu-edit-accessibility-label = Edita; +menu-close-accessibility-label = Tanca; +menu-preview-accessibility-label = Vista prèvia; +menu-back-accessibility-label = Enrere; +menu-forward-accessibility-label = Endavant; +menu-w-accessibility-label = Menú; +menu-toc-accessibility-label = Contingut; +menu-search-accessibility-label = Cerca; +menu-cancel-accessibility-label = Cancel·la; +menu-share-accessibility-label = Comparteix; diff --git a/wikipedia/ca.lproj/Main_iPhone.strings b/wikipedia/ca.lproj/Main_iPhone.strings index 9ab5f47..281603a 100644 ---
[MediaWiki-commits] [Gerrit] Dom transformations no longer thrash. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Dom transformations no longer thrash.
..
Dom transformations no longer thrash.
Much faster!
Fix for enwiki Soviet Union article (and others surely) issue.
Rebased and fixed edit pencil not showing issue.
Adjusted capitalization and selectors based on comments.
Change-Id: I8181e7de92fbbc3d71eff5a70bc9c8de2d52e670
---
M wikipedia/assets/bundle.js
M www/js/listeners.js
M www/js/transformer.js
M www/js/transforms.js
D www/js/wikihacks.js
5 files changed, 181 insertions(+), 293 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 0d5d71a..f646105 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -95,7 +95,6 @@
},{}],3:[function(require,module,exports){
var bridge = require(./bridge);
-var wikihacks = require(./wikihacks);
var transformer = require(./transformer);
var refs = require(./refs);
@@ -125,47 +124,20 @@
bridge.registerListener( append, function( payload ) {
// Append html without losing existing event handlers
// From: http://stackoverflow.com/a/595825
-var content = document.getElementById(content);
+
var newcontent = document.createElement('div');
newcontent.innerHTML = payload.html;
-
-var isFirstSection = true;
-while (newcontent.firstChild) {
-var section = newcontent.removeChild(newcontent.firstChild);
-if (section.nodeType == Node.ELEMENT_NODE) {
-if (isFirstSection) {
-section = transformer.transform( leadSection, section );
-isFirstSection = false;
-}
-section = transformer.transform( section, section );
-}
-content.appendChild(section);
-}
-// Things which need to happen any time data is appended.
-//TODO: later could optimize to only perform actions on elements found
-// within the content div which was appended).
-
-// TODO: migrate these into common transforms?
-
-wikihacks.putWideTablesInDivs();
-/*
-wikihacks.makeTablesNotBlockIfSafeToDoSo();
-wikihacks.reduceWeirdWebkitMargin();
- */
-wikihacks.hideAudioTags();
-/*
-wikihacks.allowDivWidthsToFlow();
-*/
-wikihacks.tweakFilePage();
-});
-
-bridge.registerListener( prepend, function( payload ) {
-// Prepend html without losing existing event handlers
+transformer.transform( relocateInfobox, newcontent );
+transformer.transform( hideRedlinks, newcontent );
+transformer.transform( disableFilePageEdit, newcontent );
+transformer.transform( hideAudioTags, newcontent );
+transformer.transform( overflowWideTables, newcontent );
+
var content = document.getElementById(content);
-var newcontent = document.createElement('div');
-newcontent.innerHTML = payload.html;
-content.insertBefore(newcontent, content.firstChild);
+// Ensure we've done transforms *before* appending the new content.
+// Otherwise the web view dom will thrash.
+content.appendChild(newcontent);
});
bridge.registerListener( remove, function( payload ) {
@@ -286,7 +258,7 @@
document.addEventListener(touchend, touchEnd, false);
-},{./bridge:1,./refs:5,./transformer:6,./wikihacks:8}],4:[function(require,module,exports){
+},{./bridge:1,./refs:5,./transformer:6}],4:[function(require,module,exports){
var bridge = require(./bridge);
var elementLocation = require(./elementLocation);
@@ -433,9 +405,8 @@
Transformer.prototype.transform = function( transform, element ) {
var functions = transforms[transform];
for ( var i = 0; i functions.length; i++ ) {
-element = functions[i](element);
+functions[i](element);
}
-return element;
};
module.exports = new Transformer();
@@ -443,26 +414,46 @@
},{}],7:[function(require,module,exports){
var transformer = require(./transformer);
-// Move infobox to the bottom of the lead section
-transformer.register( leadSection, function( leadContent ) {
-var infobox = leadContent.querySelector( table.infobox );
-if ( infobox ) {
-infobox.parentNode.removeChild( infobox );
-var pTags = leadContent.getElementsByTagName( p );
-if ( pTags.length ) {
-pTags[0].appendChild( infobox );
-} else {
-leadContent.appendChild( infobox );
+transformer.register( relocateInfobox, function( content ) {
+// Move infobox after first lead section paragraph.
+
+/*
+DIV section_heading_and_content_block_0
+DIV content_block_0
+P -- Move infobox after first P element which is a direct
child of content_block_0 DIV.
+
+Old code had problem with en wiki Soviet Union article - it moved the
+infobox right after a P element which was contained by a hidden vcard
TABLE.
+*/
+
+var
[MediaWiki-commits] [Gerrit] Further protection against corrupting css on build and sync. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Further protection against corrupting css on build and sync.
..
Further protection against corrupting css on build and sync.
Updated error code range comparisons based on comments.
Change-Id: I47b61a143d6f02e61be4081a1036754f407ea453
---
M scripts/make-css-assets.bash
M wikipedia/Data/Operations/SyncAssetsFileOp.m
M wikipedia/mw-network/MWNetworkOp.h
M wikipedia/mw-network/MWNetworkOp.m
4 files changed, 32 insertions(+), 10 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/scripts/make-css-assets.bash b/scripts/make-css-assets.bash
index e3a59c3..10b44f2 100755
--- a/scripts/make-css-assets.bash
+++ b/scripts/make-css-assets.bash
@@ -5,8 +5,8 @@
PREFIX=http://bits.wikimedia.org/en.wikipedia.org/load.php?debug=truelang=enonly=stylesskin=vectormodules=;
cd wikipedia/assets/ {
-curl -o 'styles.css' ${PREFIX}mobile.app.pagestyles.ios
-curl -o 'abusefilter.css' ${PREFIX}mobile.app.pagestyles.ios
-curl -o 'preview.css' ${PREFIX}mobile.app.preview
+curl -L -f -o 'styles.css' ${PREFIX}mobile.app.pagestyles.ios
+curl -L -f -o 'abusefilter.css' ${PREFIX}mobile.app.pagestyles.ios
+curl -L -f -o 'preview.css' ${PREFIX}mobile.app.preview
}
diff --git a/wikipedia/Data/Operations/SyncAssetsFileOp.m
b/wikipedia/Data/Operations/SyncAssetsFileOp.m
index 84c826d..d8c89ad 100644
--- a/wikipedia/Data/Operations/SyncAssetsFileOp.m
+++ b/wikipedia/Data/Operations/SyncAssetsFileOp.m
@@ -35,12 +35,11 @@
self.completionBlock = ^(){
[[MWNetworkActivityIndicatorManager sharedManager] pop];
-if(weakSelf.isCancelled){
-return;
-}
-
-if (weakSelf.error) {
-return;
+if (weakSelf.isCancelled || weakSelf.error) return;
+
+if (weakSelf.response) {
+// Make extra sure that weird responses don't get written.
+if (((NSHTTPURLResponse *)weakSelf.response).statusCode !=
200) return;
}
// If it got this far, then a refresh was needed and has completed.
diff --git a/wikipedia/mw-network/MWNetworkOp.h
b/wikipedia/mw-network/MWNetworkOp.h
index 721785e..fabb3e6 100644
--- a/wikipedia/mw-network/MWNetworkOp.h
+++ b/wikipedia/mw-network/MWNetworkOp.h
@@ -31,6 +31,7 @@
@property (weak) id NetworkOpDelegate delegate;
@property (copy) NSURLRequest *request;
+@property (strong, nonatomic) NSURLResponse *response;
@property (copy, readonly) NSMutableData *dataRetrieved;
@property (nonatomic) NSUInteger dataRetrievedExpectedLength;
diff --git a/wikipedia/mw-network/MWNetworkOp.m
b/wikipedia/mw-network/MWNetworkOp.m
index af37787..e7539b0 100644
--- a/wikipedia/mw-network/MWNetworkOp.m
+++ b/wikipedia/mw-network/MWNetworkOp.m
@@ -10,7 +10,6 @@
@property (nonatomic, assign, getter = isOperationStarted) BOOL
operationStarted;
@property (strong, nonatomic) NSURLConnection *connection;
-@property (strong, nonatomic) NSURLResponse *response;
@property (copy, readwrite) NSNumber *bytesWritten;
@property (copy, readwrite) NSNumber *bytesExpectedToWrite;
@@ -184,6 +183,29 @@
self.response = response;
}
+-(void)setResponse:(NSURLResponse *)response
+{
+_response = response;
+
+[self failIfBadHTTPStatusCode];
+}
+
+-(void)failIfBadHTTPStatusCode
+{
+if (!self.response) return;
+
+// If the response is a server or client error finish with an error.
+NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)self.response;
+NSInteger code = httpResponse.statusCode;
+if ((code = 400) (code = 499)) {
+[self finishWithError:[NSString stringWithFormat:@Client error. HTTP
Status Code %ld, (long)code]];
+}else if ((code = 500) (code = 599)) {
+[self finishWithError:[NSString stringWithFormat:@Server error. HTTP
Status Code %ld, (long)code]];
+}
+//NSLog(@responseStatusCode = %ld, (long)code);
+//NSLog(@allHeaderFields = %@, httpResponse.allHeaderFields);
+}
+
-(void)connectionDidFinishLoading:(NSURLConnection *)connection
{
if([self isCancelled]) {
--
To view, visit https://gerrit.wikimedia.org/r/153696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47b61a143d6f02e61be4081a1036754f407ea453
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gzip it. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Gzip it. .. Gzip it. Change-Id: I0a3751ad96b72a712fbe762833344746e7b46c03 --- M wikipedia/Categories/NSURLRequest+DictionaryRequest.m 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Categories/NSURLRequest+DictionaryRequest.m b/wikipedia/Categories/NSURLRequest+DictionaryRequest.m index caefce9..31ea032 100644 --- a/wikipedia/Categories/NSURLRequest+DictionaryRequest.m +++ b/wikipedia/Categories/NSURLRequest+DictionaryRequest.m @@ -31,7 +31,7 @@ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url]; [request setHTTPMethod:@POST]; [request addValue:@application/x-www-form-urlencoded; charset=UTF-8 forHTTPHeaderField:@Content-Type]; -[request addValue:@ forHTTPHeaderField:@Accept-Encoding]; +[request setValue:@gzip forHTTPHeaderField:@Accept-Encoding]; [request addValue:[WikipediaAppUtils versionedUserAgent] forHTTPHeaderField:@User-Agent]; // NSLog(@%@, [WikipediaAppUtils versionedUserAgent]); [self addMCCMNCToRequestIfAppropriate:request]; @@ -46,7 +46,7 @@ body = [[url.absoluteString stringByAppendingString:@?] stringByAppendingString:body]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:body]]; [request setHTTPMethod:@GET]; -[request addValue:@ forHTTPHeaderField:@Accept-Encoding]; +[request setValue:@gzip forHTTPHeaderField:@Accept-Encoding]; [request addValue:[WikipediaAppUtils versionedUserAgent] forHTTPHeaderField:@User-Agent]; // NSLog(@%@, [WikipediaAppUtils versionedUserAgent]); [request addValue:@application/x-www-form-urlencoded forHTTPHeaderField:@Content-Type]; -- To view, visit https://gerrit.wikimedia.org/r/154728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a3751ad96b72a712fbe762833344746e7b46c03 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for scrolling when TOC onscreen. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Fix for scrolling when TOC onscreen. .. Fix for scrolling when TOC onscreen. Needed because we added doctype so no longer using quirks mode. So we we need to specify px for spacer height now. Change-Id: Iea4422fbdad723daffb0201c95211bede07fb8b8 --- M wikipedia/View Controllers/WebView/WebViewController.m 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Brion VIBBER: Looks good to me, approved diff --git a/wikipedia/View Controllers/WebView/WebViewController.m b/wikipedia/View Controllers/WebView/WebViewController.m index ea78b64..3ef3862 100644 --- a/wikipedia/View Controllers/WebView/WebViewController.m +++ b/wikipedia/View Controllers/WebView/WebViewController.m @@ -1844,7 +1844,10 @@ // This is important! Ensures bottom of web view article can be scrolled closer to the top of // the screen. Works in conjunction with limitScrollUp: method. -[sectionTextArray addObject: [NSString stringWithFormat:@div style='height:%d;background-color:white;'/div, BOTTOM_SCROLL_LIMIT_HEIGHT]]; +// Note: had to add px to the height because we added !DOCTYPE html to the top +// of the index.html - it won't actually give the div height w/o this now (no longer +// using quirks mode now that doctype specified). +[sectionTextArray addObject: [NSString stringWithFormat:@div style='height:%dpx;background-color:white;'/div, BOTTOM_SCROLL_LIMIT_HEIGHT]]; } -- To view, visit https://gerrit.wikimedia.org/r/169610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea4422fbdad723daffb0201c95211bede07fb8b8 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleaned up About page text a bit. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Cleaned up About page text a bit. .. Cleaned up About page text a bit. Change-Id: I64306bafd293b12d317a379d54f3884a582db531 --- M wikipedia/View Controllers/About/AboutViewController.m M wikipedia/en.lproj/Localizable.strings 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Brion VIBBER: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/View Controllers/About/AboutViewController.m b/wikipedia/View Controllers/About/AboutViewController.m index bdee482..d160665 100644 --- a/wikipedia/View Controllers/About/AboutViewController.m +++ b/wikipedia/View Controllers/About/AboutViewController.m @@ -158,7 +158,7 @@ setDivHTML(@feedback_body, [self getLinkHTMLForURL:self.feedbackURL title:MWLocalizedString(@about-send-feedback, nil)]); NSString *twnUrl = self.urls[@twn]; -NSString *translatorsLink = [self getLinkHTMLForURL:twnUrl title:twnUrl]; +NSString *translatorsLink = [self getLinkHTMLForURL:twnUrl title:[twnUrl substringFromIndex:7]]; NSString *translatorDetails = [MWLocalizedString(@about-translators-details, nil) stringByReplacingOccurrencesOfString: @$1 withString: translatorsLink]; diff --git a/wikipedia/en.lproj/Localizable.strings b/wikipedia/en.lproj/Localizable.strings index c9159ee..8d2212e 100644 --- a/wikipedia/en.lproj/Localizable.strings +++ b/wikipedia/en.lproj/Localizable.strings @@ -162,7 +162,7 @@ about-wikipedia = Wikipedia; about-contributors = contributors; about-translators = translators; -about-translators-details = This app was translated by the volunteer translators at $1; +about-translators-details = Translated by volunteers at $1; about-libraries = libraries used; about-repositories = repositories; about-send-feedback = Send app feedback; -- To view, visit https://gerrit.wikimedia.org/r/169859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64306bafd293b12d317a379d54f3884a582db531 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump ver to 4.0.5 (really should do this before beta releases!) - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Bump ver to 4.0.5 (really should do this before beta releases!) .. Bump ver to 4.0.5 (really should do this before beta releases!) Change-Id: Ibab2af0fac7d9856348ced6c514aacc3ec4f3490 --- M wikipedia/Wikipedia-Info.plist 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index abeb8eb..122e901 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -17,11 +17,11 @@ keyCFBundlePackageType/key stringAPPL/string keyCFBundleShortVersionString/key - string4.0.4/string + string4.0.5/string keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0.4.0/string + string4.0.5.0/string keyLSRequiresIPhoneOS/key true/ keyNSLocationWhenInUseUsageDescription/key -- To view, visit https://gerrit.wikimedia.org/r/170159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibab2af0fac7d9856348ced6c514aacc3ec4f3490 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump ver to 4.0.5 (really should do this before beta releases!) - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/170159 Change subject: Bump ver to 4.0.5 (really should do this before beta releases!) .. Bump ver to 4.0.5 (really should do this before beta releases!) Change-Id: Ibab2af0fac7d9856348ced6c514aacc3ec4f3490 --- M wikipedia/Wikipedia-Info.plist 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/59/170159/1 diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index abeb8eb..122e901 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -17,11 +17,11 @@ keyCFBundlePackageType/key stringAPPL/string keyCFBundleShortVersionString/key - string4.0.4/string + string4.0.5/string keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0.4.0/string + string4.0.5.0/string keyLSRequiresIPhoneOS/key true/ keyNSLocationWhenInUseUsageDescription/key -- To view, visit https://gerrit.wikimedia.org/r/170159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibab2af0fac7d9856348ced6c514aacc3ec4f3490 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
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: I93f8786f3f8fc4f6ce60c88eb04c92cde1a526eb --- M wikipedia/de.lproj/Localizable.strings M wikipedia/es.lproj/Localizable.strings M wikipedia/fa.lproj/Localizable.strings M wikipedia/fr.lproj/Localizable.strings M wikipedia/he.lproj/Localizable.strings M wikipedia/ja.lproj/Localizable.strings M wikipedia/mk.lproj/Localizable.strings M wikipedia/ms.lproj/Localizable.strings M wikipedia/nl.lproj/Localizable.strings M wikipedia/nl.lproj/Main_iPhone.strings M wikipedia/pl.lproj/Localizable.strings M wikipedia/pt.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/ro.lproj/Localizable.strings M wikipedia/ru.lproj/Localizable.strings M wikipedia/sk.lproj/Localizable.strings M wikipedia/sv.lproj/Localizable.strings M wikipedia/zh-hans.lproj/Localizable.strings 18 files changed, 232 insertions(+), 68 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/de.lproj/Localizable.strings b/wikipedia/de.lproj/Localizable.strings index b45bcae..a365956 100644 --- a/wikipedia/de.lproj/Localizable.strings +++ b/wikipedia/de.lproj/Localizable.strings @@ -95,6 +95,7 @@ main-menu-send-feedback = App-Rückmeldung senden; main-menu-show-page-history = Versionsgeschichte der Änderungen an $1; main-menu-credits = Danksagungen; +main-menu-about = Über die Wikipedia-App; main-menu-zero-faq = FAQ zu Wikipedia Zero; main-menu-privacy-policy = Datenschutzrichtlinie; main-menu-terms-of-use = Nutzungsbedingungen; @@ -142,6 +143,16 @@ credits-gerrit-repo = App-Hauptrepositorium (Gerrit); credits-github-mirror = App-Mirror (GitHub); credits-external-libraries = Extern; +about-title = Über; +about-wikipedia = Wikipedia; +about-contributors = Autoren; +about-translators = Übersetzer; +about-translators-details = Diese App wurde von freiwilligen Übersetzern auf $1 übersetzt; +about-libraries = Verwendete Bibliotheken; +about-repositories = Repositorien; +about-send-feedback = App-Rückmeldung senden; +about-product-of = Ein Produkt der $1; +about-wikimedia-foundation = Wikimedia Foundation; share-menu-save-page = Seite speichern; share-menu-page-saved = Seite gespeichert; share-menu-page-saved-access = Tipp: Um auf deine gespeicherten Seiten zuzugreifen, tippe oben auf $1 oder halte unten $2 gedrückt.; diff --git a/wikipedia/es.lproj/Localizable.strings b/wikipedia/es.lproj/Localizable.strings index 3f85bf0..01caf44 100644 --- a/wikipedia/es.lproj/Localizable.strings +++ b/wikipedia/es.lproj/Localizable.strings @@ -75,7 +75,7 @@ open-link-title = Abrir enlace; open-link-cancel = Cancelar; search-searching = Buscando…; -search-no-matches = No hay coincidencias encontradas para el término de búsqueda.; +search-no-matches = No se encontraron coincidencias para el término de búsqueda.; search-field-placeholder-text = Buscar en Wikipedia; search-field-placeholder-text-zero = Buscar en Wikipedia Zero; search-loading-section-zero = Cargando la primera sección del artículo…; @@ -100,6 +100,7 @@ main-menu-send-feedback = Enviar comentarios para la aplicación; main-menu-show-page-history = Historial de cambios de $1; main-menu-credits = Créditos; +main-menu-about = Acerca de la aplicación de Wikipedia; main-menu-zero-faq = P+F de Wikipedia Zero; main-menu-privacy-policy = Política de privacidad; main-menu-terms-of-use = Términos de uso; @@ -136,7 +137,7 @@ edit-summary-choice-added-missing-info = Añadida información faltante; edit-summary-choice-added-clarification = Aclaración añadida; edit-summary-choice-other = Otro; -edit-summary-description = Un resumen específico ayuda a los co-editores a revisar rápidamente sus ediciones. También puede escoger entre las etiquetas de abajo.; +edit-summary-description = Un resumen específico ayuda a los co-editores a revisar rápidamente tus ediciones. También puedes escoger entre las etiquetas de abajo.; edit-summary-field-placeholder-text = Otras formas en las que mejoraste la página; edit-summary-title = ¿Cómo has mejorado el artículo?; fetching-random-article = Obteniendo artículo al azar; @@ -147,6 +148,16 @@ credits-gerrit-repo = Rep. principal de aplicación (Gerrit); credits-github-mirror = App espejo (GitHub); credits-external-libraries = Repositorios externos; +about-title = Acerca de; +about-wikipedia = Wikipedia; +about-contributors = colaboradores; +about-translators = traductores; +about-translators-details = Esta aplicación fue traducida por los traductores voluntarios en $1; +about-libraries = bibliotecas usadas; +about-repositories = repositorios; +about-send-feedback = Enviar comentarios sobre la aplicación; +about-product-of = Un producto de la $1; +about-wikimedia-foundation = Fundación Wikimedia; share-menu-save-page = Guardar página;
[MediaWiki-commits] [Gerrit] bump build number after updating localizations - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: bump build number after updating localizations .. bump build number after updating localizations Change-Id: I81fb13215d699c567a777df282f4c2d17aff5b34 --- M wikipedia/Wikipedia-Info.plist 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index 122e901..e167af3 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -21,7 +21,7 @@ keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0.5.0/string + string4.0.5.2/string keyLSRequiresIPhoneOS/key true/ keyNSLocationWhenInUseUsageDescription/key -- To view, visit https://gerrit.wikimedia.org/r/170172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81fb13215d699c567a777df282f4c2d17aff5b34 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump build number after updating localizations - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/170172 Change subject: bump build number after updating localizations .. bump build number after updating localizations Change-Id: I81fb13215d699c567a777df282f4c2d17aff5b34 --- M wikipedia/Wikipedia-Info.plist 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/72/170172/1 diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index 122e901..e167af3 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -21,7 +21,7 @@ keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0.5.0/string + string4.0.5.2/string keyLSRequiresIPhoneOS/key true/ keyNSLocationWhenInUseUsageDescription/key -- To view, visit https://gerrit.wikimedia.org/r/170172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81fb13215d699c567a777df282f4c2d17aff5b34 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
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: Ic407a971c4a83cd578fd4d9a3af131f2343c52aa --- M wikipedia/da.lproj/Localizable.strings A wikipedia/km.lproj/InfoPlist.strings A wikipedia/km.lproj/Localizable.strings A wikipedia/km.lproj/Main_iPhone.strings M wikipedia/ko.lproj/Localizable.strings M wikipedia/nb.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/sk.lproj/Localizable.strings M wikipedia/vi.lproj/Localizable.strings M wikipedia/zh-hans.lproj/Localizable.strings M wikipedia/zh-hant.lproj/Localizable.strings 11 files changed, 282 insertions(+), 12 deletions(-) Approvals: Brion VIBBER: Looks good to me, approved diff --git a/wikipedia/da.lproj/Localizable.strings b/wikipedia/da.lproj/Localizable.strings index f3083ad..dbdfbee 100644 --- a/wikipedia/da.lproj/Localizable.strings +++ b/wikipedia/da.lproj/Localizable.strings @@ -95,6 +95,7 @@ main-menu-send-feedback = Send tilbagemelding om app; main-menu-show-page-history = Historik over redigeringer af $1; main-menu-credits = Krediteringer; +main-menu-about = Om Wikipedia-appen; main-menu-zero-faq = Ofte stillede spørgsmål om Wikipedia Zero; main-menu-privacy-policy = Behandling af personlige oplysninger; main-menu-terms-of-use = Vilkår for anvendelse; @@ -142,6 +143,15 @@ credits-gerrit-repo = App main (Gerrit); credits-github-mirror = App mirror (GitHub); credits-external-libraries = Eksterne arkiver; +about-title = Om; +about-wikipedia = Wikipedia; +about-contributors = bidragsydere; +about-translators = oversættere; +about-translators-details = Oversat af frivillige på $1; +about-libraries = anvendte biblioteker; +about-send-feedback = Send tilbagemelding om app; +about-product-of = Et produkt af $1; +about-wikimedia-foundation = Wikimedia Foundation; share-menu-save-page = Gem side; share-menu-page-saved = Gemt til læsning offline.; share-menu-page-saved-access = Tip: for at få adgang til dine gemte sider, tryk på $1 ovenfor eller tryk længe på $2 nedenfor.; diff --git a/wikipedia/km.lproj/InfoPlist.strings b/wikipedia/km.lproj/InfoPlist.strings new file mode 100644 index 000..adcd3e1 --- /dev/null +++ b/wikipedia/km.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +// Messages for Khmer (ភាសាខ្មែរ) +// Exported from translatewiki.net +// Author: គីមស៊្រុន + +CFBundleDisplayName = វិគីភីឌា; diff --git a/wikipedia/km.lproj/Localizable.strings b/wikipedia/km.lproj/Localizable.strings new file mode 100644 index 000..61304e2 --- /dev/null +++ b/wikipedia/km.lproj/Localizable.strings @@ -0,0 +1,180 @@ +// Messages for Khmer (ភាសាខ្មែរ) +// Exported from translatewiki.net +// Author: គីមស៊្រុន + +article-languages-label = ជ្រើសរើសភាសា; +article-languages-cancel = បោះបង់; +article-languages-downloading = កំពុងផ្ទុកភាសាអត្ថបទ...; +article-languages-filter-placeholder = ចម្រោះភាសា; +language-button-text = អ្នកអាចអានអត្ថបទនេះជាភាសាចំនួន %d ផ្សេងទៀត; +history-label = ថ្មីៗ; +history-section-today = ថ្ងៃនេះ; +history-section-yesterday = ម្សិលមិញ; +history-section-lastweek = សប្តាហ៍មុន; +history-section-lastmonth = ខែមុន; +history-clear-confirmation-heading = លុបរបស់ថ្មីៗទាំងអស់?; +history-clear-confirmation-sub-heading = សកម្មភាពនេះមិនអាចឈប់ធ្វើវិញបានទេ!; +history-clear-cancel = បោះបង់; +history-clear-delete-all = លុបចោលទាំងអស់; +zero-webpage-url = https://wikimediafoundation.org/wiki/Wikipedia_Zero_App_FAQ;; +zero-interstitial-title = ចាកចេញពីវិគីសូន្យ; +zero-interstitial-continue = ចាកចេញ; +zero-interstitial-cancel = មិនចាកចេញ; +zero-learn-more-learn-more = អានបន្ថែម; +zero-learn-more-no-thanks = លាក់; +zero-wikipedia-zero-heading = វិគីភីឌាសូន្យ; +zero-warn-when-leaving = រំលឹកពេលចង់ចាកចេញពីវិគីសូន្យ; +account-creation-captcha-required = ត្រូវការផ្ទៀតផ្ទាត់ CAPTCHA; +account-creation-captcha-obtaining = យក CAPTCHA ថ្មី។; +account-creation-logging-in = កំពុងកត់ឈ្មោះចូល...; +account-creation-passwords-mismatched = ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ។; +account-creation-saving = កំពុងរក្សាទុក...; +account-creation-login = តើអ្នកមានគណនីមួយរួចហើយឬ? សូមកត់ឈ្មោះចូល។; +account-creation-username-placeholder-text = អត្តនាម; +account-creation-password-placeholder-text = ពាក្យសម្ងាត់; +account-creation-password-confirm-placeholder-text = បញ្ជាក់ពាក្យសម្ងាត់; +account-creation-email-placeholder-text = អ៊ីមែល(ដាក់ក៏បានមិនដាក់ក៏បាន); +login-name-not-found = ត្រូវមានអត្តនាមដើម្បីកត់ឈ្មោះចូល។; +login-name-illegal = អ្នកបានបញ្ចូលអត្តនាមមិនត្រឹមត្រូវ។; +login-name-does-not-exist = គ្មានអត្តនាមដូចដែលអ្នកបានវាយបញ្ចូលទេ។; +login-password-empty = ត្រូវមានពាក្យសម្ងាត់ដើម្បីកត់ឈ្មោះចូល។; +login-password-wrong = ពាក្យសម្ងាត់ដែលអ្នកបានវាយបញ្ចូលមិនត្រឹមត្រូវទេ។; +login-throttled = អ្នកបានកត់ឈ្មោះចូលច្រើនដងពេកហើយក្នុងរយៈពេលខ្លីមួយ។; +login-user-blocked = អ្នកប្រើនេះត្រូវបានហាមឃាត់ហើយ។; +login-account-creation = តើអ្នកមិនទាន់មានគណនីទេឬ?
[MediaWiki-commits] [Gerrit] Support colorized zero-rating messaging - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Support colorized zero-rating messaging
..
Support colorized zero-rating messaging
Allow for a colorized zero-rating banner in the Wikipedia
for iOS app. Additionally, make memory warning-based toggle
debugging easier. Previously, only a black-n-white banner.
Change-Id: Ic5bcfe79ab80576316ae31bc09901761a5d377ce
---
M wikipedia/Networking/Fetchers/WikipediaZeroMessageFetcher.m
M wikipedia/View Controllers/WebView/WebViewController.m
2 files changed, 55 insertions(+), 14 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/Networking/Fetchers/WikipediaZeroMessageFetcher.m
b/wikipedia/Networking/Fetchers/WikipediaZeroMessageFetcher.m
index 09ebf28..0deb09a 100644
--- a/wikipedia/Networking/Fetchers/WikipediaZeroMessageFetcher.m
+++ b/wikipedia/Networking/Fetchers/WikipediaZeroMessageFetcher.m
@@ -8,6 +8,7 @@
#import NSObject+Extras.h
#import Defines.h
#import WikipediaAppUtils.h
+#import WMF_Colors.h
@interface WikipediaZeroMessageFetcher()
@@ -42,8 +43,17 @@
[[MWNetworkActivityIndicatorManager sharedManager] pop];
-// Fake out an error if non-dictionary response received.
-if(![responseObject isDict]){
+// If we're simulating with memory warnings in WebViewcontroller.m,
+// don't trigger an error for non-dictionary responses, but rather
+// simulate a received message.
+// But if we're not simulating, force an error on non-dictionary
responses.
+if ([SessionSingleton sharedInstance].zeroConfigState.fakeZeroOn) {
+responseObject = @{
+ @message: @Free Wikipedia by Test Operator,
+ @foreground: @#00FF00,
+ @background: @#ff69b4
+ };
+} else if (![responseObject isDict]) {
responseObject = @{@error: @{@info: @Wikipedia Zero message
not found.}};
}
@@ -59,7 +69,7 @@
userInfo: errorDict];
}
-NSString *output = @;
+NSDictionary *output;
if (!error) {
output = [self getSanitizedResponse:responseObject];
}
@@ -88,18 +98,46 @@
};
}
--(NSString *)getSanitizedResponse:(NSDictionary *)rawResponse
+-(NSDictionary *)getSanitizedResponse:(NSDictionary *)rawResponse
{
-NSString *zeroRatedMessage = rawResponse.count 0 ? [rawResponse
objectForKey:@message] : nil;
-
-// For testing Wikipedia Zero visual flourishes.
-// Go to WebViewController.m and uncomment the W0 part,
+// For testing Wikipedia Zero visual flourishes,
+// go to WebViewController.m and uncomment the W0 part,
// then when running the app in the simulator fire the
// memory warning to toggle the fake state on or off.
-if ([SessionSingleton sharedInstance].zeroConfigState.fakeZeroOn) {
-zeroRatedMessage = @Free Wikipedia by Test Operator;
+if (rawResponse.count == 0) {
+return nil;
}
-return zeroRatedMessage;
+
+NSString *message = rawResponse[@message];
+UIColor *foreground = [self
UIColorFromHexString:rawResponse[@foreground]];
+UIColor *background = [self
UIColorFromHexString:rawResponse[@background]];
+
+if (message foreground background) {
+return @{
+ @message: message,
+ @foreground: foreground,
+ @background: background
+ };
+}
+return nil;
+}
+
+-(UIColor *)UIColorFromHexString:(NSString*)hexString
+{
+if (hexString [hexString hasPrefix:@#] hexString.length == 7) {
+@try {
+// Tip from
https://stackoverflow.com/questions/3010216/how-can-i-convert-rgb-hex-string-into-uicolor-in-objective-c/13648705#13648705
+NSScanner *scanner = [NSScanner scannerWithString:[hexString
substringWithRange:NSMakeRange(1, 6)]];
+unsigned hex;
+if (![scanner scanHexInt:hex]) return nil;
+return UIColorFromRGBWithAlpha(hex,1.0);
+}
+
+@catch (NSException *e) {
+return nil;
+}
+}
+return nil;
}
/*
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 3ef3862..817c85a 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1658,15 +1658,17 @@
switch (status) {
case FETCH_FINAL_STATUS_SUCCEEDED:
{
-NSString *title = (NSString *)userData;
-if (title) {
+NSDictionary *banner = (NSDictionary*)userData;
+if (banner) {
TopMenuTextFieldContainer *textFieldContainer =
[MediaWiki-commits] [Gerrit] Add The Specialists Guild to the About the Wikipedia app page - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Add The Specialists Guild to the About the Wikipedia app page
..
Add The Specialists Guild to the About the Wikipedia app page
The Specialists Guild have done some amazing QA work for us, and deserve to be
credited in the About page. This patch does that!
Change-Id: Ib93b8ff363d20a6b4970d6c33d793cb35bbd151d
---
M wikipedia/View Controllers/About/AboutViewController.m
M wikipedia/View Controllers/About/AboutViewController.plist
M wikipedia/assets/about.html
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
M www/about.html
6 files changed, 22 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
diff --git a/wikipedia/View Controllers/About/AboutViewController.m
b/wikipedia/View Controllers/About/AboutViewController.m
index d160665..43f7966 100644
--- a/wikipedia/View Controllers/About/AboutViewController.m
+++ b/wikipedia/View Controllers/About/AboutViewController.m
@@ -151,6 +151,7 @@
setDivHTML(@contributors_title, MWLocalizedString(@about-contributors,
nil));
setDivHTML(@contributors_body, self.contributors);
setDivHTML(@translators_title, MWLocalizedString(@about-translators,
nil));
+setDivHTML(@testers_title, MWLocalizedString(@about-testers, nil));
setDivHTML(@libraries_title, MWLocalizedString(@about-libraries, nil));
setDivHTML(@libraries_body, self.libraryLinks);
setDivHTML(@repositories_title, MWLocalizedString(@about-repositories,
nil));
@@ -164,6 +165,13 @@
withString: translatorsLink];
setDivHTML(@translators_body, translatorDetails);
+NSString *tsgUrl = self.urls[@tsg];
+NSString *tsgLink = [self getLinkHTMLForURL:tsgUrl title:[tsgUrl
substringFromIndex:7]];
+NSString *tsgDetails =
+[MWLocalizedString(@about-testers-details, nil)
stringByReplacingOccurrencesOfString: @$1
+
withString: tsgLink];
+setDivHTML(@testers_body, tsgDetails);
+
NSString *wmfUrl = self.urls[@wmf];
NSString *foundation = [self getLinkHTMLForURL:wmfUrl
title:MWLocalizedString(@about-wikimedia-foundation, nil)];
NSString *footer =
diff --git a/wikipedia/View Controllers/About/AboutViewController.plist
b/wikipedia/View Controllers/About/AboutViewController.plist
index 24ff96c..813cd82 100644
--- a/wikipedia/View Controllers/About/AboutViewController.plist
+++ b/wikipedia/View Controllers/About/AboutViewController.plist
@@ -4,6 +4,8 @@
dict
keyurls/key
dict
+ keytsg/key
+ stringhttp://specialistsguild.org/string
keyfeedback/key
stringmailto:mobile-ios-wikipe...@wikimedia.org?subject=Feedback:$1/string
keytwn/key
diff --git a/wikipedia/assets/about.html b/wikipedia/assets/about.html
index 4137636..88d8be6 100644
--- a/wikipedia/assets/about.html
+++ b/wikipedia/assets/about.html
@@ -78,6 +78,10 @@
div id=translators_title class=titletranslators_title/div
div id=translators_bodytranslators_body/div
+
+div id=testers_title class=titletesters_title/div
+
+div id=testers_bodytesters_body/div
div id=libraries_title class=titlelibraries_title/div
diff --git a/wikipedia/en.lproj/Localizable.strings
b/wikipedia/en.lproj/Localizable.strings
index 8d2212e..7b9ffbe 100644
--- a/wikipedia/en.lproj/Localizable.strings
+++ b/wikipedia/en.lproj/Localizable.strings
@@ -161,6 +161,8 @@
about-title = About;
about-wikipedia = Wikipedia;
about-contributors = contributors;
+about-testers = testers;
+about-testers-details = QA tested by $1;
about-translators = translators;
about-translators-details = Translated by volunteers at $1;
about-libraries = libraries used;
diff --git a/wikipedia/qqq.lproj/Localizable.strings
b/wikipedia/qqq.lproj/Localizable.strings
index d57da2a..ace335f 100644
--- a/wikipedia/qqq.lproj/Localizable.strings
+++ b/wikipedia/qqq.lproj/Localizable.strings
@@ -154,6 +154,8 @@
about-contributors = Label text for contributors section of the about
page\n{{Identical|Contributor}};
about-translators = Label text for translators section of the about
page\n{{Identical|Translator}};
about-translators-details = Description of volunteer translation. $1 is
translatewiki url.;
+about-testers = Label text for testers section of the about page;
+about-testers-details = Description of the QA testers. $1 is
specialistsguild.org, the website of the testing group.;
about-libraries = Label text for libraries section of the about page;
about-repositories = Label text for repositories section of the about
page\n{{Identical|Repository}};
about-send-feedback = Link text for sending app feedback;
diff
[MediaWiki-commits] [Gerrit] Migrate all app install IDs to be the same as the old readin... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Migrate all app install IDs to be the same as the old reading
action ID.
..
Migrate all app install IDs to be the same as the old reading action ID.
As per the meeting between Product and Analytics, we're migrating all app
install IDs in all app schemas to be the same, so that the tables can be
joined and the overlap in users between features can be found.
This patch changes all app install IDs so that they're the same as the install
ID that was previously used for reading actions. That way, the analysis that's
generated on an ongoing basis by analytics will remain unchanged, whereas the
EventLogging data install IDs will all change, but simply go in to new tables.
Change-Id: I82bdfaa8446e47d1ded37b18119f818a26249a68
---
M wikipedia/EventLogging/SavedPagesFunnel.m
M wikipedia/EventLogging/ToCInteractionFunnel.h
M wikipedia/EventLogging/ToCInteractionFunnel.m
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/EventLogging/SavedPagesFunnel.m
b/wikipedia/EventLogging/SavedPagesFunnel.m
index a83cf48..1e5b9af 100644
--- a/wikipedia/EventLogging/SavedPagesFunnel.m
+++ b/wikipedia/EventLogging/SavedPagesFunnel.m
@@ -13,9 +13,9 @@
-(id)init
{
// http://meta.wikimedia.org/wiki/Schema:MobileWikiAppSavedPages
-self = [super initWithSchema:@MobileWikiAppSavedPages version:8909354];
+self = [super initWithSchema:@MobileWikiAppSavedPages version:10375480];
if (self) {
-self.appInstallID = [self persistentUUID:@SavedPages];
+self.appInstallID = [self persistentUUID:@ReadingAction];
}
return self;
}
diff --git a/wikipedia/EventLogging/ToCInteractionFunnel.h
b/wikipedia/EventLogging/ToCInteractionFunnel.h
index abda3c0..a9fe67e 100644
--- a/wikipedia/EventLogging/ToCInteractionFunnel.h
+++ b/wikipedia/EventLogging/ToCInteractionFunnel.h
@@ -10,7 +10,7 @@
@interface ToCInteractionFunnel : EventLoggingFunnel
-@property NSString *tocInteractionToken;
+@property NSString *appInstallID;
-(id)init;
-(NSDictionary *)preprocessData:(NSDictionary *)eventData;
diff --git a/wikipedia/EventLogging/ToCInteractionFunnel.m
b/wikipedia/EventLogging/ToCInteractionFunnel.m
index d89bcd3..7a5c72e 100644
--- a/wikipedia/EventLogging/ToCInteractionFunnel.m
+++ b/wikipedia/EventLogging/ToCInteractionFunnel.m
@@ -14,9 +14,9 @@
{
// https://meta.wikimedia.org/wiki/Schema:MobileWikiAppToCInteraction
self = [super initWithSchema:@MobileWikiAppToCInteraction
- version:8461467];
+ version:10375484];
if (self) {
-self.tocInteractionToken = [self persistentUUID:@ToCInteraction];
+self.appInstallID = [self persistentUUID:@ReadingAction];
}
return self;
}
@@ -24,7 +24,7 @@
-(NSDictionary *)preprocessData:(NSDictionary *)eventData
{
NSMutableDictionary *dict = [eventData mutableCopy];
-dict[@tocInteractionToken] = self.tocInteractionToken;
+dict[@appInstallID] = self.appInstallID;
return [NSDictionary dictionaryWithDictionary: dict];
}
--
To view, visit https://gerrit.wikimedia.org/r/170286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82bdfaa8446e47d1ded37b18119f818a26249a68
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for infobox relocation leaving parent table with empty s... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Fix for infobox relocation leaving parent table with empty
space.
..
Fix for infobox relocation leaving parent table with empty space.
Relocates the most distant ancestor table encountered before the
content_block_0 div is encountered. If no parent tables found it
just moves the infobox the same as before.
Change-Id: Id4733126aa843680869da47cc027f161b77e7262
---
M wikipedia/assets/bundle.js
M www/js/transforms.js
2 files changed, 34 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index eb6aa77..73c061c 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -468,6 +468,23 @@
if (!soughtP) return;
+/*
+If the infobox table itself sits within a table or series of tables,
+move the most distant ancestor table instead of just moving the
+infobox. Otherwise you end up with table(s) with a hole where the
+infobox had been. World War II article on enWiki has this issue.
+Note that we need to stop checking ancestor tables when we hit
+content_block_0.
+*/
+var infoboxParentTable = null;
+var el = infobox;
+while (el.parentNode) {
+el = el.parentNode;
+if (el.id === 'content_block_0') break;
+if (el.tagName === 'TABLE') infoboxParentTable = el;
+}
+if(infoboxParentTable)infobox = infoboxParentTable;
+
// Found the first P tag whose direct parent has id of #content_block_0.
// Now safe to detach the infobox and stick it after the P.
soughtP.appendChild(infobox.parentNode.removeChild(infobox));
diff --git a/www/js/transforms.js b/www/js/transforms.js
index ad7c55d..e9abf82 100644
--- a/www/js/transforms.js
+++ b/www/js/transforms.js
@@ -34,6 +34,23 @@
if (!soughtP) return;
+/*
+If the infobox table itself sits within a table or series of tables,
+move the most distant ancestor table instead of just moving the
+infobox. Otherwise you end up with table(s) with a hole where the
+infobox had been. World War II article on enWiki has this issue.
+Note that we need to stop checking ancestor tables when we hit
+content_block_0.
+*/
+var infoboxParentTable = null;
+var el = infobox;
+while (el.parentNode) {
+el = el.parentNode;
+if (el.id === 'content_block_0') break;
+if (el.tagName === 'TABLE') infoboxParentTable = el;
+}
+if(infoboxParentTable)infobox = infoboxParentTable;
+
// Found the first P tag whose direct parent has id of #content_block_0.
// Now safe to detach the infobox and stick it after the P.
soughtP.appendChild(infobox.parentNode.removeChild(infobox));
--
To view, visit https://gerrit.wikimedia.org/r/166066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4733126aa843680869da47cc027f161b77e7262
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Make an empty ?action= parameter default to view - change (mediawiki/core)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166200
Change subject: Revert Make an empty ?action= parameter default to view
..
Revert Make an empty ?action= parameter default to view
Breaks all non-view actions on dev wikis, something's not right with the patch.
This reverts commit a90b7ea969b4332a6229be1c4160190a3ec79200.
Change-Id: Ib9a5eb07ef48716df193fbb62a86c13e5c80dafd
---
M includes/MediaWiki.php
M includes/actions/Action.php
M includes/skins/SkinTemplate.php
M tests/phpunit/includes/actions/ActionTest.php
4 files changed, 14 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/00/166200/1
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 8ec6d35..87468bd 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -59,7 +59,7 @@
$request = $this-context-getRequest();
$curid = $request-getInt( 'curid' );
$title = $request-getVal( 'title' );
- $action = $this-getAction();
+ $action = $request-getVal( 'action', 'view' );
if ( $request-getCheck( 'search' ) ) {
// Compatibility with old search URLs which didn't use
Special:Search
@@ -229,7 +229,7 @@
throw new BadTitleError();
}
// Redirect loops, no title in URL, $wgUsePathInfo URLs, and
URLs with a variant
- } elseif ( $this-getAction() === 'view'
!$request-wasPosted()
+ } elseif ( $request-getVal( 'action', 'view' ) == 'view'
!$request-wasPosted()
( $request-getVal( 'title' ) === null
|| $title-getPrefixedDBkey() !=
$request-getVal( 'title' ) )
!count( $request-getValueNames( array( 'action',
'title' ) ) )
@@ -330,7 +330,7 @@
// Namespace might change when using redirects
// Check for redirects ...
- $action = $this-getAction();
+ $action = $request-getVal( 'action', 'view' );
$file = ( $title-getNamespace() == NS_FILE ) ?
$article-getFile() : null;
if ( ( $action == 'view' || $action == 'render' ) // ... for
actions that show content
!$request-getVal( 'oldid' ) // ... and are not old
revisions
@@ -416,7 +416,7 @@
return;
}
- if ( wfRunHooks( 'UnknownAction', array( $this-getAction(),
$page ) ) ) {
+ if ( wfRunHooks( 'UnknownAction', array( $request-getVal(
'action', 'view' ), $page ) ) ) {
$output-setStatusCode( 404 );
$output-showErrorPage( 'nosuchaction',
'nosuchactiontext' );
}
@@ -489,7 +489,8 @@
$request = $this-context-getRequest();
// Send Ajax requests to the Ajax dispatcher.
- if ( $this-config-get( 'UseAjax' ) $this-getAction() ===
'ajax' ) {
+ if ( $this-config-get( 'UseAjax' ) $request-getVal(
'action', 'view' ) == 'ajax' ) {
+
// Set a dummy title, because $wgTitle == null might
break things
$title = Title::makeTitle( NS_MAIN, 'AJAX' );
$this-context-setTitle( $title );
diff --git a/includes/actions/Action.php b/includes/actions/Action.php
index f9840ad..8d11d90 100644
--- a/includes/actions/Action.php
+++ b/includes/actions/Action.php
@@ -142,7 +142,7 @@
// Trying to get a WikiPage for NS_SPECIAL etc. will result
// in WikiPage::factory throwing Invalid or virtual namespace
-1 given.
// For SpecialPages et al, default to action=view.
- if ( $actionName === '' || !$context-canUseWikiPage() ) {
+ if ( !$context-canUseWikiPage() ) {
return 'view';
}
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 0bc980a..c1db302 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -844,7 +844,7 @@
);
// parameters
- $action = Action::getActionName( $this );
+ $action = $request-getVal( 'action', 'view' );
$userCanRead = $title-quickUserCan( 'read', $user );
diff --git a/tests/phpunit/includes/actions/ActionTest.php
b/tests/phpunit/includes/actions/ActionTest.php
index 429de4e..cc6fb11 100644
--- a/tests/phpunit/includes/actions/ActionTest.php
+++ b/tests/phpunit/includes/actions/ActionTest.php
@@ -57,6 +57,8 @@
// Null and non-existing values
array( 'null', null ),
array( 'undeclared', null ),
+ array( '', null ),
+
[MediaWiki-commits] [Gerrit] Add HiDPI PNG variants for 'Powered by MediaWiki' footer icon - change (mediawiki/core)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166416
Change subject: Add HiDPI PNG variants for 'Powered by MediaWiki' footer icon
..
Add HiDPI PNG variants for 'Powered by MediaWiki' footer icon
Added 1.5x and 2x-density variants of the 'Powered by MediaWiki' footer
icon, built from this SVG version on Commons:
https://commons.wikimedia.org/wiki/File:Powered_by_MediaWiki.svg
Note the SVG version is too large to use directly right now as it
contains a huge amount of detail; the PNGs are only a few KiB.
Renderings from Commons taken and run through pngcrush.
Note that adding 'srcset' attributes to footer icons appears to work
just fine here, so can be done for others.
Bug: 63872
Change-Id: I785d21add456eeddb6ed1ee36a1906d178323e63
---
M includes/DefaultSettings.php
M includes/Setup.php
M includes/skins/Skin.php
A resources/assets/poweredby_mediawiki_132x47.png
A resources/assets/poweredby_mediawiki_176x62.png
5 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/166416/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f2453e8..2dae8fc 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3117,6 +3117,7 @@
* for the icon, the following keys are used:
* - src: An absolute url to the image to use for the icon, this is recommended
*but not required, however some skins will ignore icons without an
image
+ * - srcset: optional additional-resolution images; see HTML5 specs
* - url: The url to use in the a element around the text or icon, if not set
an a element will
*not be outputted
* - alt: This is the text form of the icon, it will be displayed without an
image in
@@ -3133,7 +3134,7 @@
),
poweredby = array(
mediawiki = array(
- src = null, // Defaults to
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png
+ src = null, // Defaults to
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png plus
srcset for 1.5x, 2x
url = //www.mediawiki.org/,
alt = Powered by MediaWiki,
)
diff --git a/includes/Setup.php b/includes/Setup.php
index 743936e..89c3d30 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -137,6 +137,9 @@
) {
$wgFooterIcons['poweredby']['mediawiki']['src'] =
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png;
+ $wgFooterIcons['poweredby']['mediawiki']['srcset'] =
+
$wgResourceBasePath/resources/assets/poweredby_mediawiki_132x47.png 1.5x, .
+
$wgResourceBasePath/resources/assets/poweredby_mediawiki_176x62.png 2x;
}
/**
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index c8c4ba4..c1ebe15 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -837,9 +837,12 @@
function getPoweredBy() {
global $wgResourceBasePath;
- $url = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png );
- $text = 'a href=//www.mediawiki.org/img src=' . $url
- . ' height=31 width=88 alt=Powered by MediaWiki
//a';
+ $url1 = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png );
+ $url1_5 = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_132x47.png );
+ $url2 = htmlspecialchars(
$wgResourceBasePath/resources/assets/poweredby_mediawiki_176x62.png );
+ $text = 'a href=//www.mediawiki.org/img src=' . $url1
+ . ' srcset=' . $url1_5 . ' 1.5x, ' . $url2 . ' 2x '
+ . 'height=31 width=88 alt=Powered by MediaWiki
//a';
wfRunHooks( 'SkinGetPoweredBy', array( $text, $this ) );
return $text;
}
diff --git a/resources/assets/poweredby_mediawiki_132x47.png
b/resources/assets/poweredby_mediawiki_132x47.png
new file mode 100644
index 000..a784ecf
--- /dev/null
+++ b/resources/assets/poweredby_mediawiki_132x47.png
Binary files differ
diff --git a/resources/assets/poweredby_mediawiki_176x62.png
b/resources/assets/poweredby_mediawiki_176x62.png
new file mode 100644
index 000..7970801
--- /dev/null
+++ b/resources/assets/poweredby_mediawiki_176x62.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/166416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I785d21add456eeddb6ed1ee36a1906d178323e63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Add HiDPI PNG variants for 'A Wikimedia Project' logo - change (operations/mediawiki-config)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/166417 Change subject: Add HiDPI PNG variants for 'A Wikimedia Project' logo .. Add HiDPI PNG variants for 'A Wikimedia Project' logo Generated from SVG on Commons: https://en.wikipedia.org/wiki/File:A_Wikimedia_project.svg and run through pngcrush. Using srcset, which should be picked up by browsers natively or through the JavaScript polyfill. Bug: 63872 Change-Id: Ie3ae7808881802d1d856195ae7e7b9e62b7590d9 --- M .gitignore A images/wikimedia-button-1.5x.png A images/wikimedia-button-2x.png M wmf-config/CommonSettings.php 4 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/17/166417/1 diff --git a/.gitignore b/.gitignore index d01c255..6f298a8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,8 @@ # Exceptions: # $wgCopyrightIcon !/images/wikimedia-button.png +!/images/wikimedia-button-1.5x.png +!/images/wikimedia-button-2x.png ## Not in version control yet fonts diff --git a/images/wikimedia-button-1.5x.png b/images/wikimedia-button-1.5x.png new file mode 100644 index 000..fb1cb7d --- /dev/null +++ b/images/wikimedia-button-1.5x.png Binary files differ diff --git a/images/wikimedia-button-2x.png b/images/wikimedia-button-2x.png new file mode 100644 index 000..d3f06ea --- /dev/null +++ b/images/wikimedia-button-2x.png Binary files differ diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 3b574db..22ccd6f 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -905,7 +905,13 @@ $wgUseHashTable = true; -$wgCopyrightIcon = 'a href=//wikimediafoundation.org/img src=//' . $wmfHostnames['bits'] . '/images/wikimedia-button.png width=88 height=31 alt=Wikimedia Foundation//a'; +$wgCopyrightIcon = 'a href=//wikimediafoundation.org/' . + 'img src=//' . $wmfHostnames['bits'] . '/images/wikimedia-button.png ' . + 'srcset=' . + '//' . $wmfHostnames['bits'] . '/images/wikimedia-button-1.5x.png 1.5x, ' . + '//' . $wmfHostnames['bits'] . '/images/wikimedia-button-2x.png 2x' . + ' ' . + 'width=88 height=31 alt=Wikimedia Foundation//a'; # For Special:Cite, we only want it on wikipedia (but can't count on $site), # not on these fakers. -- To view, visit https://gerrit.wikimedia.org/r/166417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3ae7808881802d1d856195ae7e7b9e62b7590d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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
[MediaWiki-commits] [Gerrit] Fix for more button left margin on ios 8. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Fix for more button left margin on ios 8. .. Fix for more button left margin on ios 8. Change-Id: I14b0920008b684f796f90275855a86c93d2fc74c --- M wikipedia/Base.lproj/Main_iPhone.storyboard 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard b/wikipedia/Base.lproj/Main_iPhone.storyboard index acf40d5..ceec993 100644 --- a/wikipedia/Base.lproj/Main_iPhone.storyboard +++ b/wikipedia/Base.lproj/Main_iPhone.storyboard @@ -5,7 +5,6 @@ development version=5100 identifier=xcode/ plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=6238/ capability name=Alignment constraints with different attributes minToolsVersion=5.1/ -capability name=Constraints to layout margins minToolsVersion=6.0/ /dependencies scenes !--Languages View Controller-- @@ -1563,10 +1562,10 @@ /connections /tableView view contentMode=scaleToFill translatesAutoresizingMaskIntoConstraints=NO id=07K-nD-7A6 userLabel=Bottom Container -rect key=frame x=16 y=508 width=288 height=60/ +rect key=frame x=0.0 y=508 width=320 height=60/ subviews label opaque=NO userInteractionEnabled=NO contentMode=left horizontalHuggingPriority=251 verticalHuggingPriority=251 text= lineBreakMode=tailTruncation baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO useAutomaticPreferredMaxLayoutWidth=YES translatesAutoresizingMaskIntoConstraints=NO id=bVa-qw-YfE userLabel=More button customClass=PaddedLabel -rect key=frame x=14 y=5 width=42 height=21/ +rect key=frame x=21 y=5 width=42 height=21/ color key=backgroundColor red=0.2001788139343 green=0.2001788139343 blue=0.2001788139343 alpha=1 colorSpace=deviceRGB/ constraints constraint firstAttribute=width constant=42 placeholder=YES id=GSH-yB-Mas/ @@ -1580,7 +1579,7 @@ color key=backgroundColor white=0.0 alpha=0.94006 colorSpace=calibratedWhite/ constraints constraint firstItem=bVa-qw-YfE firstAttribute=top secondItem=07K-nD-7A6 secondAttribute=top constant=5 id=6Pu-CJ-hAM/ -constraint firstItem=bVa-qw-YfE firstAttribute=leading secondItem=07K-nD-7A6 secondAttribute=leading constant=14 id=PzL-lg-JGQ/ +constraint firstItem=bVa-qw-YfE firstAttribute=leading secondItem=07K-nD-7A6 secondAttribute=leading constant=21 id=PzL-lg-JGQ/ constraint firstAttribute=height constant=60 id=rd5-oJ-QPV/ /constraints /view @@ -1588,8 +1587,8 @@ color key=backgroundColor white=0.0 alpha=1 colorSpace=calibratedWhite/ constraints constraint firstItem=ms6-Ce-U0I firstAttribute=top secondItem=07K-nD-7A6 secondAttribute=bottom id=9to-UJ-xUy/ -constraint firstAttribute=trailingMargin secondItem=07K-nD-7A6 secondAttribute=trailing id=AjP-E5-pdr/ -constraint firstItem=07K-nD-7A6 firstAttribute=leading secondItem=T6V-mj-ox6 secondAttribute=leadingMargin id=HEE-c7-NFQ/ +constraint firstAttribute=trailing secondItem=07K-nD-7A6 secondAttribute=trailing id=AjP-E5-pdr/ +constraint firstItem=07K-nD-7A6 firstAttribute=leading secondItem=T6V-mj-ox6 secondAttribute=leading id=HEE-c7-NFQ/ constraint firstAttribute=trailing secondItem=k1z-U9-PgQ secondAttribute=trailing constant=15 id=Hj4-yb-Ji3/ constraint firstItem=07K-nD-7A6 firstAttribute=top secondItem=k1z-U9-PgQ secondAttribute=bottom id=WbN-XU-Luf/ constraint firstItem=k1z-U9-PgQ firstAttribute=leading secondItem=T6V-mj-ox6 secondAttribute=leading constant=15 id=riH-wG-jgQ/ -- To view, visit https://gerrit.wikimedia.org/r/164484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14b0920008b684f796f90275855a86c93d2fc74c Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: Ibf962b7307314d6b325fd942734a6fd20c7ce73b --- A wikipedia/azb.lproj/InfoPlist.strings M wikipedia/bn.lproj/Localizable.strings M wikipedia/ca.lproj/Localizable.strings M wikipedia/ce.lproj/Localizable.strings M wikipedia/id.lproj/Localizable.strings M wikipedia/id.lproj/Main_iPhone.strings M wikipedia/ms.lproj/Localizable.strings M wikipedia/ms.lproj/Main_iPhone.strings A wikipedia/pa.lproj/InfoPlist.strings A wikipedia/pa.lproj/Localizable.strings A wikipedia/pa.lproj/Main_iPhone.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/sv.lproj/Main_iPhone.strings M wikipedia/zh-hant.lproj/Localizable.strings 14 files changed, 275 insertions(+), 30 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/azb.lproj/InfoPlist.strings b/wikipedia/azb.lproj/InfoPlist.strings new file mode 100644 index 000..c52e9f1 --- /dev/null +++ b/wikipedia/azb.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +// Messages for South Azerbaijani (تورکجه) +// Exported from translatewiki.net +// Author: Koroğlu + +CFBundleDisplayName = ویکیپدیا; diff --git a/wikipedia/bn.lproj/Localizable.strings b/wikipedia/bn.lproj/Localizable.strings index 0f3a2a2..a7ad70b 100644 --- a/wikipedia/bn.lproj/Localizable.strings +++ b/wikipedia/bn.lproj/Localizable.strings @@ -101,6 +101,7 @@ main-menu-show-today = আজ; main-menu-nearby = কাছাকাছি; saved-pages-title = সংরক্ষিত পাতা; +saved-pages-clear-confirmation-heading = সংরক্ষিত সব আইটেম অপসারণ করবেন?; saved-pages-clear-cancel = বাতিল; saved-pages-clear-delete-all = সব মুছে ফেলুন; page-history-title = পাতার ইতিহাস; @@ -193,5 +194,9 @@ nearby-distance-label-miles = $1 মাইল; nearby-pull-to-refresh-prompt = পুনঃসতেজ করতে টানুন; nearby-pull-to-refresh-is-refreshing = পুনঃসতেজ হচ্ছে; +nearby-loading = কাছাকাছি নিবন্ধ লোড হচ্ছে...; +nearby-loaded = কাছাকাছি নিবন্ধ লোড হয়েছে; nearby-open-in-maps = মানচিত্রে খুলুন; nearby-cancel = বাতিল; +nearby-location-updates-settings-menu = গোপনীয়তা অবস্থান পরিষেবা উইকিপিডিয়া; +nearby-location-general-error = অবস্থান নির্ণয় করা যাচ্ছে না। পুনঃসতেজ করতে টানুন বা পরে আবার চেষ্টা করুন।; diff --git a/wikipedia/ca.lproj/Localizable.strings b/wikipedia/ca.lproj/Localizable.strings index f8e1e45..424e9f6 100644 --- a/wikipedia/ca.lproj/Localizable.strings +++ b/wikipedia/ca.lproj/Localizable.strings @@ -15,6 +15,8 @@ history-section-yesterday = Ahir; history-section-lastweek = Darrera setmana; history-section-lastmonth = Darrer mes; +history-clear-confirmation-sub-heading = No es pot desfer l'acció!; +history-clear-cancel = Cancel·la; zero-free-verbiage = Accés lliure a la Viquipèdia des del teu operador mòbil (sense càrrecs per transmissió de dades); // Fuzzy zero-charged-verbiage = Viquipèdia Zero DESACTIVAT (PODEN APLICAR-SE COSTOS PER TRANSMISSIÓ DE DADES); @@ -43,6 +45,9 @@ account-creation-password-confirm-placeholder-text = Confirma la contrasenya; account-creation-email-placeholder-text = Adreça electrònica (opcional); login-name-not-found = Cal el nom d'usuari per iniciar una sessió.; +login-name-does-not-exist = El nom d'usuari que heu proporcionat no existeix.; +login-password-wrong = La contrasenya que heu proporcionat no és correcta.; +login-throttled = Heu iniciat una sessió massa vegades en un temps curt.; login-user-blocked = L'usuari està blocat.; login-account-creation = No teniu un compte? Uniu-vos a la Viquipèdia.; login-username-placeholder-text = Nom d'usuari; @@ -59,6 +64,7 @@ open-link-title = Obre l'enllaç; open-link-cancel = Cancel·la; search-searching = S'està cercant...; +search-no-matches = No s'han trobat coincidències del terme de cerca.; search-field-placeholder-text = Cerca a la Viquipèdia; search-field-placeholder-text-zero = Cerca a la Viquipèdia Zero; search-loading-section-zero = S'està carregant la primera secció de l'article...; @@ -86,7 +92,10 @@ main-menu-terms-of-use = Condicions d’ús; main-menu-rate-app = Puntua l'aplicació; main-menu-show-today = Avui; +main-menu-nearby = A prop; saved-pages-title = Pàgines desades; +saved-pages-clear-confirmation-sub-heading = No es pot desfer l'acció!; +saved-pages-clear-cancel = Cancel·la; page-history-title = Historial de l'article; page-history-downloading = S'està carregant l'historial de l'article...; navbar-title-mode-edit-wikitext = Modifica; @@ -150,3 +159,6 @@ menu-cancel-accessibility-label = Cancel·la; menu-share-accessibility-label = Comparteix; menu-more-accessibility-label = Més paràmetres; +nearby-loaded = S'han carregat articles propers; +nearby-none = No s'han trobat articles propers. Arrossegueu per refrescar o torneu-ho a provar més tard.; +nearby-cancel = Cancel·la; diff --git a/wikipedia/ce.lproj/Localizable.strings
[MediaWiki-commits] [Gerrit] Prevent jitter when loading lead section on slow connection. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Prevent jitter when loading lead section on slow connection.
..
Prevent jitter when loading lead section on slow connection.
Sometimes lead section content appeared to start halfway
down the screen when using slow connection. Was caused by
bottom scroll margin only being added after non lead sections
had completely loaded and how this caused the code which
limits vertical scrolling to get confused. Solved by
adding bottom margin - and last modified by and page
history footer - to end of lead section as soon as it
loads, and then injecting the non lead section content
above this footer stuff after it is retrieved.
Also added a couple of nil crash prevention checks.
Change-Id: I384896a8f2db25692b13794b970a199fba6d8089
---
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/assets/bundle.js
M www/js/listeners.js
4 files changed, 65 insertions(+), 6 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index d326973..06ddbfe 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -348,9 +348,11 @@
NSManagedObjectID *currentArticleId =
[articleDataContext_.mainContext getArticleIDForTitle:
[SessionSingleton sharedInstance].currentArticleTitle
domain:
[SessionSingleton sharedInstance].currentArticleDomain];
-Article *article = (Article *)[articleDataContext_.mainContext
objectWithID:currentArticleId];
-if (article (article.saved.count == 1)){
-result = YES;
+if (currentArticleId) {
+Article *article = (Article *)[articleDataContext_.mainContext
objectWithID:currentArticleId];
+if (article (article.saved.count == 1)){
+result = YES;
+}
}
}];
return result;
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 5989937..c84c0c0 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1073,7 +1073,7 @@
domain: [SessionSingleton sharedInstance].currentArticleDomain];
if (!articleID) return;
Article *article = (Article *)[articleDataContext_.mainContext
objectWithID:articleID];
-if (!article) return;
+if (!article || !article.title || !article.domain) return;
SavedPagesFunnel *funnel = [[SavedPagesFunnel alloc] init];
if (article.saved.count == 0) {
@@ -1901,8 +1901,11 @@
}
-if ((mode != DISPLAY_LEAD_SECTION)) {
+if (mode != DISPLAY_APPEND_NON_LEAD_SECTIONS) {
if (![[SessionSingleton sharedInstance] isCurrentArticleMain]) {
+if (mode == DISPLAY_LEAD_SECTION) {
+[sectionTextArray addObject: [NSString
stringWithFormat:@div id='nonLeadSectionsInjectionPoint'
style='margin-top:2em;margin-bottom:2em;'%@/div,
MWLocalizedString(@search-loading-section-remaining, nil)]];
+}
[sectionTextArray addObject: [self renderFooterDivider]];
[sectionTextArray addObject: [self
renderLastModified:lastModified by:lastModifiedBy]];
[sectionTextArray addObject: [self
renderLanguageButtonForCount: langCount.integerValue]];
@@ -1918,6 +1921,18 @@
// Join article sections text
NSString *joint = @; //@div
style=\background-color:#ff;height:55px;\/div;
NSString *htmlStr = [sectionTextArray componentsJoinedByString:joint];
+
+// If any of these are nil, the bridge sendMessage: calls will
crash! So catch 'em here.
+BOOL safeToCrossBridge = (languageInfo.code languageInfo.dir
uidir htmlStr);
+if (!safeToCrossBridge) {
+NSLog(@\n\nUnsafe to cross JS bridge!);
+NSLog(@\tlanguageInfo.code = %@, languageInfo.code);
+NSLog(@\tlanguageInfo.dir = %@, languageInfo.dir);
+NSLog(@\tuidir = %@, uidir);
+NSLog(@\thtmlStr is nil = %d\n\n, (htmlStr == nil));
+//TODO: output could not load page alert and/or show last page?
+return;
+}
// NSLog(@languageInfo = %@, languageInfo.code);
// Display all sections
@@ -1928,7 +1943,11 @@
@uidir: uidir
}];
-
[MediaWiki-commits] [Gerrit] Long press back or forward buttons brings up history. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Long press back or forward buttons brings up history.
..
Long press back or forward buttons brings up history.
Change-Id: Id759908b66a6318f7a650af36ae57411cb04eb4d
---
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
1 file changed, 25 insertions(+), 3 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index d326973..16ad0c4 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -104,11 +104,24 @@
[self addTapRecognizersToAllButtons];
-UILongPressGestureRecognizer *longPressRecognizer =
+UILongPressGestureRecognizer *saveLongPressRecognizer =
[[UILongPressGestureRecognizer alloc] initWithTarget: self
action:
@selector(saveButtonLongPressed:)];
-longPressRecognizer.minimumPressDuration = 0.5f;
-[self.saveButton addGestureRecognizer:longPressRecognizer];
+saveLongPressRecognizer.minimumPressDuration = 0.5f;
+[self.saveButton addGestureRecognizer:saveLongPressRecognizer];
+
+UILongPressGestureRecognizer *backLongPressRecognizer =
+[[UILongPressGestureRecognizer alloc] initWithTarget: self
+ action:
@selector(backForwardButtonsLongPressed:)];
+backLongPressRecognizer.minimumPressDuration = 0.5f;
+[self.backButton addGestureRecognizer:backLongPressRecognizer];
+
+
+UILongPressGestureRecognizer *forwardLongPressRecognizer =
+[[UILongPressGestureRecognizer alloc] initWithTarget: self
+ action:
@selector(backForwardButtonsLongPressed:)];
+forwardLongPressRecognizer.minimumPressDuration = 0.5f;
+[self.forwardButton addGestureRecognizer:forwardLongPressRecognizer];
[self adjustConstraintsScaleForViews:@[self.backButton,
self.forwardButton, self.saveButton, self.rightButton]];
}
@@ -172,6 +185,15 @@
}
}
+-(void)backForwardButtonsLongPressed:(UILongPressGestureRecognizer *)recognizer
+{
+if (recognizer.state == UIGestureRecognizerStateBegan){
+[self performModalSequeWithID: @modal_segue_show_history
+ transitionStyle: UIModalTransitionStyleCoverVertical
+block: nil];
+}
+}
+
- (void)shareButtonPushed
{
NSString *title = @;
--
To view, visit https://gerrit.wikimedia.org/r/164495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id759908b66a6318f7a650af36ae57411cb04eb4d
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump version to 4.0.4 for next testflight (and if all goes w... - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/164659 Change subject: bump version to 4.0.4 for next testflight (and if all goes well store) release .. bump version to 4.0.4 for next testflight (and if all goes well store) release Change-Id: Ifee56fdbddc130a92d135db2e91e578cd4290559 --- M wikipedia/Wikipedia-Info.plist 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/59/164659/1 diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index c308495..abeb8eb 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -17,11 +17,11 @@ keyCFBundlePackageType/key stringAPPL/string keyCFBundleShortVersionString/key - string4.0.3/string + string4.0.4/string keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0.3/string + string4.0.4.0/string keyLSRequiresIPhoneOS/key true/ keyNSLocationWhenInUseUsageDescription/key -- To view, visit https://gerrit.wikimedia.org/r/164659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifee56fdbddc130a92d135db2e91e578cd4290559 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
[MediaWiki-commits] [Gerrit] bump version to 4.0.4 for next testflight (and if all goes w... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: bump version to 4.0.4 for next testflight (and if all goes well store) release .. bump version to 4.0.4 for next testflight (and if all goes well store) release Change-Id: Ifee56fdbddc130a92d135db2e91e578cd4290559 --- M wikipedia/Wikipedia-Info.plist 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist index c308495..abeb8eb 100644 --- a/wikipedia/Wikipedia-Info.plist +++ b/wikipedia/Wikipedia-Info.plist @@ -17,11 +17,11 @@ keyCFBundlePackageType/key stringAPPL/string keyCFBundleShortVersionString/key - string4.0.3/string + string4.0.4/string keyCFBundleSignature/key string/string keyCFBundleVersion/key - string4.0.3/string + string4.0.4.0/string keyLSRequiresIPhoneOS/key true/ keyNSLocationWhenInUseUsageDescription/key -- To view, visit https://gerrit.wikimedia.org/r/164659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifee56fdbddc130a92d135db2e91e578cd4290559 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Quick add of full-HD (1080p) transcode configs for TMH - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/165243 Change subject: Quick add of full-HD (1080p) transcode configs for TMH .. Quick add of full-HD (1080p) transcode configs for TMH Bug: 71705 Change-Id: I805ddbddda143db43ab7644de81a28014a13022c --- M TimedMediaHandler.php M WebVideoTranscode/WebVideoTranscode.php M i18n/en.json M i18n/qqq.json 4 files changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/43/165243/1 diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index a9762d2..b1e0025 100644 --- a/TimedMediaHandler.php +++ b/TimedMediaHandler.php @@ -144,6 +144,9 @@ // A high quality WebM stream WebVideoTranscode::ENC_WEBM_720P, + + // A full-HD high quality WebM stream + WebVideoTranscode::ENC_WEBM_1080P, /* // A least common denominator h.264 stream; first gen iPhone, iPods, early android etc. WebVideoTranscode::ENC_H264_320P, @@ -153,6 +156,9 @@ // An high quality HD stream; higher end phones, tablets, smart tvs WebVideoTranscode::ENC_H264_720P, + + // A full-HD high quality stream; higher end phones, tablets, smart tvs + WebVideoTranscode::ENC_H264_1080P, */ ); diff --git a/WebVideoTranscode/WebVideoTranscode.php b/WebVideoTranscode/WebVideoTranscode.php index 704fd8d..e6b7a7f 100644 --- a/WebVideoTranscode/WebVideoTranscode.php +++ b/WebVideoTranscode/WebVideoTranscode.php @@ -30,17 +30,20 @@ const ENC_OGV_360P = '360p.ogv'; const ENC_OGV_480P = '480p.ogv'; const ENC_OGV_720P = '720p.ogv'; + const ENC_OGV_1080P = '1080p.ogv'; // WebM profiles: const ENC_WEBM_160P = '160p.webm'; const ENC_WEBM_360P = '360p.webm'; const ENC_WEBM_480P = '480p.webm'; const ENC_WEBM_720P = '720p.webm'; + const ENC_WEBM_1080P = '1080p.webm'; // mp4 profiles: const ENC_H264_320P = '320p.mp4'; const ENC_H264_480P = '480p.mp4'; const ENC_H264_720P = '720p.mp4'; + const ENC_H264_1080P = '1080p.mp4'; const ENC_OGG_VORBIS = 'ogg'; const ENC_OGG_OPUS = 'opus'; @@ -114,6 +117,17 @@ 'type' = 'video/ogg; codecs=theora, vorbis', ), + WebVideoTranscode::ENC_OGV_1080P = + array( + 'maxSize'= '1920x1080', + 'videoQuality' = 6, + 'audioQuality' = 3, + 'noUpscaling'= 'true', + 'keyframeInterval' = '128', + 'videoCodec' = 'theora', + 'type' = 'video/ogg; codecs=theora, vorbis', + ), + // WebM transcode: WebVideoTranscode::ENC_WEBM_160P = array( @@ -164,6 +178,15 @@ 'videoCodec' = 'vp8', 'type' = 'video/webm; codecs=vp8, vorbis', ), + WebVideoTranscode::ENC_WEBM_1080P = +array( + 'maxSize'= '1920x1080', + 'videoQuality' = 7, + 'audioQuality' = 3, + 'noUpscaling'= 'true', + 'videoCodec' = 'vp8', + 'type' = 'video/webm; codecs=vp8, vorbis', + ), // Losly defined per PCF guide to mp4 profiles: // https://develop.participatoryculture.org/index.php/ConversionMatrix @@ -206,6 +229,18 @@ 'type' = 'video/mp4; codecs=avc1.42E01E, mp4a.40.2', ), + WebVideoTranscode::ENC_H264_1080P = + array( + 'maxSize' = '1920x1080', + 'videoCodec' = 'h264', + 'preset' = '1080p', + 'videoBitrate' = '5000k', + 'audioCodec' = 'aac', + 'channels' = '2', + 'audioBitrate' = '128k', + 'type' = 'video/mp4; codecs=avc1.42E01E, mp4a.40.2', + ), + //Audio profiles WebVideoTranscode::ENC_OGG_VORBIS = array( diff --git a/i18n/en.json
[MediaWiki-commits] [Gerrit] Update icon script to update all icon files. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Update icon script to update all icon files.
..
Update icon script to update all icon files.
Added beta icon svg.
Change-Id: I76484ef9fa6ca17b5ba31be4469d7d04502fab9f
---
M scripts/icon-svgs-to-pngs.sh
A wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg
M wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon180-1.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon87-1.png
5 files changed, 72 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/scripts/icon-svgs-to-pngs.sh b/scripts/icon-svgs-to-pngs.sh
index 2035179..2ba0f67 100755
--- a/scripts/icon-svgs-to-pngs.sh
+++ b/scripts/icon-svgs-to-pngs.sh
@@ -2,6 +2,8 @@
ruby -e '[29,40,50,57,58,72,76,80,87,90,100,114,120,144,152,180].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}.png -w #{x}
'$SCRIPT_INPUT_FILE_0'` }'
+ruby -e '[87,120,180].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}-1.png -w #{x}
'$SCRIPT_INPUT_FILE_0'` }'
+
ruby -e '[120,240,360].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent#{x}.png -w #{x}
'$SCRIPT_INPUT_FILE_1'` }'
ruby -e '[120,240,360].each { |x|
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png
wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages#{x}.png -w #{x}
'$SCRIPT_INPUT_FILE_2'` }'
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg
new file mode 100644
index 000..fd41eb1
--- /dev/null
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon-beta.svg
@@ -0,0 +1,70 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+
+svg
+ xmlns:dc=http://purl.org/dc/elements/1.1/;
+ xmlns:cc=http://creativecommons.org/ns#;
+ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg=http://www.w3.org/2000/svg;
+ xmlns=http://www.w3.org/2000/svg;
+ xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+ xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape;
+ version=1.1
+ id=Layer_1
+ x=0px
+ y=0px
+ viewBox=0 0 1024 1024
+ style=enable-background:new 0 0 1024 1024;
+ xml:space=preserve
+ inkscape:version=0.48.2 r9819
+ width=100%
+ height=100%
+ sodipodi:docname=icon.svgmetadata
+ id=metadata15rdf:RDFcc:Work
+ rdf:about=dc:formatimage/svg+xml/dc:formatdc:type
+ rdf:resource=http://purl.org/dc/dcmitype/StillImage;
//cc:Work/rdf:RDF/metadatadefs
+ id=defs13 /sodipodi:namedview
+ pagecolor=#ff
+ bordercolor=#66
+ borderopacity=1
+ objecttolerance=10
+ gridtolerance=10
+ guidetolerance=10
+ inkscape:pageopacity=0
+ inkscape:pageshadow=2
+ inkscape:window-width=1157
+ inkscape:window-height=805
+ id=namedview11
+ showgrid=false
+ inkscape:zoom=0.23046875
+ inkscape:cx=-32.542373
+ inkscape:cy=512
+ inkscape:window-x=152
+ inkscape:window-y=0
+ inkscape:window-maximized=0
+ inkscape:current-layer=Layer_1 /
+rect
+ style=fill:#EE;
+ width=1024
+ height=1024
+ id=rect3 /
+g
+ id=g5
+ path
+ style=fill:#33;
+
d=M565.62,300.771c19.821,0.734,41.11,1.469,57.994,1.469c16.885,0,35.238-0.735,53.59-1.469
c4.405,4.405,4.405,19.821,0,24.225c-38.174,5.874-54.324,33.769-72.163,68.272l-53.663,102.115l93.892,194.464h3.377
l139.408-301.718c17.398-39.715,16.15-59.462-31.568-63.133c-4.404-4.404-4.404-19.82,0-24.225
c27.163,0.734,55.793,1.469,72.677,1.469c16.885,0,41.11-0.735,64.602-1.469c4.405,4.405,4.405,19.821,0,24.225
c-41.844,4.405-55.865,33.108-72.163,68.272L647.841,767.664c-5.139,11.011-9.544,16.884-17.619,16.884
c-7.341,0-12.994-5.946-16.884-16.884L514.6,554.552L406.319,767.664c-4.404,11.011-9.543,16.884-17.619,16.884
c-7.34,0-12.479-5.872-16.884-16.884L212.148,391.801c-22.39-52.122-27.749-64.088-65.702-66.804
c-4.405-4.404-5.139-19.82-0.735-24.225c25.694,0.734,51.902,1.469,76.348,1.469c22.243,0,52.122-0.735,81.486-1.469
c4.405,4.405,4.405,19.821,0,24.225c-46.249,5.139-48.451,16.885-29.805,58.729l134.414,306.122h3.377l82-166.789l-61.885-131.258
c-24.592-52.122-30.465-62.399-62.032-66.804c-4.404-4.404-5.139-19.82-0.734-24.225c21.289,0.734,43.826,1.469,65.335,1.469
c23.272,0,45.514-0.735,66.804-1.469c4.404,4.405,4.404,19.821,0,24.225c-30.833,4.405-27.896,16.885-7.782,58.729l36.118,74.144
[MediaWiki-commits] [Gerrit] Protection against nil title or domain crashes. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Protection against nil title or domain crashes. .. Protection against nil title or domain crashes. Change-Id: I26aa76563b8d2cbee9efa64cebdd6d1a1b7b4ae2 --- M wikipedia/View Controllers/WebView/WebViewController.m 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/View Controllers/WebView/WebViewController.m b/wikipedia/View Controllers/WebView/WebViewController.m index c84c0c0..bdc20b0 100644 --- a/wikipedia/View Controllers/WebView/WebViewController.m +++ b/wikipedia/View Controllers/WebView/WebViewController.m @@ -1847,7 +1847,7 @@ Article *article = (Article *)[articleDataContext_.mainContext objectWithID:articleID]; -if (!article) return; +if (!article || !article.title || !article.domain) return; [SessionSingleton sharedInstance].currentArticleTitle = article.title; [SessionSingleton sharedInstance].currentArticleDomain = article.domain; MWLanguageInfo *languageInfo = [MWLanguageInfo languageInfoForCode:article.domain]; -- To view, visit https://gerrit.wikimedia.org/r/165150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26aa76563b8d2cbee9efa64cebdd6d1a1b7b4ae2 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Article loading indicator. Fades out current article backgro... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Article loading indicator. Fades out current article background
too.
..
Article loading indicator. Fades out current article background too.
Change-Id: I5c4f2e05c80b3fc948b800f3052efbf140825565
---
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Center/CenterNavController.m
M wikipedia/View Controllers/References/ReferenceVC.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
5 files changed, 138 insertions(+), 13 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index 6255df8..3801217 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -269,7 +269,8 @@
[webVC navigateToPage: history.article.titleObj
domain: history.article.domain
discoveryMethod: DISCOVERY_METHOD_BACKFORWARD
- invalidatingCache: NO];
+invalidatingCache: NO
+ showLoadingIndicator: NO];
}
}
@@ -286,7 +287,8 @@
[webVC navigateToPage: history.article.titleObj
domain: history.article.domain
discoveryMethod: DISCOVERY_METHOD_BACKFORWARD
- invalidatingCache: NO];
+invalidatingCache: NO
+ showLoadingIndicator: NO];
}
}
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
index 7621b22..54753aa 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
@@ -93,7 +93,8 @@
[webVC navigateToPage: title
domain: domain
discoveryMethod: discoveryMethod
-invalidatingCache: invalidateCache];
+invalidatingCache: invalidateCache
+ showLoadingIndicator: YES];
if (popToWebVC) {
[ROOT popToViewController:webVC animated:animated];
}
diff --git a/wikipedia/View Controllers/References/ReferenceVC.m
b/wikipedia/View Controllers/References/ReferenceVC.m
index f9ea5da..0bf988d 100644
--- a/wikipedia/View Controllers/References/ReferenceVC.m
+++ b/wikipedia/View Controllers/References/ReferenceVC.m
@@ -62,7 +62,8 @@
[self.webVC navigateToPage: pageTitle
domain: [SessionSingleton
sharedInstance].currentArticleDomain
discoveryMethod: DISCOVERY_METHOD_LINK
- invalidatingCache: NO];
+ invalidatingCache: NO
+ showLoadingIndicator: YES];
[self.webVC referencesHide];
return NO;
}
diff --git a/wikipedia/View Controllers/WebView/WebViewController.h
b/wikipedia/View Controllers/WebView/WebViewController.h
index fb00508..6ba5eba 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.h
+++ b/wikipedia/View Controllers/WebView/WebViewController.h
@@ -27,7 +27,8 @@
-(void)navigateToPage: (MWPageTitle *)title
domain: (NSString *)domain
discoveryMethod: (ArticleDiscoveryMethod)discoveryMethod
-invalidatingCache: (BOOL)invalidateCache;
+invalidatingCache: (BOOL)invalidateCache
+ showLoadingIndicator: (BOOL)showLoadingIndicator;
-(void)tocScrollWebViewToSectionWithElementId: (NSString *)elementId
duration: (CGFloat)duration
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 2c35dca..77dd2f4 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -136,6 +136,9 @@
@property (weak, nonatomic) IBOutlet NSLayoutConstraint
*bottomNavHeightConstraint;
+@property (strong, nonatomic) UIActivityIndicatorView *activityIndicator;
+@property (strong, nonatomic) UIView *activityIndicatorBackgroundView;
+
@end
#pragma mark Internal variables
@@ -279,6 +282,8 @@
*/
[self tocUpdateViewLayout];
+
+[self loadingIndicatorAdd];
}
-(void)tocUpdateViewLayout
@@ -677,6 +682,9 @@
// Prevent toc reveal if pull to refresh in effect.
if (self.webView.scrollView.contentOffset.y 0) return;
+// Prevent toc reveal if loading article.
+if (self.activityIndicator.isAnimating) return;
+
NSString *currentArticleTitle = [SessionSingleton
[MediaWiki-commits] [Gerrit] Work in progress: ogv.js media player for Safari/IE (3 of 3) - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165479
Change subject: Work in progress: ogv.js media player for Safari/IE (3 of 3)
..
Work in progress: ogv.js media player for Safari/IE (3 of 3)
Mobile video/audio-player overlay, supporting both native and
ogv.js JavaScript-based playback (used for Safari).
* currently appears to be broken due to changes in MobileFrontend *
Note this doesn't work in IE for Windows Phone, which currently
lacks both Web Audio and Flash support.
Bug: 61823
Change-Id: Ib0083dc6b50eb91adb9e9624a5e90448860441e2
---
M TimedMediaHandler.hooks.php
M TimedMediaHandler_body.php
M i18n/en.json
M i18n/qqq.json
A resources/ext.tmh.mobile.MediaOverlay.js
A resources/ext.tmh.mobile.MediaOverlay.less
A resources/ext.tmh.mobile.css
A resources/ext.tmh.mobile.js
8 files changed, 480 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/79/165479/1
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 7ab2230..8771157 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -89,6 +89,44 @@
'loaderScripts' =
'resources/mw.MediaWikiPlayer.loader.js',
),
);
+
+ // Add OgvJs-related modules common to desktop Safari/IE and
mobile Safari
+ $wgResourceModules += array(
+ 'ext.tmh.OgvJsSupport' = $baseExtensionResource +
array(
+ 'scripts' =
'resources/ext.tmh.OgvJsSupport.js',
+ 'targets' = array( 'mobile', 'desktop' ),
+ ),
+ );
+
+ // Add the MobileFrontend-specific lightweight player
+ $wgResourceModules += array(
+ 'ext.tmh.mobile' = $baseExtensionResource + array(
+ 'scripts' = 'resources/ext.tmh.mobile.js',
+ 'styles' = array(
+ 'resources/ext.tmh.mobile.css',
+ 'resources/PopUpThumbVideo.css',
+ ),
+ 'dependencies' = array(
+ 'mobile.startup',
+ 'ext.tmh.OgvJsSupport',
+ ),
+ 'targets' = array( 'mobile' ),
+ ),
+ );
+ $wgResourceModules += array(
+ 'ext.tmh.mobile.MediaOverlay' = $baseExtensionResource
+ array(
+ 'scripts' =
'resources/ext.tmh.mobile.MediaOverlay.js',
+ 'styles' =
'resources/ext.tmh.mobile.MediaOverlay.less',
+ 'dependencies' = array(
+ 'ext.tmh.mobile',
+ 'mobile.overlays',
+ 'mediawiki.Title',
+ ),
+ 'messages' =
'timedmedia-mobile-overlay-details',
+ 'targets' = array( 'mobile' ),
+ ),
+ );
+
// Setup a hook for iframe embed handling:
$wgHooks['ArticleFromTitle'][] =
'TimedMediaIframeOutput::iframeHook';
@@ -396,6 +434,7 @@
if ( $addModules ) {
$out-addModuleScripts( 'mw.PopUpMediaTransform' );
$out-addModuleStyles( 'mw.PopUpMediaTransform' );
+ $out-addModules( 'ext.tmh.mobile' );
}
return true;
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index 9bd172a..4283041 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -217,6 +217,7 @@
$outputPage-addModuleScripts( 'mw.PopUpMediaTransform' );
$outputPage-addModuleStyles( 'mw.PopUpMediaTransform' );
$outputPage-addModules( 'mw.TMHGalleryHook.js' );
+ $outputPage-addModules( 'ext.tmh.mobile' );
}
/**
diff --git a/i18n/en.json b/i18n/en.json
index 63bebfc..0459ab9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -115,5 +115,6 @@
orphanedtimedtext: Orphaned TimedText pages,
orphanedtimedtext-summary: List of
[[{{#special:AllPages/TimedText:}}|{{ns:TimedText}}]] pages which do not have a
corresponding file.,
orphanedtimedtext-unsupported: This special page is only supported on
MySQL databases.,
-orphanedtimedtext-notimedtext: TimedText is not enabled on this wiki.
+orphanedtimedtext-notimedtext: TimedText is not enabled on this wiki.,
+timedmedia-mobile-overlay-details: Details
}
diff --git a/i18n/qqq.json
[MediaWiki-commits] [Gerrit] Work in progress: ogv.js media player for Safari/IE (1 of 3) - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/165477 Change subject: Work in progress: ogv.js media player for Safari/IE (1 of 3) .. Work in progress: ogv.js media player for Safari/IE (1 of 3) JavaScript and Flash media players for Ogg Vorbis/Theora audio/video, built from https://github.com/brion/ogv.js by Brion Vibber Includes libogg, libtheora, libvorbis, and libopus cross-compiled with Mozilla's emscripten compiler and Adobe's crossbridge compiler and wrapped in a simple media player. This is a separate commit to make the actual plugin for the player framework more readable. Bug: 61823 Change-Id: I0fb32af11fe7c95e91023dc6eacb113206adeef9 --- A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-ogg.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-ogv.js.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-opus.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-theora.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-vorbis.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/README A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/dynamicaudio.swf A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.swf A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogvjs.js A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogvswf.js 10 files changed, 2,911 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/77/165477/1 -- To view, visit https://gerrit.wikimedia.org/r/165477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fb32af11fe7c95e91023dc6eacb113206adeef9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler 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
[MediaWiki-commits] [Gerrit] Work in progress: ogv.js media player for Safari/IE (2 of 3) - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165478
Change subject: Work in progress: ogv.js media player for Safari/IE (2 of 3)
..
Work in progress: ogv.js media player for Safari/IE (2 of 3)
Plugin to MwEmbedPlayer for using ogv.js JavaScript or Flash playback
of Ogg Theora/Vorbis media in Safari and IE.
The actual JS and Flash libraries are in the previous commit in order
to make this commit easier to review.
This commit adds only the plugin for the desktop player and support
code that's common with the mobile player coming in the next commit.
Bug: 61823
Change-Id: Ia6b2e66864a596dbb4ba5841b9da135021f38276
---
M MwEmbedModules/EmbedPlayer/EmbedPlayer.php
M MwEmbedModules/EmbedPlayer/i18n/en.json
M MwEmbedModules/EmbedPlayer/i18n/qqq.json
A MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
A MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvSwf.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
M MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
A resources/ext.tmh.OgvJsSupport.js
10 files changed, 524 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/78/165478/1
diff --git a/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
b/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
index c60d41c..95efa94 100644
--- a/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
+++ b/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
@@ -68,6 +68,11 @@
'scripts'= resources/mw.EmbedPlayerVLCApp.js,
'dependencies' = array( 'mediawiki.Uri' )
),
+ mw.EmbedPlayerOgvJs = array(
+ 'scripts' = 'resources/mw.EmbedPlayerOgvJs.js',
+ 'dependencies' = 'ext.tmh.OgvJsSupport',
+ ),
+ mw.EmbedPlayerOgvSwf = array( 'scripts'=
resources/mw.EmbedPlayerOgvSwf.js ),
mw.EmbedPlayerImageOverlay = array( 'scripts'=
resources/mw.EmbedPlayerImageOverlay.js ),
mw.EmbedPlayerVlc = array( 'scripts'=
resources/mw.EmbedPlayerVlc.js ),
diff --git a/MwEmbedModules/EmbedPlayer/i18n/en.json
b/MwEmbedModules/EmbedPlayer/i18n/en.json
index d3221a2..7539465 100644
--- a/MwEmbedModules/EmbedPlayer/i18n/en.json
+++ b/MwEmbedModules/EmbedPlayer/i18n/en.json
@@ -50,6 +50,8 @@
mwe-embedplayer-ogg-player-webmNative: HTML5 WebM player,
mwe-embedplayer-ogg-player-oggPlugin: Generic Ogg plugin,
mwe-embedplayer-ogg-player-vlcAppPlayer: VLC for iOS app,
+mwe-embedplayer-ogg-player-ogvJsPlayer: JavaScript Ogg player,
+mwe-embedplayer-ogg-player-ogvSwfPlayer: Flash Ogg player,
mwe-embedplayer-ogg-player-quicktime-mozilla: QuickTime plugin,
mwe-embedplayer-ogg-player-quicktime-activex: QuickTime ActiveX,
mwe-embedplayer-ogg-player-cortado: Java Cortado,
diff --git a/MwEmbedModules/EmbedPlayer/i18n/qqq.json
b/MwEmbedModules/EmbedPlayer/i18n/qqq.json
index 0b17710..3e3de78 100644
--- a/MwEmbedModules/EmbedPlayer/i18n/qqq.json
+++ b/MwEmbedModules/EmbedPlayer/i18n/qqq.json
@@ -24,6 +24,8 @@
mwe-embedplayer-ogg-player-aacNative: name of AAC player in
configuration screen,
mwe-embedplayer-ogg-player-cortado: {{optional}},
mwe-embedplayer-ogg-player-selected: {{Identical|Selected}},
+ mwe-embedplayer-ogg-player-ogvJsPlayer: name of ogv.js Ogg
JavaScript player in configuration screen,
+ mwe-embedplayer-ogg-player-ogvSwfPlayer: name of ogv.swf Ogg Flash
player in configuration screen,
mwe-embedplayer-for_best_experience: Shown when user's browser
doesn't support playing videos. Parameters:\n* $1 - An empty lt;agt; tag.
Don't use this parameter.,
mwe-embedplayer-download-warn: Parameters:\n* $1 - URL,
mwe-embedplayer-do_not_warn_again: Standard message for
disabling\nfuture identical warnings messages,
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
new file mode 100644
index 000..d2ef1b6
--- /dev/null
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
@@ -0,0 +1,171 @@
+( function( mw, $ ) { use strict;
+
+mw.EmbedPlayerOgvJs = {
+
+ // Instance name:
+ instanceOf: 'OgvJs',
+
+ // Supported feature set of the cortado applet:
+ supports: {
+ 'playHead' : false, // seeking not supported yet
+ 'pause' : true,
+ 'stop' : true,
+ 'fullscreen' : false,
+ 'sourceSwitch': true, // todo
+ 'timeDisplay' : true,
+ 'volumeControl' : false,
+ 'overlays': true
+
[MediaWiki-commits] [Gerrit] Support DISPLAYTITLE in article view - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Support DISPLAYTITLE in article view
..
Support DISPLAYTITLE in article view
Added support for the display title. Limited this to
article view as this seems to be the consistent behavior
across platforms. There was actually a field for this in the
article model, but it was apparently never fully implemented.
Perform nil check when create dictionary in
DownloadSectionsOp.m, and in getHeaderTitle
Section+DisplayHtml.m.
Bug: 63971
Change-Id: I26fe6d723540b67da533e6b916a6a288a4ddc4c9
---
M wikipedia/Categories/Section+DisplayHtml.m
M wikipedia/Data/Operations/DownloadSectionsOp.m
M wikipedia/View Controllers/WebView/WebViewController.m
3 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Categories/Section+DisplayHtml.m
b/wikipedia/Categories/Section+DisplayHtml.m
index 318b1e7..c6babed 100644
--- a/wikipedia/Categories/Section+DisplayHtml.m
+++ b/wikipedia/Categories/Section+DisplayHtml.m
@@ -33,7 +33,7 @@
NSString *pencilAnchor = isMainPage ? @ : [self getEditPencilAnchor];
// Use the article's title for lead section header text.
-NSString *title = ([self.sectionId isEqualToNumber:@(0)]) ?
self.article.title : self.title;
+NSString *title = [self getHeaderTitle];
NSInteger headingTagSize = [self getHeadingTagSize];
@@ -53,6 +53,18 @@
];
}
+-(NSString*)getHeaderTitle{
+if ([self.sectionId isEqualToNumber:@(0)]) {
+if (self.article.displayTitle != nil
self.article.displayTitle.length 0) {
+return self.article.displayTitle;
+}else{
+return self.article.title;
+}
+}else{
+return self.title;
+}
+}
+
-(NSInteger)getHeadingTagSize
{
// Determines H# tag size based on section level.
diff --git a/wikipedia/Data/Operations/DownloadSectionsOp.m
b/wikipedia/Data/Operations/DownloadSectionsOp.m
index dbdc6bb..4fe8947 100644
--- a/wikipedia/Data/Operations/DownloadSectionsOp.m
+++ b/wikipedia/Data/Operations/DownloadSectionsOp.m
@@ -24,7 +24,7 @@
NSMutableDictionary *params =
@{
@action: @mobileview,
- @prop:
@sections|text|lastmodified|lastmodifiedby|languagecount|id|protection|editable,
+ @prop:
@sections|text|lastmodified|lastmodifiedby|languagecount|id|protection|editable|displaytitle,
@sectionprop: @toclevel|line|anchor|level|number|fromtitle|index,
@noheadings: @true,
@page: title,
@@ -137,6 +137,9 @@
NSNumber *editable =
weakSelf.jsonRetrieved[@mobileview][@editable];
if (!editable || [editable isNull]) editable = @NO;
+NSString *displaytitle =
weakSelf.jsonRetrieved[@mobileview][@displaytitle];
+if (!displaytitle || [displaytitle isNull]) displaytitle = @;
+
NSString *protectionStatus = @;
id protection =
weakSelf.jsonRetrieved[@mobileview][@protection];
// if empty this can be an array instead of an object/dict!
@@ -154,6 +157,7 @@
@lastmodified: lastmodifiedDate,
@lastmodifiedby: lastmodifiedby,
@redirected: redirected,
+@displaytitle: displaytitle,
@languagecount: languagecount,
@articleId: articleId,
@editable: editable,
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 5590785..794a199 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -1705,6 +1705,7 @@
article.articleId = dataRetrieved[@articleId];
article.editable = dataRetrieved[@editable];
article.protectionStatus = dataRetrieved[@protectionStatus];
+article.displayTitle = dataRetrieved[@displaytitle];
// Note: Because retrieveArticleForPageTitle recurses with the
redirected-to title if
--
To view, visit https://gerrit.wikimedia.org/r/164756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26fe6d723540b67da533e6b916a6a288a4ddc4c9
Gerrit-PatchSet: 3
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Saltymule danielmuel...@uwalumni.com
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Prevent app from using css if 200 response but error message... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Prevent app from using css if 200 response but error message found. .. Prevent app from using css if 200 response but error message found. Change-Id: I58462c3a20f96df4411f444e049a441c92007aec --- M wikipedia/Data/Operations/SyncAssetsFileOp.m 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Data/Operations/SyncAssetsFileOp.m b/wikipedia/Data/Operations/SyncAssetsFileOp.m index d8c89ad..c6f08c5 100644 --- a/wikipedia/Data/Operations/SyncAssetsFileOp.m +++ b/wikipedia/Data/Operations/SyncAssetsFileOp.m @@ -47,6 +47,9 @@ NSString *jsonString = [[NSString alloc] initWithData:weakSelf.dataRetrieved encoding:NSUTF8StringEncoding]; //NSLog(@jsonString = %@, jsonString); if (!jsonString || (jsonString.length == 0)) return; + +if ([jsonString hasPrefix:@/*\nInternal error\n*]) return; + NSString *filePath = assetsFile.path; NSError *error = nil; [jsonString writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:error]; -- To view, visit https://gerrit.wikimedia.org/r/165928 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58462c3a20f96df4411f444e049a441c92007aec Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for occasional crash when clearing saved pages. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Fix for occasional crash when clearing saved pages.
..
Fix for occasional crash when clearing saved pages.
Change-Id: I828294b6e0515d4a2d307a833581a5d0ea7de6f9
---
M wikipedia/Web Image Interception/URLCache.m
1 file changed, 24 insertions(+), 19 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Web Image Interception/URLCache.m b/wikipedia/Web Image
Interception/URLCache.m
index d764118..30e1d69 100644
--- a/wikipedia/Web Image Interception/URLCache.m
+++ b/wikipedia/Web Image Interception/URLCache.m
@@ -148,29 +148,34 @@
// Strip http: or https:
imageURL = [imageURL getUrlWithoutScheme];
-
-Image *imageFromDB = (Image *)[articleDataContext_.mainContext
getEntityForName: @Image withPredicateFormat:@sourceUrl == %@, imageURL];
-// If a core data Image was found, but its data length is zero, the Image
record was probably
-// created when the section html was parsed to create sectionImage
records, in which case
-// a request needs to actually be made, so set cachedResponse to nil so
this happens.
-// NSLog(@imageFromDB.data = %@, imageFromDB.data);
-if (imageFromDB (imageFromDB.imageData.data.length == 0)) {
-cachedResponse = nil;
-}else if (imageFromDB) {
-//NSLog(@CACHED IMAGE FOUND!! requestURL = %@, imageURL);
-NSData *imgData = imageFromDB.imageData.data;
-NSURLResponse *response = [[NSURLResponse alloc]
initWithURL:requestURL MIMEType:imageFromDB.mimeType
expectedContentLength:imgData.length textEncodingName:nil];
-cachedResponse = [[NSCachedURLResponse alloc]
initWithResponse:response data:imgData];
+[articleDataContext_.mainContext performBlockAndWait:^(){
-imageFromDB.dateLastAccessed = [NSDate date];
+Image *imageFromDB = (Image *)[articleDataContext_.mainContext
getEntityForName: @Image withPredicateFormat:@sourceUrl == %@, imageURL];
-NSError *error = nil;
-[articleDataContext_.mainContext save:error];
-if (error) {
-NSLog(@Error updating image dateLastAccessed in articleData
store: %@, error);
+// If a core data Image was found, but its data length is zero, the
Image record was probably
+// created when the section html was parsed to create sectionImage
records, in which case
+// a request needs to actually be made, so set cachedResponse to nil
so this happens.
+// NSLog(@imageFromDB.data = %@, imageFromDB.data);
+if (imageFromDB (imageFromDB.imageData.data.length == 0)) {
+cachedResponse = nil;
+}else if (imageFromDB) {
+//NSLog(@CACHED IMAGE FOUND!! requestURL = %@, imageURL);
+NSData *imgData = imageFromDB.imageData.data;
+NSURLResponse *response = [[NSURLResponse alloc]
initWithURL:requestURL MIMEType:imageFromDB.mimeType
expectedContentLength:imgData.length textEncodingName:nil];
+cachedResponse = [[NSCachedURLResponse alloc]
initWithResponse:response data:imgData];
+
+imageFromDB.dateLastAccessed = [NSDate date];
+
+NSError *error = nil;
+[articleDataContext_.mainContext save:error];
+if (error) {
+NSLog(@Error updating image dateLastAccessed in articleData
store: %@, error);
+}
}
-}
+
+}];
+
if (cachedResponse) return cachedResponse;
//NSLog(@CACHED IMAGE NOT FOUND! request.URL = %@, imageURL);
--
To view, visit https://gerrit.wikimedia.org/r/165668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I828294b6e0515d4a2d307a833581a5d0ea7de6f9
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Transition to AFNetworking from MWNetworkOp. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Transition to AFNetworking from MWNetworkOp. .. Transition to AFNetworking from MWNetworkOp. Added cocoapods Podfile and through it, AFNetworking and HPPLE. Note: build script is in place but commented out. Also, auto integration with workspace instead of xcodeproj is still too messy so the build script uses no-integrate flag and we manually reference the files we need for now. [I think I cleaned up the project integration mostly, but it still won't auto-update. But it auto-builds now. :D -brion] Fix for auto-login crash after creating an account. Handles ssl fail-over in more central place, not just in article retrieval. Search results ordering updated to reflect recent update to mobile web search. Fix for edit token parameters being deprecated. Scale Wikipedia Zero message bar (at bottom of screen) to scale with other native interface elements on iPads. Cleared out old testing cruft. New testing soon! Fix for search and nearby thumbnail images not loading on iOS 6 and 7. Modified fetchers to properly sanitize responses and used isDict category method rather than isSubclassOfClass. Change-Id: I991fac86a8788d3fd25595849b618a3d1ee7e699 --- M Wikipedia.xcodeproj/project.pbxproj D Wikipedia.xcodeproj/xcshareddata/xcschemes/Debug Wikipedia-iOS.xcscheme M Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme A cocoapods notes.txt A cocoapods/Podfile A cocoapods/Podfile.lock A cocoapods/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h A cocoapods/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m A cocoapods/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h A cocoapods/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m A cocoapods/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h A cocoapods/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m A cocoapods/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h A cocoapods/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m A cocoapods/Pods/AFNetworking/AFNetworking/AFNetworking.h A cocoapods/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h A cocoapods/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m A cocoapods/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h A cocoapods/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m A cocoapods/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h A cocoapods/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m A cocoapods/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h A cocoapods/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m A cocoapods/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h A cocoapods/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m A cocoapods/Pods/AFNetworking/LICENSE A cocoapods/Pods/AFNetworking/README.md A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h A cocoapods/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m A cocoapods/Pods/Headers/Build/AFNetworking/AFHTTPRequestOperation.h A cocoapods/Pods/Headers/Build/AFNetworking/AFHTTPRequestOperationManager.h A cocoapods/Pods/Headers/Build/AFNetworking/AFHTTPSessionManager.h A cocoapods/Pods/Headers/Build/AFNetworking/AFNetworkActivityIndicatorManager.h A cocoapods/Pods/Headers/Build/AFNetworking/AFNetworkReachabilityManager.h A cocoapods/Pods/Headers/Build/AFNetworking/AFNetworking.h A cocoapods/Pods/Headers/Build/AFNetworking/AFSecurityPolicy.h A cocoapods/Pods/Headers/Build/AFNetworking/AFURLConnectionOperation.h A cocoapods/Pods/Headers/Build/AFNetworking/AFURLRequestSerialization.h A cocoapods/Pods/Headers/Build/AFNetworking/AFURLResponseSerialization.h A
[MediaWiki-commits] [Gerrit] Update README. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Update README. .. Update README. Removed a few sections of the README that were either out of date or irrelevant. Change-Id: I32cc9190558806cefe58421abbe48918c7310779 --- M README.md 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: Brion VIBBER: Looks good to me, approved diff --git a/README.md b/README.md index d53fb54..4f50545 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ Native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. -Previous PhoneGap based app source: [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). - * OS target: iOS 6.0 or higher * Device target: iPhone, iPod, iPad * License: MIT-style @@ -27,7 +25,7 @@ You'll also need to install the following (used by build scripts): * [nodejs](http://nodejs.org/) and npm -* grunt-cli (run 'npm install -g grunt-cli') +* grunt-cli (run 'sudo npm install -g grunt-cli') * [Inkscape](http://www.inkscape.org/en/download/mac-os/) @@ -53,12 +51,6 @@ Components of the app will be relatively self-contained, communicating via NSNotificationCenter as a messaging bus to avoid over-close coupling of parts and to make test-driven development more feasible. - -# Design - -A major complaint about the currently deployed Wikipedia app is its non-iOS-y UI appearance and behavior. - -We'll be working with the Wikimedia Foundation's Design team on UI design, with an eye to coordinating the look branding with mobile web and Android while keeping a nice native iOS 7 feel. # Development team -- To view, visit https://gerrit.wikimedia.org/r/168545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32cc9190558806cefe58421abbe48918c7310779 Gerrit-PatchSet: 2 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana dga...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change Credits to About. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Change Credits to About.
..
Change Credits to About.
Includes version info and other items from Android version.
Updated doc type index.html to strict.
Updated doc types to not include outdated version info.
Re-added repositories section to About page.
Change-Id: I9914dd0c56af25d7ecf9cbeb25245b939540a0a4
---
M Wikipedia.xcodeproj/project.pbxproj
M scripts/icon-svgs-to-pngs.sh
M wikipedia/Base.lproj/Main_iPhone.storyboard
A wikipedia/Categories/UIWebView+LoadAssetsHtml.h
A wikipedia/Categories/UIWebView+LoadAssetsHtml.m
A wikipedia/Images.xcassets/WMFLogo_60.imageset/Contents.json
A wikipedia/Images.xcassets/WMFLogo_60.imageset/wmf_logo.svg
A wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_120.png
A wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_180.png
A wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_60.png
A wikipedia/View Controllers/About/AboutViewController.h
A wikipedia/View Controllers/About/AboutViewController.m
A wikipedia/View Controllers/About/AboutViewController.plist
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
A wikipedia/assets/about.html
M wikipedia/assets/abusefilter.html
A wikipedia/assets/images/wmflogo_120.png
A wikipedia/assets/images/wmflogo_180.png
A wikipedia/assets/images/wmflogo_60.png
M wikipedia/assets/index.html
M wikipedia/assets/preview.html
M wikipedia/en.lproj/Localizable.strings
M wikipedia/mw-bridge/CommunicationBridge.m
M wikipedia/qqq.lproj/Localizable.strings
M www/Gruntfile.js
A www/about.html
M www/abusefilter.html
A www/images/wmflogo_120.png
A www/images/wmflogo_180.png
A www/images/wmflogo_60.png
M www/index.html
M www/preview.html
32 files changed, 715 insertions(+), 35 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index db352b1..ad429ca 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -46,6 +46,7 @@
042B3996192EAEEA0066B270 /* ShareMenuSavePageActivity.m in
Sources */ = {isa = PBXBuildFile; fileRef = 042B3995192EAEEA0066B270 /*
ShareMenuSavePageActivity.m */; };
0433542218A023FE009305F0 /* UIViewController+HideKeyboard.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0433542118A023FE009305F0 /*
UIViewController+HideKeyboard.m */; };
0433542618A093C5009305F0 /* UIView+RemoveConstraints.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0433542518A093C5009305F0 /*
UIView+RemoveConstraints.m */; };
+ 0439317619FB092600386E8F /* UIWebView+LoadAssetsHtml.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0439317519FB092600386E8F /*
UIWebView+LoadAssetsHtml.m */; };
043DAC4B1901C3EE001CD17C /* CreditsViewController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 043DAC4A1901C3EE001CD17C /*
CreditsViewController.m */; };
043F18E118D9691D00D8489A /* TopActionSheetLabel.m in Sources */
= {isa = PBXBuildFile; fileRef = 043F18DC18D9691D00D8489A /*
TopActionSheetLabel.m */; };
043F18E518D9691D00D8489A /*
UINavigationController+TopActionSheet.m in Sources */ = {isa = PBXBuildFile;
fileRef = 043F18E018D9691D00D8489A /* UINavigationController+TopActionSheet.m
*/; };
@@ -66,6 +67,7 @@
04530AF81935C07500022512 /* ModalContentViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04530AF71935C07500022512 /*
ModalContentViewController.m */; };
04530AFB1935C2B500022512 /* EmptySegue.m in Sources */ = {isa =
PBXBuildFile; fileRef = 04530AFA1935C2B500022512 /* EmptySegue.m */; };
045A9F0D18F6090E0057EA85 /* assets in Resources */ = {isa =
PBXBuildFile; fileRef = 045A9F0C18F6090E0057EA85 /* assets */; };
+ 045D872119FAD2FA0035C1F9 /* AboutViewController.m in Sources */
= {isa = PBXBuildFile; fileRef = 045D872019FAD2FA0035C1F9 /*
AboutViewController.m */; };
045EFF1A19A25FEB00D0EDBB /* logo-placeholder-search.png in
Resources */ = {isa = PBXBuildFile; fileRef = 045EFF1819A25FEB00D0EDBB /*
logo-placeholder-search.png */; };
045EFF1B19A25FEB00D0EDBB /* logo-placeholder-sea...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 045EFF1919A25FEB00D0EDBB /*
logo-placeholder-sea...@2x.png */; };
0460F8DC19B0F932001BC59B /* CenteredPathView.m in Sources */ =
{isa = PBXBuildFile; fileRef = 0460F8DB19B0F932001BC59B /* CenteredPathView.m
*/; };
@@ -81,6 +83,7 @@
047ED63918C13E4900442BE3 /* PreviewWebView.m in Sources */ =
{isa = PBXBuildFile; fileRef = 047ED63818C13E4900442BE3 /* PreviewWebView.m */;
};
047FF5471889078C009DB293 /* Image+Convenience.m in Sources */ =
{isa = PBXBuildFile; fileRef = 047FF5461889078C009DB293 /*
[MediaWiki-commits] [Gerrit] Add text file containing the MIT Licence. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Add text file containing the MIT Licence. .. Add text file containing the MIT Licence. All software under the MIT Licence (which the README says this software is) should include a copy of the licence. I'm adding it accordingly. Change-Id: Id6dd3a3d0f0cbc4f4d2627a40958aa551035366d --- A MITLICENCE.txt 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/MITLICENCE.txt b/MITLICENCE.txt new file mode 100644 index 000..1d022e3 --- /dev/null +++ b/MITLICENCE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2014 Wikimedia Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- To view, visit https://gerrit.wikimedia.org/r/161345 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6dd3a3d0f0cbc4f4d2627a40958aa551035366d Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana dga...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Mhurd mh...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] README.md: Add a line about grunt-cli - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: README.md: Add a line about grunt-cli .. README.md: Add a line about grunt-cli Just installing nodejs and npm isn't enough to get the application compiling. Added the line so developers wouldn't have to search for why the shell script can't find grunt. Change-Id: I60f99cc6c993b6833a30a87f63d524f47950cd15 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/README.md b/README.md index a393584..d53fb54 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ You'll also need to install the following (used by build scripts): * [nodejs](http://nodejs.org/) and npm +* grunt-cli (run 'npm install -g grunt-cli') * [Inkscape](http://www.inkscape.org/en/download/mac-os/) -- To view, visit https://gerrit.wikimedia.org/r/161410 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60f99cc6c993b6833a30a87f63d524f47950cd15 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Saltymule danielmuel...@uwalumni.com Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: I7520ad01970d1eacdf369f3ea72696fc24ef464b --- M wikipedia/ce.lproj/Localizable.strings M wikipedia/he.lproj/Localizable.strings M wikipedia/ja.lproj/Localizable.strings M wikipedia/pt-br.lproj/Localizable.strings M wikipedia/pt.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/ro.lproj/Localizable.strings M wikipedia/ru.lproj/Localizable.strings M wikipedia/tr.lproj/Localizable.strings M wikipedia/uk.lproj/Localizable.strings M wikipedia/uk.lproj/Main_iPhone.strings M wikipedia/vi.lproj/Localizable.strings M wikipedia/zh-hans.lproj/Localizable.strings M wikipedia/zh-hant.lproj/Localizable.strings 14 files changed, 179 insertions(+), 22 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/ce.lproj/Localizable.strings b/wikipedia/ce.lproj/Localizable.strings index cf69699..85236f8 100644 --- a/wikipedia/ce.lproj/Localizable.strings +++ b/wikipedia/ce.lproj/Localizable.strings @@ -59,6 +59,7 @@ navbar-title-mode-edit-wikitext-preview = Хьалха муха ю хьажар; credits-wikimedia-repos = Викимедиа; credits-external-libraries = АгӀонгара; +share-menu-save-page = Ӏалашъе агӀо; share-menu-page-saved = АгӀо Ӏалашйина; timestamp-days = %d де хьалха; lastmodified-by-user = Хийцина $1 декъашхочо $2; diff --git a/wikipedia/he.lproj/Localizable.strings b/wikipedia/he.lproj/Localizable.strings index 8007240..1f71566 100644 --- a/wikipedia/he.lproj/Localizable.strings +++ b/wikipedia/he.lproj/Localizable.strings @@ -2,6 +2,7 @@ // Exported from translatewiki.net // Author: Amire80 // Author: Inkbug +// Author: Matanya // Author: איתן96 article-languages-label = בחירת שפה; @@ -126,7 +127,7 @@ edit-summary-choice-fixed-grammar = תיקנתי דקדוק; edit-summary-choice-fixed-inaccuracy = תיקנתי טעויות; edit-summary-choice-fixed-styling = תיקנתי עיצוב; -edit-summary-choice-fixed-typos = תיקנתי שגיאות כתיב; +edit-summary-choice-fixed-typos = תיקנתי טעות הקלדה; edit-summary-choice-added-category = הוספתי קטגוריה; edit-summary-choice-added-missing-info = הוספתי מידע חסר; edit-summary-choice-added-clarification = הוספתי הבהרה; diff --git a/wikipedia/ja.lproj/Localizable.strings b/wikipedia/ja.lproj/Localizable.strings index 4fcee05..4c8797d 100644 --- a/wikipedia/ja.lproj/Localizable.strings +++ b/wikipedia/ja.lproj/Localizable.strings @@ -4,6 +4,7 @@ // Author: Dude1717 // Author: Fryed-peach // Author: Shirayuki +// Author: Takot article-languages-label = 言語を選択; article-languages-cancel = キャンセル; @@ -19,12 +20,20 @@ history-clear-confirmation-sub-heading = この操作は取り消せません!; history-clear-cancel = キャンセル; history-clear-delete-all = すべて削除; +zero-free-verbiage = ブラウザからウィキペディアへの無料アクセス (通信料金は免除されます); +zero-charged-verbiage = ウィキペディアゼロはオフです; +zero-charged-verbiage-extended = その他の記事を読み込むとデータ料金が発生する場合があります。保存した記事はオフラインで保管されており、データ通信を使用しないため無料です。; zero-webpage-url = https://wikimediafoundation.org/wiki/Wikipedia_Zero_App_FAQ;; +zero-interstitial-title = ウィキペディアゼロを離れる; +zero-interstitial-leave-app = データ料金がかかるかもしれません。外部サイトへ接続しますか?; zero-interstitial-continue = 外部へ移動; zero-interstitial-cancel = 移動しない; +zero-learn-more = このウィキペディアアプリではデータ料金が免除されます; zero-learn-more-learn-more = さらに読む; zero-learn-more-no-thanks = 非表示; zero-wikipedia-zero-heading = ウィキペディアゼロ; +zero-warn-when-leaving = ウィキペディアゼロを離れる場合には警告; +zero-settings-devmode = ゼロ開発者モード; account-creation-captcha-required = CAPTCHA 検証が必要です。; account-creation-captcha-obtaining = 新しいCAPTCHAを取得; account-creation-logging-in = ログイン中...; diff --git a/wikipedia/pt-br.lproj/Localizable.strings b/wikipedia/pt-br.lproj/Localizable.strings index 64cb18b..7f0f460 100644 --- a/wikipedia/pt-br.lproj/Localizable.strings +++ b/wikipedia/pt-br.lproj/Localizable.strings @@ -1,5 +1,6 @@ // Messages for Brazilian Portuguese (português do Brasil) // Exported from translatewiki.net +// Author: !Silent // Author: Anaclaudiaml // Author: Dianakc // Author: Luckas @@ -7,39 +8,69 @@ article-languages-label = Escolha um idioma; article-languages-cancel = Cancelar; +article-languages-downloading = Carregando os idiomas do artigo...; +article-languages-filter-placeholder = Filtro de idioma; +language-button-text = Você pode ler este artigo em %d outros idiomas; history-label = Recente; history-section-today = Hoje; history-section-yesterday = Ontem; history-section-lastweek = Semana Passada; history-section-lastmonth = Mês Passado; -zero-interstitial-continue = Continuar; -zero-interstitial-cancel = Cancelar; -zero-learn-more-no-thanks = Não, obrigado; +history-clear-confirmation-heading = Excluir todos os itens recentes?; +history-clear-confirmation-sub-heading = Esta ação não pode ser desfeita!; +history-clear-cancel = Cancelar; +history-clear-delete-all =
[MediaWiki-commits] [Gerrit] Fix for share button on iPad - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162480
Change subject: Fix for share button on iPad
..
Fix for share button on iPad
Activity view controller must be presented in a popup on iPad,
but we were presenting it modally. This started crashing on
iOS 8. Nice! So, let's fix it.
Bug: 71189
Change-Id: I6da0feff6b415b9ac6e23bf712b85baf3a14188e
---
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/80/162480/1
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index 1a9b552..2ee0013 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -214,9 +214,16 @@
shareActivityVC.excludedActivityTypes = exclusions;
-[self presentViewController:shareActivityVC animated:YES completion:^{
-
-}];
+if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+[self presentViewController:shareActivityVC animated:YES
completion:nil];
+} else {
+// iPad crashes if you present share dialog modally. Whee!
+UIPopoverController *popover = [[UIPopoverController alloc]
initWithContentViewController:shareActivityVC];
+[popover presentPopoverFromRect:self.saveButton.frame
+ inView:self.view
+ permittedArrowDirections:UIPopoverArrowDirectionAny
+ animated:YES];
+}
[shareActivityVC setCompletionHandler:^(NSString *activityType, BOOL
completed) {
NSLog(@activityType = %@, activityType);
--
To view, visit https://gerrit.wikimedia.org/r/162480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6da0feff6b415b9ac6e23bf712b85baf3a14188e
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
[MediaWiki-commits] [Gerrit] Turn ... button into a More... button - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/163670 Change subject: Turn ... button into a More... button .. Turn ... button into a More... button Note I didn't all-caps the string as in the design, as the translators HATE it when we all-caps things. Change-Id: Ic977f508d3f170195a1544715b7f0d0f64349046 --- M wikipedia/Base.lproj/Main_iPhone.storyboard M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m M wikipedia/en.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings 4 files changed, 21 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/70/163670/1 diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard b/wikipedia/Base.lproj/Main_iPhone.storyboard index 0856e7d..c1a1320 100644 --- a/wikipedia/Base.lproj/Main_iPhone.storyboard +++ b/wikipedia/Base.lproj/Main_iPhone.storyboard @@ -1,10 +1,11 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=6245 systemVersion=13E28 targetRuntime=iOS.CocoaTouch propertyAccessControl=none useAutolayout=YES initialViewController=1qV-3k-dN1 +document type=com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB version=3.0 toolsVersion=6245 systemVersion=13F34 targetRuntime=iOS.CocoaTouch propertyAccessControl=none useAutolayout=YES initialViewController=1qV-3k-dN1 dependencies deployment defaultVersion=1536 identifier=iOS/ development version=5100 identifier=xcode/ plugIn identifier=com.apple.InterfaceBuilder.IBCocoaTouchPlugin version=6238/ capability name=Alignment constraints with different attributes minToolsVersion=5.1/ +capability name=Constraints to layout margins minToolsVersion=6.0/ /dependencies scenes !--Languages View Controller-- @@ -919,7 +920,7 @@ view contentMode=scaleToFill translatesAutoresizingMaskIntoConstraints=NO id=z4O-h7-mfv rect key=frame x=0.0 y=0.0 width=320 height=568/ subviews -view contentMode=scaleToFill translatesAutoresizingMaskIntoConstraints=NO id=m9e-S5-3FD userLabel=Empty marker +view contentMode=scaleToFill misplaced=YES translatesAutoresizingMaskIntoConstraints=NO id=m9e-S5-3FD userLabel=Empty marker rect key=frame x=0.0 y=165 width=320 height=238/ subviews imageView userInteractionEnabled=NO contentMode=scaleToFill horizontalHuggingPriority=251 verticalHuggingPriority=251 image=SavedPagesEmpty translatesAutoresizingMaskIntoConstraints=NO id=Nki-Th-pdU @@ -1237,7 +1238,7 @@ view contentMode=scaleToFill translatesAutoresizingMaskIntoConstraints=NO id=HLl-qz-Bgx rect key=frame x=0.0 y=0.0 width=320 height=568/ subviews -view contentMode=scaleToFill translatesAutoresizingMaskIntoConstraints=NO id=Yc2-71-IOD userLabel=Empty marker +view contentMode=scaleToFill misplaced=YES translatesAutoresizingMaskIntoConstraints=NO id=Yc2-71-IOD userLabel=Empty marker rect key=frame x=0.0 y=200 width=320 height=168/ subviews imageView userInteractionEnabled=NO contentMode=scaleToFill horizontalHuggingPriority=251 verticalHuggingPriority=251 image=RecentPagesEmpty translatesAutoresizingMaskIntoConstraints=NO id=o1U-9i-KeG @@ -1518,7 +1519,7 @@ rect key=frame x=0.0 y=0.0 width=320 height=568/ autoresizingMask key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/ subviews -tableView opaque=NO clearsContextBeforeDrawing=NO contentMode=scaleToFill alwaysBounceVertical=YES dataMode=prototypes style=plain separatorStyle=none showsSelectionImmediatelyOnTouchBegin=NO rowHeight=44 sectionHeaderHeight=22 sectionFooterHeight=22 translatesAutoresizingMaskIntoConstraints=NO id=k1z-U9-PgQ +tableView opaque=NO clearsContextBeforeDrawing=NO contentMode=scaleToFill ambiguous=YES misplaced=YES alwaysBounceVertical=YES dataMode=prototypes style=plain separatorStyle=none showsSelectionImmediatelyOnTouchBegin=NO rowHeight=44 sectionHeaderHeight=22 sectionFooterHeight=22 translatesAutoresizingMaskIntoConstraints=NO id=k1z-U9-PgQ rect key=frame x=15 y=0.0 width=290 height=518/ color
[MediaWiki-commits] [Gerrit] Stub launch images for iPhone 6, 6 Plus - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159524
Change subject: Stub launch images for iPhone 6, 6 Plus
..
Stub launch images for iPhone 6, 6 Plus
Fixes web view resolution to render properly instead of in scaled mode!
These images look wrong and will need to be replaced to do the zoom
effect properly, but something needed to be present to force the OS
to let us run at proper resolution.
Change-Id: Ia3038537784f84171b0d674ca707fab40e8fd478
---
M wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
M wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
A wikipedia/Images.xcassets/LaunchImage.launchimage/splash_1242x2208-1.png
A wikipedia/Images.xcassets/LaunchImage.launchimage/splash_2208x1242-1.png
A wikipedia/Images.xcassets/LaunchImage.launchimage/splash_750x1334-1.png
M wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
7 files changed, 40 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/24/159524/1
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
index 3f6a890..99c2814 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -37,6 +37,11 @@
scale : 2x
},
{
+ idiom : iphone,
+ size : 60x60,
+ scale : 3x
+},
+{
size : 29x29,
idiom : ipad,
filename : icon29.png,
diff --git a/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
b/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
index 85307b6..8a5fa02 100644
--- a/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/wikipedia/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,6 +1,33 @@
{
images : [
{
+ extent : full-screen,
+ idiom : iphone,
+ subtype : 736h,
+ filename : splash_1242x2208-1.png,
+ minimum-system-version : 8.0,
+ orientation : portrait,
+ scale : 3x
+},
+{
+ extent : full-screen,
+ idiom : iphone,
+ subtype : 736h,
+ filename : splash_2208x1242-1.png,
+ minimum-system-version : 8.0,
+ orientation : landscape,
+ scale : 3x
+},
+{
+ extent : full-screen,
+ idiom : iphone,
+ subtype : 667h,
+ filename : splash_750x1334-1.png,
+ minimum-system-version : 8.0,
+ orientation : portrait,
+ scale : 2x
+},
+{
orientation : portrait,
idiom : iphone,
extent : full-screen,
diff --git
a/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_1242x2208-1.png
b/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_1242x2208-1.png
new file mode 100644
index 000..833f74c
--- /dev/null
+++ b/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_1242x2208-1.png
Binary files differ
diff --git
a/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_2208x1242-1.png
b/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_2208x1242-1.png
new file mode 100644
index 000..14bcbe8
--- /dev/null
+++ b/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_2208x1242-1.png
Binary files differ
diff --git
a/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_750x1334-1.png
b/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_750x1334-1.png
new file mode 100644
index 000..b1cc040
--- /dev/null
+++ b/wikipedia/Images.xcassets/LaunchImage.launchimage/splash_750x1334-1.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
index 1e16a11..3fa1785 100644
--- a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
+++ b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
@@ -9,6 +9,10 @@
idiom : universal,
scale : 2x,
filename : recent240.png
+},
+{
+ idiom : universal,
+ scale : 3x
}
],
info : {
diff --git a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
index 6c80634..7c8fbed 100644
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
+++ b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
@@ -9,6 +9,10 @@
idiom : universal,
scale : 2x,
filename : savedpages240.png
+},
+{
+ idiom : universal,
+ scale : 3x
}
],
info : {
--
To view, visit https://gerrit.wikimedia.org/r/159524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3038537784f84171b0d674ca707fab40e8fd478
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] Fix RTL appearance of new ToC icons - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160081
Change subject: Fix RTL appearance of new ToC icons
..
Fix RTL appearance of new ToC icons
We had initially resolved the arrow-direction issue on RTL here by
swapping the two glyphs, but this put the arrow on the wrong side
of the greeked text representation in the icon.
Flipping it with a transform *seems* to work fine.
Tested in 6.1, 7.1, and 8.0.
Bug: 70491
Change-Id: Id63bf72ee5a09704f994102b19ea265dd89718a1
---
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
2 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/81/160081/1
diff --git a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
index fd87735..22fc1fc 100644
--- a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
@@ -242,18 +242,21 @@
BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL];
NSString *caret = !isRTL ? WIKIGLYPH_CARET_LEFT: IOS_WIKIGLYPH_FORWARD;
-NSString *toc = !isRTL ? IOS_WIKIGLYPH_TOC_COLLAPSED:
IOS_WIKIGLYPH_TOC_EXPANDED;
self.buttonX = getWikiGlyphButton(WIKIGLYPH_X,
MWLocalizedString(@menu-close-accessibility-label, nil), NAVBAR_BUTTON_X,
size);
self.buttonEye =getWikiGlyphButton(WIKIGLYPH_EYE,
MWLocalizedString(@menu-preview-accessibility-label, nil), NAVBAR_BUTTON_EYE,
size);
self.buttonArrowLeft = getWikiGlyphButton(caret,
MWLocalizedString(@menu-back-accessibility-label, nil),
NAVBAR_BUTTON_ARROW_LEFT, size);
self.buttonArrowRight = getWikiGlyphButton(caret,
MWLocalizedString(@menu-forward-accessibility-label, nil),
NAVBAR_BUTTON_ARROW_RIGHT, size);
self.buttonW = getWikiGlyphButton(IOS_WIKIGLYPH_W,
MWLocalizedString(@menu-w-accessibility-label, nil),
NAVBAR_BUTTON_LOGO_W, size);
-self.buttonTOC =getWikiGlyphButton(toc,
MWLocalizedString(@menu-toc-accessibility-label, nil), NAVBAR_BUTTON_TOC,
size);
+self.buttonTOC =getWikiGlyphButton(IOS_WIKIGLYPH_TOC_COLLAPSED,
MWLocalizedString(@menu-toc-accessibility-label, nil), NAVBAR_BUTTON_TOC,
size);
self.buttonMagnify =getWikiGlyphButton(IOS_WIKIGLYPH_MAGNIFY,
MWLocalizedString(@menu-search-accessibility-label, nil),
NAVBAR_BUTTON_MAGNIFY, size);
self.buttonBlank = getWikiGlyphButton(@, @,
NAVBAR_BUTTON_BLANK, size);
self.buttonCancel = getWikiGlyphButton(@,
MWLocalizedString(@menu-cancel-accessibility-label, nil),
NAVBAR_BUTTON_CANCEL, size);
self.buttonTrash = getWikiGlyphButton(WIKIGLYPH_TRASH,
MWLocalizedString(@menu-trash-accessibility-label, nil),
NAVBAR_BUTTON_TRASH, size);
+
+if (isRTL) {
+self.buttonTOC.transform =
CGAffineTransformScale(CGAffineTransformIdentity, -1.0, 1.0);
+}
self.buttonCancel.label.font = [UIFont systemFontOfSize:17.0];
self.buttonCancel.label.text = MWLocalizedString(@search-cancel, nil);
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index bb2ef1c..a4ac2dc 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -566,10 +566,8 @@
self.unsafeToToggleTOC = NO;
self.webView.scrollView.contentOffset =
origScrollPosition;
- BOOL isRTL = [WikipediaAppUtils
isDeviceLanguageRTL];
-
WikiGlyphButton *tocButton =
[ROOT.topMenuViewController getNavBarItem:NAVBAR_BUTTON_TOC];
- [tocButton.label setWikiText: (isRTL ?
IOS_WIKIGLYPH_TOC_EXPANDED: IOS_WIKIGLYPH_TOC_COLLAPSED)
+ [tocButton.label setWikiText:
IOS_WIKIGLYPH_TOC_COLLAPSED
color:
tocButton.label.color
size: tocButton.label.size
baselineOffset:
tocButton.label.baselineOffset];
@@ -625,10 +623,8 @@
}completion: ^(BOOL done){
self.unsafeToToggleTOC = NO;
- BOOL isRTL = [WikipediaAppUtils
isDeviceLanguageRTL];
-
WikiGlyphButton *tocButton =
[ROOT.topMenuViewController getNavBarItem:NAVBAR_BUTTON_TOC];
- [tocButton.label
[MediaWiki-commits] [Gerrit] Fixes for statusbar being hidden in landscape on iOS 8 - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160152
Change subject: Fixes for statusbar being hidden in landscape on iOS 8
..
Fixes for statusbar being hidden in landscape on iOS 8
Now checks for the actual status bar size and makes sure the
top menus get positioned and sized based on that.
Note there is an oddity where after doing a search or something
the status bar starts showing up in landscape again Might
have to tweak some of the other code about things wanting/not
wanting status bar to be adjusted.
Change-Id: Icb353a36c646a95300e9904178d88399ccacde92
---
M wikipedia/Categories/UIViewController+StatusBarHeight.m
M wikipedia/View Controllers/Root/RootViewController.m
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/52/160152/1
diff --git a/wikipedia/Categories/UIViewController+StatusBarHeight.m
b/wikipedia/Categories/UIViewController+StatusBarHeight.m
index 1a133b2..f1795db 100644
--- a/wikipedia/Categories/UIViewController+StatusBarHeight.m
+++ b/wikipedia/Categories/UIViewController+StatusBarHeight.m
@@ -7,7 +7,9 @@
-(CGFloat)getStatusBarHeight
{
-return 20;
+CGSize size = [UIApplication sharedApplication].statusBarFrame.size;
+CGFloat val = MIN(size.width, size.height);
+return val;
}
@end
diff --git a/wikipedia/View Controllers/Root/RootViewController.m
b/wikipedia/View Controllers/Root/RootViewController.m
index 890ba15..eb8df4f 100644
--- a/wikipedia/View Controllers/Root/RootViewController.m
+++ b/wikipedia/View Controllers/Root/RootViewController.m
@@ -418,6 +418,23 @@
}
}
+-
(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
duration:(NSTimeInterval)duration
+{
+// iOS 8 on phones hides the status bar in landscape mode. Surprise!
+// Make sure we update the top menu item positioning to match.
+[self.view setNeedsUpdateConstraints];
+[self.topMenuViewController.view setNeedsUpdateConstraints];
+}
+
+- (void)
didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+// iOS 8 on phones hides the status bar in landscape mode. Surprise!
+// Make sure we update the top menu item positioning to match.
+// We already did it before rotation, but sometimes this leaves us wrong.
+// Not sure why. Sigh.
+[self.view setNeedsUpdateConstraints];
+}
+
-(void)togglePrimaryMenu
{
if (
--
To view, visit https://gerrit.wikimedia.org/r/160152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb353a36c646a95300e9904178d88399ccacde92
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
[MediaWiki-commits] [Gerrit] Updates to readme.md - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Updates to readme.md .. Updates to readme.md Change-Id: I8f0fb7bbfc26c8e0d5be8dcc58c5e74bcced304d --- M README.md 1 file changed, 11 insertions(+), 14 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 704acd6..a393584 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,38 @@ # Wikipedia-iOS -New (late 2013) native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. +Native rewrite of the [Wikipedia reader application](https://www.mediawiki.org/wiki/Wikimedia_Apps/Wikipedia) for iOS. -This version has not yet been deployed to the App Store -- the source of the older app currently in the store is in the [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). +Previous PhoneGap based app source: [WikipediaMobile project on GitHub](https://github.com/wikimedia/WikipediaMobile). * OS target: iOS 6.0 or higher -* Device target: primary iPhone/iPod, secondary iPad +* Device target: iPhone, iPod, iPad * License: MIT-style * Source repo: * git clone https://git.wikimedia.org/git/apps/ios/wikipedia.git * Browse: https://git.wikimedia.org/summary/apps%2Fios%2Fwikipedia * Github mirror: https://github.com/wikimedia/apps-ios-wikipedia * Code review: https://gerrit.wikimedia.org/r/#/q/project:apps/ios/wikipedia,n,z -* Bugs: https://bugzilla.wikimedia.org/ +* Bugs: https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikipedia%20App * IRC chat: #wikimedia-mobile on irc.freenode.net # Building -Requires [Xcode 5 or higher](https://itunes.apple.com/us/app/xcode/id497799835) on Mac OS X, with the bundled iOS 7 SDK. You may need to get Xcode 5.1 beta with iOS 7.1 beta to support the latest storyboard - it's available at [developer.apple.com](https://developer.apple.com/) after signing in with your Apple ID. +Requires [Xcode 6 or higher](https://itunes.apple.com/us/app/xcode/id497799835) on Mac OS X - available at [developer.apple.com](https://developer.apple.com/) after signing in with your Apple ID. -Standard Xcode project stuff: check out the repo, open Wikipedia.xcodeproj in Xcode 5, pick a device or simulator target and hit ⌘R. +Standard Xcode project stuff: check out the repo, open Wikipedia.xcodeproj in Xcode, pick a device or simulator target and hit ⌘R. Note that due to Apple's restrictions on iOS app installation, to run a custom build on a standard iOS device you must pay for a [developer account with Apple](https://developer.apple.com/devcenter/ios/index.action) and register the device with your account. -You'll also need to install [nodejs](http://nodejs.org/) and npm. +You'll also need to install the following (used by build scripts): -# Running tests - -In Xcode, hit ⌘U to run tests. Note that tests must run on iOS 7 simulator or device -- they do not run successfully on iOS 6.x. +* [nodejs](http://nodejs.org/) and npm +* [Inkscape](http://www.inkscape.org/en/download/mac-os/) # Filing Bugs -Please file bugs at [bugzilla.wikimedia.org](https://bugzilla.wikimedia.org/); use the Wikipedia App component. - -Note that existing bug reports for other versions of the app may be mixed in there; this requires some cleanup. +Please file bugs at [bugzilla.wikimedia.org](https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikipedia%20App); use the iOS App component. # Submitting patches @@ -67,7 +64,7 @@ The app is primarily being developed by the Wikimedia Foundation's [Mobile Apps team](https://www.mediawiki.org/wiki/Wikimedia_Apps/Team), starting at the end of October 2013. The team operates on an agile-style process with 2-week sprints, and checkin scrums on Monday/Wednesday/Friday at 10:15am US Pacific Time. -In addition to a general bug pool in Bugzilla, we'll be tracking ongoing work on the [backlog board](https://trello.com/b/h0B6QYBo/wikipedia-app-backlog) and active sprint boards on Trello. +In addition to a general bug pool in Bugzilla, we'll be tracking ongoing work on the [backlog board](https://trello.com/b/h0B6QYBo/mobile-app-backlog) and active sprint boards on Trello. Volunteer contributions are welcome! -- To view, visit https://gerrit.wikimedia.org/r/160161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f0fb7bbfc26c8e0d5be8dcc58c5e74bcced304d Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updates to icons and splash images for new screen sizes. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Updates to icons and splash images for new screen sizes. .. Updates to icons and splash images for new screen sizes. Change-Id: Id5845776be390f61351e06117c0887f1a9532d1f --- M Wikipedia.xcodeproj/project.pbxproj A scripts/icon-svgs-to-pngs.sh M wikipedia/AppDelegate.m M wikipedia/Fonts/makeFontFromSvgs.py M wikipedia/Fonts/makeSvgsFromFont.py M wikipedia/Images.xcassets/AppIcon.appiconset/Contents.json R wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg A wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon180-1.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon87-1.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon90.png D wikipedia/Images.xcassets/AppIcon.appiconset/svg and notes/notes.txt M wikipedia/Images.xcassets/LaunchImage.launchimage/splash_1242x2208-1.png M wikipedia/Images.xcassets/LaunchImage.launchimage/splash_2208x1242-1.png M wikipedia/Images.xcassets/LaunchImage.launchimage/splash_750x1334-1.png M wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json R wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent.svg A wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent360.png D wikipedia/Images.xcassets/RecentPagesEmpty.imageset/svg and notes/notes.txt M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json A wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages.svg M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png A wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages360.png D wikipedia/Images.xcassets/SavedPagesEmpty.imageset/svg and notes/notes.txt D wikipedia/Images.xcassets/SavedPagesEmpty.imageset/svg and notes/savedpages.svg M wikipedia/View Controllers/Onboarding/OnboardingViewController.m 29 files changed, 67 insertions(+), 66 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/Wikipedia.xcodeproj/project.pbxproj b/Wikipedia.xcodeproj/project.pbxproj index fdbcd9e..dc41b63 100644 --- a/Wikipedia.xcodeproj/project.pbxproj +++ b/Wikipedia.xcodeproj/project.pbxproj @@ -1217,32 +1217,6 @@ isa = PBXGroup; children = ( 043F18DA18D9691D00D8489A /* TopActionSheet */, - 04B91AA518E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.h */, - 04B91AA618E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.m */, - 04DB0BE818BD37F900B4BCF3 /* UIScrollView+ScrollSubviewToLocation.h */, - 04DB0BE918BD37F900B4BCF3 /* UIScrollView+ScrollSubviewToLocation.m */, - 04C695D018ED213000D9F2DA /* UIScrollView+NoHorizontalScrolling.h */, - 04C695D118ED213000D9F2DA /* UIScrollView+NoHorizontalScrolling.m */, - 0415581A18ADFA5C00B81A59 /* UIImage+ColorMask.h */, - 0415581B18ADFA5C00B81A59 /* UIImage+ColorMask.m */, - 047801BC18AE987900DBB747 /* UIButton+ColorMask.h */, - 047801BD18AE987900DBB747 /* UIButton+ColorMask.m */, - 0433542418A093C5009305F0 /* UIView+RemoveConstraints.h */, - 0433542518A093C5009305F0 /* UIView+RemoveConstraints.m */, - 0400EB0118AAEEC60043ECE2 /* UINavigationController+SearchNavStack.h */, - 0400EB0218AAEEC60043ECE2 /* UINavigationController+SearchNavStack.m */, - 049B640A18AAF36200D98BD4 /* UIViewController+SearchChildViewControllers.h */, - 049B640B18AAF36200D98BD4 /* UIViewController+SearchChildViewControllers.m */, - 0433542018A023FE009305F0 /* UIViewController+HideKeyboard.h */, - 0433542118A023FE009305F0 /* UIViewController+HideKeyboard.m */, - 04090A39187FB7D000577EDF /* UIView+Debugging.h */, - 04090A3A187FB7D000577EDF /* UIView+Debugging.m */, - 04C695CC18ED08D900D9F2DA /* UIView+SearchSubviews.h */, - 04C695CD18ED08D900D9F2DA /* UIView+SearchSubviews.m */, - 04B6924E18E77B2A00F88D8A /* UIWebView+HideScrollGradient.h */, - 04B6924F18E77B2A00F88D8A /* UIWebView+HideScrollGradient.m */, - 04F0E2E8186EDC1A00468738 /* UIWebView+ElementLocation.h */,
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: Ia29f682ded7a671a7b35b3b9cbf2a560f4a4eefd --- M wikipedia/es.lproj/Localizable.strings M wikipedia/ja.lproj/Localizable.strings M wikipedia/ja.lproj/Main_iPhone.strings M wikipedia/lb.lproj/Localizable.strings M wikipedia/nb.lproj/Localizable.strings M wikipedia/nl.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/ro.lproj/Localizable.strings M wikipedia/ru.lproj/Localizable.strings M wikipedia/sk.lproj/Localizable.strings M wikipedia/sv.lproj/Localizable.strings M wikipedia/zh-hans.lproj/Localizable.strings 12 files changed, 88 insertions(+), 19 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/es.lproj/Localizable.strings b/wikipedia/es.lproj/Localizable.strings index b5e66ca..3502f6e 100644 --- a/wikipedia/es.lproj/Localizable.strings +++ b/wikipedia/es.lproj/Localizable.strings @@ -146,8 +146,8 @@ credits-gerrit-repo = Rep. principal de aplicación (Gerrit); credits-github-mirror = App espejo (GitHub); credits-external-libraries = Repositorios externos; -share-menu-save-page = Guardar artículo; -share-menu-page-saved = Artículo guardado; +share-menu-save-page = Guardar página; +share-menu-page-saved = Guardado para leer sin conexión.; timestamp-just-now = ahora mismo; timestamp-minutes = hace %d minutos; timestamp-hours = hace %d horas; @@ -193,7 +193,7 @@ menu-more-accessibility-label = Más opciones; menu-trash-accessibility-label = Borrar; nearby-title = Cercanos; -nearby-distance-label-meters = $1 metros; +nearby-distance-label-meters = $1 m; nearby-distance-label-km = $1 km; nearby-distance-label-feet = $1 pies; nearby-distance-label-miles = $1 millas; diff --git a/wikipedia/ja.lproj/Localizable.strings b/wikipedia/ja.lproj/Localizable.strings index 034c82e..4fcee05 100644 --- a/wikipedia/ja.lproj/Localizable.strings +++ b/wikipedia/ja.lproj/Localizable.strings @@ -15,6 +15,7 @@ history-section-yesterday = 昨日; history-section-lastweek = 先週; history-section-lastmonth = 先月; +history-clear-confirmation-heading = 最近の項目をすべて削除しますか？; history-clear-confirmation-sub-heading = この操作は取り消せません!; history-clear-cancel = キャンセル; history-clear-delete-all = すべて削除; @@ -95,7 +96,9 @@ main-menu-heading-zero = ウィキペディア ゼロ; main-menu-heading-legal = 法的な事柄; main-menu-show-today = 今日; +main-menu-nearby = 付近; saved-pages-title = 保存したページ; +saved-pages-clear-confirmation-heading = 保存した項目をすべて削除しますか？; saved-pages-clear-confirmation-sub-heading = この操作は取り消せません!; saved-pages-clear-cancel = キャンセル; saved-pages-clear-delete-all = すべて削除; @@ -129,9 +132,12 @@ article-pull-to-refresh-is-refreshing = 記事の再読み込み中; credits-title = オープンソースのリポジトリ; credits-wikimedia-repos = ウィキメディア; +credits-gerrit-repo = アプリ・メイン (Gerrit); +credits-github-mirror = アプリ・ミラー (GitHub); credits-external-libraries = 外部リポジトリ; share-menu-save-page = ページを保存; share-menu-page-saved = 記事を保存しました; +share-menu-page-saved-access = ヒント: 保存したページにアクセスするには、上部の$1をタップするか、下部の$2を長押しします。; timestamp-just-now = ちょうど今; timestamp-minutes = %d分前; timestamp-hours = %d時間前; @@ -180,9 +186,20 @@ menu-share-accessibility-label = 共有; menu-more-accessibility-label = その他の設定; menu-trash-accessibility-label = 削除; +nearby-title = 付近; nearby-distance-label-meters = $1 m; nearby-distance-label-km = $1 km; nearby-distance-label-feet = $1 フィート; nearby-distance-label-miles = $1 マイル; +nearby-pull-to-refresh-prompt = 引っ張って更新; +nearby-pull-to-refresh-is-refreshing = 更新中...; +nearby-loading = 付近の記事を読み込んでいます...; +nearby-loaded = 付近の記事を読み込みました; +nearby-none = 付近の記事が見つかりませんでした。引っ張って更新するか、後ほどもう一度試してみてください。; +nearby-open-in-maps = マップで開く; nearby-cancel = キャンセル; +nearby-location-updates-denied = このアプリには位置情報の更新を受け取る許可がありません。; +nearby-location-updates-enable = 位置情報の更新を有効にするには、設定アプリを開いて以下の様に選択してください:; nearby-location-updates-settings-menu = プライバシー 位置情報サービス ウィキペディア; +nearby-location-general-error = 位置を確定できません。引っ張って更新するか、後ほどもう一度試してみてください。; +nearby-wifi = Wi-Fi を有効にすると、位置情報の精度をより高めることができます。; diff --git a/wikipedia/ja.lproj/Main_iPhone.strings b/wikipedia/ja.lproj/Main_iPhone.strings index bfa143e..b128ad7 100644 --- a/wikipedia/ja.lproj/Main_iPhone.strings +++ b/wikipedia/ja.lproj/Main_iPhone.strings @@ -17,6 +17,7 @@ c3c-PU-Exz.text = アカウントを作成; gPg-cg-Yjy.placeholder = 上に示した画像に書いてある文字を入力してください; heA-3K-nhS.text = アカウントを既にお持ちの場合は、ログインしてください; +huU-kO-aYI.text = すべて削除してしまったようです。次にページをみた際にはここからそのページへと戻ることができます。; jiW-Cg-oL3.text = アカウントを作成; kVb-lx-d6C.placeholder = パスワード; mAk-1N-jPC.placeholder = 利用者名; diff --git a/wikipedia/lb.lproj/Localizable.strings b/wikipedia/lb.lproj/Localizable.strings index 9e324e9..cb448b0 100644 --- a/wikipedia/lb.lproj/Localizable.strings +++ b/wikipedia/lb.lproj/Localizable.strings @@ -195,3 +195,6 @@
[MediaWiki-commits] [Gerrit] Initial SavedPages eventlogging for iOS - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160496
Change subject: Initial SavedPages eventlogging for iOS
..
Initial SavedPages eventlogging for iOS
Change-Id: Iba7164704a950e53a60988f194787fa97b4415fd
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Data/Operations/LogEventOp.h
M wikipedia/Data/Operations/LogEventOp.m
M wikipedia/EventLogging/EventLoggingFunnel.h
M wikipedia/EventLogging/EventLoggingFunnel.m
M wikipedia/Importer/ArticleImporter.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.h
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
M wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.h
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
12 files changed, 54 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/96/160496/1
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index dc41b63..79b1da7 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -178,6 +178,7 @@
D46CD8C418A1AC4F0042959E /* InfoPlist.strings in Resources */ =
{isa = PBXBuildFile; fileRef = D46CD8C018A1AC4F0042959E /* InfoPlist.strings
*/; };
D46CD8C518A1AC4F0042959E /* Localizable.strings in Resources */
= {isa = PBXBuildFile; fileRef = D46CD8C218A1AC4F0042959E /*
Localizable.strings */; };
D474CC15182AE196002BDE45 /* MWSite.m in Sources */ = {isa =
PBXBuildFile; fileRef = D474CC14182AE196002BDE45 /* MWSite.m */; };
+ D47BF5D4197870390067C3BC /* SavedPagesFunnel.m in Sources */ =
{isa = PBXBuildFile; fileRef = D47BF5D3197870390067C3BC /* SavedPagesFunnel.m
*/; };
D4991439181D51DE00E6073C /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = D4991438181D51DE00E6073C /*
Foundation.framework */; };
D499143B181D51DE00E6073C /* CoreGraphics.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = D499143A181D51DE00E6073C /*
CoreGraphics.framework */; };
D499143D181D51DE00E6073C /* UIKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = D499143C181D51DE00E6073C /* UIKit.framework */;
};
@@ -634,6 +635,8 @@
D474CC12182AE07C002BDE45 /* WikipediaApp.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WikipediaApp.h; sourceTree = group; };
D474CC13182AE196002BDE45 /* MWSite.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
MWSite.h; path = mw-support/MWSite.h; sourceTree = group; };
D474CC14182AE196002BDE45 /* MWSite.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= MWSite.m; path = mw-support/MWSite.m; sourceTree = group; };
+ D47BF5D2197870390067C3BC /* SavedPagesFunnel.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SavedPagesFunnel.h; path = EventLogging/SavedPagesFunnel.h; sourceTree =
group; };
+ D47BF5D3197870390067C3BC /* SavedPagesFunnel.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= SavedPagesFunnel.m; path = EventLogging/SavedPagesFunnel.m; sourceTree =
group; };
D4991435181D51DE00E6073C /* Wikipedia.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = Wikipedia.app; sourceTree = BUILT_PRODUCTS_DIR; };
D4991438181D51DE00E6073C /* Foundation.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
D499143A181D51DE00E6073C /* CoreGraphics.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreGraphics.framework; path =
System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -1621,6 +1624,8 @@
D4F277FA194235A00032BA38 /*
ProtectedEditAttemptFunnel.m */,
D4F277FC194235B50032BA38 /*
ToCInteractionFunnel.h */,
D4F277FD194235B50032BA38 /*
ToCInteractionFunnel.m */,
+ D47BF5D2197870390067C3BC /* SavedPagesFunnel.h
*/,
+ D47BF5D3197870390067C3BC /* SavedPagesFunnel.m
*/,
);
name = EventLogging;
sourceTree = group;
@@ -2045,6 +2050,7 @@
04C43A9D183440B0006C643B /* MWCrumbyTest.m in
[MediaWiki-commits] [Gerrit] update language project files - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160806
Change subject: update language project files
..
update language project files
Change-Id: I4338cd38c15918316404112bc3e30e0e91bf8b33
---
M Wikipedia.xcodeproj/project.pbxproj
A wikipedia/da.lproj/Localizable.strings
2 files changed, 262 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/06/160806/1
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index dc41b63..fc9284e 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -178,6 +178,7 @@
D46CD8C418A1AC4F0042959E /* InfoPlist.strings in Resources */ =
{isa = PBXBuildFile; fileRef = D46CD8C018A1AC4F0042959E /* InfoPlist.strings
*/; };
D46CD8C518A1AC4F0042959E /* Localizable.strings in Resources */
= {isa = PBXBuildFile; fileRef = D46CD8C218A1AC4F0042959E /*
Localizable.strings */; };
D474CC15182AE196002BDE45 /* MWSite.m in Sources */ = {isa =
PBXBuildFile; fileRef = D474CC14182AE196002BDE45 /* MWSite.m */; };
+ D47FEE2019C8CBB998C8 /* Main_iPhone.strings in Resources */
= {isa = PBXBuildFile; fileRef = D47FEE1E19C8CBB998C8 /*
Main_iPhone.strings */; };
D4991439181D51DE00E6073C /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = D4991438181D51DE00E6073C /*
Foundation.framework */; };
D499143B181D51DE00E6073C /* CoreGraphics.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = D499143A181D51DE00E6073C /*
CoreGraphics.framework */; };
D499143D181D51DE00E6073C /* UIKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = D499143C181D51DE00E6073C /* UIKit.framework */;
};
@@ -634,6 +635,15 @@
D474CC12182AE07C002BDE45 /* WikipediaApp.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WikipediaApp.h; sourceTree = group; };
D474CC13182AE196002BDE45 /* MWSite.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
MWSite.h; path = mw-support/MWSite.h; sourceTree = group; };
D474CC14182AE196002BDE45 /* MWSite.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= MWSite.m; path = mw-support/MWSite.m; sourceTree = group; };
+ D47FEE1F19C8CBB998C8 /* av */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = av; path =
av.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2119C8CB0F00B998C8 /* bcl */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = bcl; path =
bcl.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2219C8CB2200B998C8 /* bto */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = bto; path =
bto.lproj/InfoPlist.strings; sourceTree = group; };
+ D47FEE2319C8CB3400B998C8 /* ce */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = ce; path =
ce.lproj/Localizable.strings; sourceTree = group; };
+ D47FEE2419C8CB6B00B998C8 /* cs */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = cs; path =
cs.lproj/InfoPlist.strings; sourceTree = group; };
+ D47FEE2519C8CB6B00B998C8 /* cs */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = cs; path =
cs.lproj/Localizable.strings; sourceTree = group; };
+ D47FEE2619C8CB6B00B998C8 /* cs */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = cs; path =
cs.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2719C8CBB400B998C8 /* ta */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = ta; path =
ta.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2819C8CC2600B998C8 /* pt-BR */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = pt-BR; path =
pt-BR.lproj/Localizable.strings; sourceTree = group; };
D4991435181D51DE00E6073C /* Wikipedia.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = Wikipedia.app; sourceTree = BUILT_PRODUCTS_DIR; };
D4991438181D51DE00E6073C /* Foundation.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
D499143A181D51DE00E6073C /* CoreGraphics.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreGraphics.framework; path =
System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -1522,6 +1532,7 @@
[MediaWiki-commits] [Gerrit] update language project files - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: update language project files
..
update language project files
Change-Id: I4338cd38c15918316404112bc3e30e0e91bf8b33
---
M Wikipedia.xcodeproj/project.pbxproj
1 file changed, 24 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index dc41b63..fc9284e 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -178,6 +178,7 @@
D46CD8C418A1AC4F0042959E /* InfoPlist.strings in Resources */ =
{isa = PBXBuildFile; fileRef = D46CD8C018A1AC4F0042959E /* InfoPlist.strings
*/; };
D46CD8C518A1AC4F0042959E /* Localizable.strings in Resources */
= {isa = PBXBuildFile; fileRef = D46CD8C218A1AC4F0042959E /*
Localizable.strings */; };
D474CC15182AE196002BDE45 /* MWSite.m in Sources */ = {isa =
PBXBuildFile; fileRef = D474CC14182AE196002BDE45 /* MWSite.m */; };
+ D47FEE2019C8CBB998C8 /* Main_iPhone.strings in Resources */
= {isa = PBXBuildFile; fileRef = D47FEE1E19C8CBB998C8 /*
Main_iPhone.strings */; };
D4991439181D51DE00E6073C /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = D4991438181D51DE00E6073C /*
Foundation.framework */; };
D499143B181D51DE00E6073C /* CoreGraphics.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = D499143A181D51DE00E6073C /*
CoreGraphics.framework */; };
D499143D181D51DE00E6073C /* UIKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = D499143C181D51DE00E6073C /* UIKit.framework */;
};
@@ -634,6 +635,15 @@
D474CC12182AE07C002BDE45 /* WikipediaApp.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WikipediaApp.h; sourceTree = group; };
D474CC13182AE196002BDE45 /* MWSite.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
MWSite.h; path = mw-support/MWSite.h; sourceTree = group; };
D474CC14182AE196002BDE45 /* MWSite.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= MWSite.m; path = mw-support/MWSite.m; sourceTree = group; };
+ D47FEE1F19C8CBB998C8 /* av */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = av; path =
av.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2119C8CB0F00B998C8 /* bcl */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = bcl; path =
bcl.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2219C8CB2200B998C8 /* bto */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = bto; path =
bto.lproj/InfoPlist.strings; sourceTree = group; };
+ D47FEE2319C8CB3400B998C8 /* ce */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = ce; path =
ce.lproj/Localizable.strings; sourceTree = group; };
+ D47FEE2419C8CB6B00B998C8 /* cs */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = cs; path =
cs.lproj/InfoPlist.strings; sourceTree = group; };
+ D47FEE2519C8CB6B00B998C8 /* cs */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = cs; path =
cs.lproj/Localizable.strings; sourceTree = group; };
+ D47FEE2619C8CB6B00B998C8 /* cs */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = cs; path =
cs.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2719C8CBB400B998C8 /* ta */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = ta; path =
ta.lproj/Main_iPhone.strings; sourceTree = group; };
+ D47FEE2819C8CC2600B998C8 /* pt-BR */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = pt-BR; path =
pt-BR.lproj/Localizable.strings; sourceTree = group; };
D4991435181D51DE00E6073C /* Wikipedia.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = Wikipedia.app; sourceTree = BUILT_PRODUCTS_DIR; };
D4991438181D51DE00E6073C /* Foundation.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
D499143A181D51DE00E6073C /* CoreGraphics.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreGraphics.framework; path =
System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -1522,6 +1532,7 @@
D499143E181D51DE00E6073C /* Wikipedia */ = {
isa = PBXGroup;
[MediaWiki-commits] [Gerrit] Fix for title case sensitivity bug. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Fix for title case sensitivity bug.
..
Fix for title case sensitivity bug.
Ferris Wheel and Ferris wheel were not seen as distinct, for example.
Change-Id: I16f77ffd189227a807b284507db60fc3ab5744b3
---
M wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
b/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
index ff263c4..b8814e5 100644
--- a/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
+++ b/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
@@ -40,7 +40,7 @@
-(NSManagedObjectID *)getArticleIDForTitle:(NSString *)title domain:(NSString
*)domain
{
Article *article = (Article *)[self getEntityForName: @Article
withPredicateFormat: @\
- title ==[c] %@ \
+ title == %@ \
AND \
site == %@ \
AND \
--
To view, visit https://gerrit.wikimedia.org/r/157642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16f77ffd189227a807b284507db60fc3ab5744b3
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] No longer use star icon to avoid future conflict w watchlist. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: No longer use star icon to avoid future conflict w watchlist.
..
No longer use star icon to avoid future conflict w watchlist.
Also bundled font svg conversion scripts.
Removed cruft.
Change-Id: Ib02e9b74d78d523aa491c7a3f1a87b6a7d3b9d19
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Categories/Alerts/UIViewController+Alert.h
M wikipedia/Categories/Alerts/UIViewController+Alert.m
M wikipedia/Defines/WikiGlyph_Chars_iOS.h
M wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
A wikipedia/Fonts/makeFontFromSvgs.py
A wikipedia/Fonts/makeSvgsFromFont.py
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
M wikipedia/MenuLabel/WikiGlyphLabel.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
M wikipedia/assets/abusefilter.css
M wikipedia/assets/preview.css
M wikipedia/assets/styles.css
20 files changed, 380 insertions(+), 137 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index c07e32a..fcc6f92 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1791,7 +1791,6 @@
buildActionMask = 2147483647;
files = (
04D3082C19991CB60034F106 /*
logo-placeholder-nea...@2x.png in Resources */,
- 0466F44F183A30CC00EA1FD7 /*
logo-search-placeholder.png in Resources */,
D46CD8C418A1AC4F0042959E /* InfoPlist.strings
in Resources */,
045EFF1B19A25FEB00D0EDBB /*
logo-placeholder-sea...@2x.png in Resources */,
D4991454181D51DE00E6073C /* Images.xcassets in
Resources */,
diff --git a/wikipedia/Categories/Alerts/AlertLabel.m
b/wikipedia/Categories/Alerts/AlertLabel.m
index 4b0e0c1..ce30f09 100644
--- a/wikipedia/Categories/Alerts/AlertLabel.m
+++ b/wikipedia/Categories/Alerts/AlertLabel.m
@@ -2,6 +2,8 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import AlertLabel.h
+#import WMF_Colors.h
+#import Defines.h
@implementation AlertLabel
@@ -16,10 +18,10 @@
self.minimumScaleFactor = 0.2;
self.font = [UIFont systemFontOfSize:10];
self.textAlignment = NSTextAlignmentCenter;
-self.textColor = [UIColor darkGrayColor];
+self.textColor = [UIColor colorWithWhite:0.0 alpha:1.0];
self.numberOfLines = 0;
self.lineBreakMode = NSLineBreakByWordWrapping;
-self.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
+self.backgroundColor = CHROME_COLOR;
self.userInteractionEnabled = YES;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]
initWithTarget:self action:@selector(tap)];
diff --git a/wikipedia/Categories/Alerts/UIViewController+Alert.h
b/wikipedia/Categories/Alerts/UIViewController+Alert.h
index 63cbf4f..2004bce 100644
--- a/wikipedia/Categories/Alerts/UIViewController+Alert.h
+++ b/wikipedia/Categories/Alerts/UIViewController+Alert.h
@@ -15,12 +15,4 @@
-(void)hideAlert;
-// Shows full screen alert html just beneath the nav bar.
-// Any links open in Safari.
--(void)showHTMLAlert: (NSString *)html
- bannerImage: (UIImage *)bannerImage
- bannerColor: (UIColor *)bannerColor;
-
--(void)hideHTMLAlert;
-
@end
diff --git a/wikipedia/Categories/Alerts/UIViewController+Alert.m
b/wikipedia/Categories/Alerts/UIViewController+Alert.m
index 1f1fa59..7fc20ad 100644
--- a/wikipedia/Categories/Alerts/UIViewController+Alert.m
+++ b/wikipedia/Categories/Alerts/UIViewController+Alert.m
@@ -3,7 +3,6 @@
#import UIViewController+Alert.h
#import AlertLabel.h
-#import AlertWebView.h
#import UIView+RemoveConstraints.h
@implementation UIViewController (Alert)
@@ -23,6 +22,8 @@
if (!alertLabel) {
alertLabel = [[AlertLabel alloc] init];
alertLabel.translatesAutoresizingMaskIntoConstraints = NO;
+//alertLabel.layer.cornerRadius = 3.0f;
+//alertLabel.clipsToBounds = YES;
[alertContainer addSubview:alertLabel];
[self constrainAlertView:alertLabel fullScreen:NO];
}
@@ -99,61 +100,17 @@
}
*/
--(void)showHTMLAlert: (NSString *)html
- bannerImage: (UIImage
[MediaWiki-commits] [Gerrit] Alerts now support duration, position and attributed strings. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Alerts now support duration, position and attributed strings.
..
Alerts now support duration, position and attributed strings.
Further stability improvements.
Change-Id: I473b5f02319d016b7c4cf8bfd7dea9b1930dcbef
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/AppDelegate.m
M wikipedia/Categories/Alerts/AlertLabel.h
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Categories/Alerts/UIViewController+Alert.h
M wikipedia/Categories/Alerts/UIViewController+Alert.m
M wikipedia/Categories/NSString+Extras.m
M wikipedia/Categories/NSURLRequest+DictionaryRequest.m
M wikipedia/Categories/TopActionSheet/UINavigationController+TopActionSheet.m
M wikipedia/Categories/UINavigationController+SearchNavStack.m
M wikipedia/Categories/UIView+Debugging.m
M wikipedia/Categories/UIView+RemoveConstraints.m
M wikipedia/Categories/UIView+SearchSubviews.h
M wikipedia/Categories/UIView+SearchSubviews.m
M wikipedia/Categories/UIViewController+HideKeyboard.m
M wikipedia/Categories/UIViewController+SearchChildViewControllers.m
M wikipedia/Categories/UIWebView+HideScrollGradient.m
M wikipedia/Defines/Defines.h
A wikipedia/Images/logo-placeholder-saved.png
A wikipedia/Images/logo-placeholder-sa...@2x.png
M wikipedia/TabularScrollView/TabularScrollView.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Languages/LanguagesViewController.m
M wikipedia/View Controllers/Login/LoginViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuContainerView.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuContainerView.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/Onboarding/OnboardingViewController.m
M wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
M wikipedia/View Controllers/Preview/PreviewLicenseView.m
M wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/SavedPages/SavedPagesViewController.m
M wikipedia/View Controllers/SearchResults/SearchResultsController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
M wikipedia/View Controllers/TableOfContents/TOCViewController.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
44 files changed, 503 insertions(+), 315 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index fcc6f92..fd95100 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
041A3B6218E11ED90079FF1C /* LanguagesViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 041A3B5D18E11ED90079FF1C /*
LanguagesViewController.m */; };
041C55D21950B27D006CE0EF /* EditSummaryViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 041C55D11950B27D006CE0EF /*
EditSummaryViewController.m */; };
041C6206199ED2A20061516F /* Section+TOC.m in Sources */ = {isa
= PBXBuildFile; fileRef = 041C6205199ED2A20061516F /* Section+TOC.m */; };
+ 041E588219B2D2C500AC140C /* logo-placeholder-saved.png in
Resources */ = {isa = PBXBuildFile; fileRef = 041E588019B2D2C500AC140C /*
logo-placeholder-saved.png */; };
+ 041E588319B2D2C500AC140C /* logo-placeholder-sa...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 041E588119B2D2C500AC140C /*
logo-placeholder-sa...@2x.png */; };
041EFC371996A1F800B2CB28 /* MapKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 041EFC361996A1F800B2CB28 /* MapKit.framework */;
};
04224500197F5E09005DD0BF /* AbuseFilterAlert.m in Sources */ =
{isa = PBXBuildFile; fileRef = 042244FC197F5E09005DD0BF /* AbuseFilterAlert.m
*/; };
04224501197F5E09005DD0BF /* BulletedLabel.m in Sources */ =
{isa = PBXBuildFile; fileRef = 042244FE197F5E09005DD0BF /* BulletedLabel.m */;
};
@@ -234,6 +236,8 @@
041C55D11950B27D006CE0EF /* EditSummaryViewController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; lineEnding = 0; path = EditSummaryViewController.m;
sourceTree = group; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
041C6204199ED2A20061516F /*
[MediaWiki-commits] [Gerrit] Pull to refresh faster. No longer sometimes stuck half onscr... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Pull to refresh faster. No longer sometimes stuck half onscreen.
..
Pull to refresh faster. No longer sometimes stuck half onscreen.
Change-Id: Ic35d4e44569e604b641538b9a7ddb217c7366144
---
M wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.h
M wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
3 files changed, 74 insertions(+), 82 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View
Controllers/PullToRefresh/PullToRefreshViewController.h b/wikipedia/View
Controllers/PullToRefresh/PullToRefreshViewController.h
index 1810cb7..161f96b 100644
--- a/wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.h
+++ b/wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.h
@@ -1,17 +1,10 @@
-//
-// PullToRefreshViewController.h
-// Wikipedia
-//
// Created by Brion on 7/8/14.
-// Copyright (c) 2014 Wikimedia Foundation. All rights reserved.
-//
+// Copyright (c) 2014 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import UIKit/UIKit.h
@interface PullToRefreshViewController : UIViewController
UIScrollViewDelegate
-@property (weak, nonatomic) NSLayoutConstraint
*pullToRefreshViewBottomConstraint;
-@property (strong, nonatomic) UILabel *pullToRefreshLabel;
@property (strong, nonatomic) UIView *pullToRefreshView;
/**
diff --git a/wikipedia/View
Controllers/PullToRefresh/PullToRefreshViewController.m b/wikipedia/View
Controllers/PullToRefresh/PullToRefreshViewController.m
index 42d8f3d..c1267f8 100644
--- a/wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.m
+++ b/wikipedia/View Controllers/PullToRefresh/PullToRefreshViewController.m
@@ -1,64 +1,46 @@
-//
-// PullToRefreshViewController.m
-// Wikipedia
-//
// Created by Brion on 7/8/14.
-// Copyright (c) 2014 Wikimedia Foundation. All rights reserved.
-//
+// Copyright (c) 2014 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import PullToRefreshViewController.h
@interface PullToRefreshViewController ()
+@property (strong, nonatomic) NSLayoutConstraint
*pullToRefreshViewBottomConstraint;
+@property (strong, nonatomic) UILabel *pullToRefreshLabel;
+@property (nonatomic) BOOL isAnimatingHide;
+
@end
@implementation PullToRefreshViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil
-{
-self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-if (self) {
-// Custom initialization
-}
-return self;
-}
- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view.
+self.isAnimatingHide = NO;
+
// Take over the scroll view's delegate
UIScrollView *scrollView = [self refreshScrollView];
-assert(scrollView != nil);
-scrollView.delegate = self;
-[self setupPullToRefresh];
+if(scrollView){
+scrollView.delegate = self;
+[self setupPullToRefresh];
+}
}
-
-- (void)didReceiveMemoryWarning
-{
-[super didReceiveMemoryWarning];
-// Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little
preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
-{
-// Get the new view controller using [segue destinationViewController].
-// Pass the selected object to the new view controller.
-}
-*/
#pragma mark - UIScrollViewDelegate methods
- (void)scrollViewDidScroll:(UIScrollView *)scrollView
{
-[self updatePullToRefreshForScrollView:scrollView];
-}
+if (self.isAnimatingHide || !self.pullToRefreshView) return;
+//NSUInteger numberToSkip = 2;
+//static NSInteger counter = -1;
+//if (++counter == numberToSkip) {
+[self updatePullToRefreshForScrollView:scrollView];
+//counter = -1;
+//}
+}
#pragma mark - Internal methods
@@ -66,7 +48,6 @@
{
self.pullToRefreshLabel = [[UILabel alloc] init];
self.pullToRefreshLabel.translatesAutoresizingMaskIntoConstraints = NO;
-self.pullToRefreshLabel.backgroundColor = [UIColor clearColor];
self.pullToRefreshLabel.textAlignment = NSTextAlignmentCenter;
self.pullToRefreshLabel.numberOfLines = 2;
self.pullToRefreshLabel.font = [UIFont systemFontOfSize:10];
@@ -74,7 +55,6 @@
self.pullToRefreshView = [[UIView alloc] init];
self.pullToRefreshView.alpha = 0.0f;
-self.pullToRefreshView.backgroundColor = [UIColor clearColor];
self.pullToRefreshView.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.pullToRefreshView];
[self.pullToRefreshView
[MediaWiki-commits] [Gerrit] Slight speedup for W menu. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Slight speedup for W menu. .. Slight speedup for W menu. Smoother appearance animation on iOS 6. Fix for iOS 8 W menu being white. Change-Id: I82d5f0d441bbe679a022deab592d5691fde03314 --- M wikipedia/Base.lproj/Main_iPhone.storyboard M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuTableViewCell.m M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m 3 files changed, 25 insertions(+), 20 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/Base.lproj/Main_iPhone.storyboard b/wikipedia/Base.lproj/Main_iPhone.storyboard index 87b09d2..20f8849 100644 --- a/wikipedia/Base.lproj/Main_iPhone.storyboard +++ b/wikipedia/Base.lproj/Main_iPhone.storyboard @@ -1581,32 +1581,33 @@ viewControllerLayoutGuide type=top id=l0x-rC-7XB/ viewControllerLayoutGuide type=bottom id=ms6-Ce-U0I/ /layoutGuides -view key=view contentMode=scaleToFill id=T6V-mj-ox6 +view key=view clearsContextBeforeDrawing=NO contentMode=scaleToFill id=T6V-mj-ox6 rect key=frame x=0.0 y=0.0 width=320 height=568/ autoresizingMask key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/ subviews -tableView clipsSubviews=YES contentMode=scaleToFill alwaysBounceVertical=YES dataMode=prototypes style=plain separatorStyle=none showsSelectionImmediatelyOnTouchBegin=NO rowHeight=44 sectionHeaderHeight=22 sectionFooterHeight=22 translatesAutoresizingMaskIntoConstraints=NO id=k1z-U9-PgQ +tableView opaque=NO clearsContextBeforeDrawing=NO contentMode=scaleToFill alwaysBounceVertical=YES dataMode=prototypes style=plain separatorStyle=none showsSelectionImmediatelyOnTouchBegin=NO rowHeight=44 sectionHeaderHeight=22 sectionFooterHeight=22 translatesAutoresizingMaskIntoConstraints=NO id=k1z-U9-PgQ rect key=frame x=15 y=0.0 width=290 height=518/ autoresizingMask key=autoresizingMask widthSizable=YES heightSizable=YES/ color key=backgroundColor white=0.0 alpha=0.0 colorSpace=calibratedWhite/ color key=sectionIndexBackgroundColor white=0.0 alpha=0.0 colorSpace=calibratedWhite/ prototypes -tableViewCell contentMode=scaleToFill restorationIdentifier=PrimaryTableViewCell selectionStyle=none indentationWidth=10 reuseIdentifier=PrimaryMenuCell rowHeight=60 id=Df6-ew-Wsc customClass=PrimaryMenuTableViewCell +tableViewCell opaque=NO clearsContextBeforeDrawing=NO contentMode=scaleToFill restorationIdentifier=PrimaryTableViewCell selectionStyle=none indentationWidth=10 reuseIdentifier=PrimaryMenuCell rowHeight=60 id=Df6-ew-Wsc customClass=PrimaryMenuTableViewCell rect key=frame x=0.0 y=22 width=290 height=60/ autoresizingMask key=autoresizingMask flexibleMaxX=YES flexibleMaxY=YES/ -tableViewCellContentView key=contentView opaque=NO clipsSubviews=YES multipleTouchEnabled=YES contentMode=center tableViewCell=Df6-ew-Wsc id=wvE-rA-5oS +tableViewCellContentView key=contentView opaque=NO clearsContextBeforeDrawing=NO multipleTouchEnabled=YES contentMode=center tableViewCell=Df6-ew-Wsc id=wvE-rA-5oS rect key=frame x=0.0 y=0.0 width=290 height=60/ autoresizingMask key=autoresizingMask/ subviews -label opaque=NO clipsSubviews=YES userInteractionEnabled=NO contentMode=left horizontalHuggingPriority=251 verticalHuggingPriority=251 text=Label lineBreakMode=wordWrap numberOfLines=0 baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO preferredMaxLayoutWidth=280 translatesAutoresizingMaskIntoConstraints=NO id=nI1-bn-0Ii customClass=PaddedLabel +label opaque=NO clearsContextBeforeDrawing=NO userInteractionEnabled=NO contentMode=left horizontalHuggingPriority=251 verticalHuggingPriority=251 text=Label lineBreakMode=wordWrap numberOfLines=0 baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO preferredMaxLayoutWidth=280 translatesAutoresizingMaskIntoConstraints=NO id=nI1-bn-0Ii customClass=PaddedLabel rect key=frame x=5 y=13 width=280 height=34/
[MediaWiki-commits] [Gerrit] iOS 8 fix for slide transitions. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: iOS 8 fix for slide transitions.
..
iOS 8 fix for slide transitions.
Was doing crossfade when articles selected from nearby, recent
or saved pages.
Change-Id: I0e9c9a31618054908b3378d68b8bf4993cfa5ef3
---
M wikipedia/View Controllers/ModalOverlay/ModalMenuAndContentViewController.m
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m b/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m
index 220c9f2..b7e9449 100644
--- a/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m
+++ b/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m
@@ -56,6 +56,11 @@
[self.view setNeedsUpdateConstraints];
}
+-(UIModalTransitionStyle)modalTransitionStyle
+{
+return self.presentedViewController.modalTransitionStyle;
+}
+
-(void)updateViewConstraints
{
[self constrainTopContainerHeight];
--
To view, visit https://gerrit.wikimedia.org/r/157786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e9c9a31618054908b3378d68b8bf4993cfa5ef3
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
