from:"BearND \(Code Review\)"

[MediaWiki-commits] [Gerrit] Use continue parameter to avoid API warnings. - change (apps...wikipedia)

2014-11-19 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174632

Change subject: Use continue parameter to avoid API warnings.
..

Use continue parameter to avoid API warnings.

So, the server doesn't need to spit out those unnecessary warnings
about new continuation syntax.
This warning seems uncalled for for queries that don't provide batching.

Change-Id: If9ac1a113ef99eacad412a9164257a7c054b4697
---
M wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
M wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
M wikipedia/src/main/java/org/wikipedia/random/RandomArticleIdTask.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
6 files changed, 13 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/32/174632/1

diff --git a/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java 
b/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
index 3661e27..7b51c7d 100644
--- a/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/PageQueryTask.java
@@ -23,7 +23,9 @@
 
 @Override
 public RequestBuilder buildRequest(Api api) {
-RequestBuilder builder = api.action(query).param(titles, 
TextUtils.join(|, titles));
+RequestBuilder builder = api.action(query)
+.param(titles, TextUtils.join(|, titles))
+.param(continue, ); // to avoid warning about new 
continuation syntax
 buildQueryParams(builder);
 return builder;
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java 
b/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
index ed329e3..a5dd191 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
@@ -12,7 +12,6 @@
 public class FetchSectionWikitextTask extends ApiTaskString {
 private final PageTitle title;
 private final int sectionID;
-private final WikipediaApp app;
 
 public FetchSectionWikitextTask(Context context, PageTitle title, int 
sectionID) {
 super(
@@ -21,7 +20,6 @@
 );
 this.title = title;
 this.sectionID = sectionID;
-this.app = (WikipediaApp)context.getApplicationContext();
 }
 
 @Override
@@ -39,7 +37,7 @@
 JSONObject pagesJSON = result.asObject()
 .optJSONObject(query)
 .optJSONObject(pages);
-String pageId = (String) pagesJSON.keys().next();
+String pageId = pagesJSON.keys().next();
 
 JSONObject revisionJSON = 
pagesJSON.optJSONObject(pageId).optJSONArray(revisions).getJSONObject(0);
 
diff --git 
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java 
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
index 98ab53d..5c86a4d 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksFetchTask.java
@@ -15,14 +15,12 @@
 
 public class LangLinksFetchTask extends ApiTaskArrayListPageTitle {
 private final PageTitle title;
-private final WikipediaApp app;
 public LangLinksFetchTask(Context context, PageTitle title) {
 super(
 SINGLE_THREAD,
 
((WikipediaApp)context.getApplicationContext()).getAPIForSite(title.getSite())
 );
 this.title = title;
-this.app = (WikipediaApp)context.getApplicationContext();
 }
 
 @Override
@@ -30,7 +28,8 @@
 return api.action(query)
 .param(prop, langlinks)
 .param(titles, title.getPrefixedText())
-.param(lllimit, 500);
+.param(lllimit, 500)
+.param(continue, ); // to avoid warning about new 
continuation syntax
 }
 
 @Override
@@ -39,7 +38,7 @@
 JSONObject pagesJSON = result.asObject()
 .optJSONObject(query)
 .optJSONObject(pages);
-String pageId = (String) pagesJSON.keys().next();
+String pageId = pagesJSON.keys().next();
 if (!pagesJSON.optJSONObject(pageId).has(langlinks)) {
 // No links found
 return linkTitles;
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
index c931614..ab0ed59 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
@@ -46,7 +46,8 @@
 .param(ggscoord,

[MediaWiki-commits] [Gerrit] Avoid NPE when going from search to another page - change (apps...wikipedia)

2014-11-19 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174636

Change subject: Avoid NPE when going from search to another page
..

Avoid NPE when going from search to another page

java.lang.NullPointerException
at org.wikipedia.Utils.hideSoftKeyboard(Utils.java:171)
at 
org.wikipedia.search.SearchArticlesFragment.navigateToTitle(SearchArticlesFragment.java:481)
at 
org.wikipedia.search.SearchArticlesFragment.navigateToTitle(SearchArticlesFragment.java:476)

Change-Id: I763a4b1c2f4acbc257930eab97206843478f10e3
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/36/174636/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index f3b6644..d615a36 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -477,6 +477,9 @@
 }
 
 public void navigateToTitle(PageTitle title) {
+if (!isAdded()) {
+return;
+}
 HistoryEntry historyEntry = new HistoryEntry(title, 
HistoryEntry.SOURCE_SEARCH);
 Utils.hideSoftKeyboard(getActivity());
 closeSearch();

-- 
To view, visit https://gerrit.wikimedia.org/r/174636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I763a4b1c2f4acbc257930eab97206843478f10e3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Display native Read more section - change (apps...wikipedia)

2014-11-20 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174821

Change subject: Display native Read more section
..

Display native Read more section

except on Main page, since that provides strange links.

(The layout at the end still needs to be fixed.
It overlaps with the attribution links.)

Change-Id: Idbe51ef33b24fd35383565b48331ef4461e4137e
---
M wikipedia/res/layout/fragment_page.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M 
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
3 files changed, 159 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/21/174821/1

diff --git a/wikipedia/res/layout/fragment_page.xml 
b/wikipedia/res/layout/fragment_page.xml
index 182174a..7b2d433 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -2,10 +2,11 @@
 
 FrameLayout
 xmlns:android=http://schemas.android.com/apk/res/android;
+xmlns:tools=http://schemas.android.com/tools;
 android:layout_width=match_parent
 android:layout_height=match_parent
 android:background=?attr/page_background_color
-
+tools:context=.page.PageActivity
 org.wikipedia.views.DisableableDrawerLayout
 android:id=@+id/page_toc_drawer
 android:layout_width=match_parent
@@ -81,6 +82,26 @@
 android:background=?attr/subtle_gray_color
 android:layout_gravity=bottom
 android:visibility=invisible
+LinearLayout
+android:id=@+id/read_more_container
+android:layout_width=match_parent
+android:layout_height=wrap_content
+android:orientation=vertical
+TextView
+style=?android:textAppearanceLarge
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:padding=16dp
+android:fontFamily=serif
+android:textSize=24sp
+android:text=@string/read_more_section
+/
+ListView
+android:id=@+id/read_more_list
+android:layout_width=match_parent
+android:layout_height=wrap_content
+/ListView
+/LinearLayout
 View
 android:layout_width=match_parent
 android:layout_height=8dp
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index f5eb4bb..5edaf28 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -467,7 +467,8 @@
 
 // create bottom content for this page...
 new BottomContentHandler(parentFragment, bridge, webView, 
linkHandler,
-(ViewGroup) 
parentFragment.getView().findViewById(R.id.bottom_content_container));
+(ViewGroup) 
parentFragment.getView().findViewById(R.id.bottom_content_container),
+title, page.getPageProperties().isMainPage());
 
 }
 });
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
 
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 8d594e7..2833b90 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -3,28 +3,51 @@
 import android.graphics.Point;
 import android.os.Build;
 import android.text.Html;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
+
+import com.squareup.picasso.Picasso;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wikipedia.PageTitle;
 import org.wikipedia.R;
 import org.wikipedia.Utils;
+import org.wikipedia.WikipediaApp;
 import org.wikipedia.bridge.CommunicationBridge;
+import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.page.LinkHandler;
 import org.wikipedia.page.LinkMovementMethodExt;
 import org.wikipedia.page.Page;
+import org.wikipedia.page.PageActivity;
 import org.wikipedia.page.PageViewFragment;
+import

[MediaWiki-commits] [Gerrit] Avoid IndexOutOfBoundsException in when loading page - change (apps...wikipedia)

2014-11-21 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174976

Change subject: Avoid IndexOutOfBoundsException in when loading page
..

Avoid IndexOutOfBoundsException in when loading page

Change-Id: I29ce4a6f682828a1d113246bf63e71b79cb2bec5
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/76/174976/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 2f5a2ce..edbc805 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -241,7 +241,7 @@
 if (index  page.getSections().size()) {
 wrapper.put(section, page.getSections().get(index).toJSON());
 wrapper.put(index, index);
-if (sectionTargetFromIntent  0) {
+if (sectionTargetFromIntent  0  sectionTargetFromIntent  
page.getSections().size()) {
 //if we have a section to scroll to (from our Intent):
 wrapper.put(fragment, 
page.getSections().get(sectionTargetFromIntent).getAnchor());
 } else if (sectionTargetFromTitle != null) {

-- 
To view, visit https://gerrit.wikimedia.org/r/174976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29ce4a6f682828a1d113246bf63e71b79cb2bec5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove W logo icon - change (apps...wikipedia)

2014-11-21 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175115

Change subject: Remove W logo icon
..

Remove W logo icon

Change-Id: I127e103f16f6f424bbba2bb9b20c3d9c20edc966
---
D icon-svgs/32/search_w.noflip.svg
M wikipedia/AndroidManifest.xml
D wikipedia/res/drawable-hdpi/search_w.png
D wikipedia/res/drawable-ldpi/search_w.png
D wikipedia/res/drawable-mdpi/search_w.png
D wikipedia/res/drawable-xhdpi/search_w.png
D wikipedia/res/drawable-xxhdpi/search_w.png
M wikipedia/res/layout/activity_main.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
9 files changed, 1 insertion(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/15/175115/1

diff --git a/icon-svgs/32/search_w.noflip.svg b/icon-svgs/32/search_w.noflip.svg
deleted file mode 100644
index 52676cd..000
--- a/icon-svgs/32/search_w.noflip.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  --
-!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
-svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
-width=80px height=80px viewBox=0 0 80 80 enable-background=new 
0 0 80 80 xml:space=preserve
-g
-   g
-   path fill=#231F20 
d=M44.577,15.773c1.985,0.075,4.119,0.147,5.81,0.147c1.692,0,3.53-0.072,5.368-0.147
-   
c0.44,0.442,0.44,1.985,0,2.427c-3.823,0.588-5.443,3.382-7.229,6.837l-5.375,10.227l9.404,19.478h0.339l13.962-30.219
-   
c1.742-3.978,1.616-5.957-3.162-6.323c-0.44-0.442-0.44-1.985,0-2.427c2.722,0.075,5.588,0.147,7.281,0.147
-   
c1.689,0,4.115-0.072,6.469-0.147c0.439,0.442,0.439,1.985,0,2.427c-4.19,0.44-5.596,3.315-7.229,6.837L52.812,62.535
-   
c-0.514,1.104-0.954,1.691-1.763,1.691c-0.737,0-1.301-0.596-1.691-1.691L39.47,41.191L28.624,62.535
-   
c-0.442,1.104-0.957,1.691-1.766,1.691c-0.734,0-1.248-0.588-1.69-1.691L9.177,24.89c-2.243-5.22-2.779-6.419-6.582-6.69
-   
c-0.44-0.442-0.514-1.985-0.073-2.427c2.573,0.075,5.199,0.147,7.647,0.147c2.228,0,5.221-0.072,8.161-0.147
-   
c0.44,0.442,0.44,1.985,0,2.427c-4.633,0.514-4.853,1.69-2.986,5.882l13.465,30.66h0.336l8.213-16.706L31.161,24.89
-   
c-2.463-5.22-3.051-6.25-6.213-6.69c-0.443-0.442-0.516-1.985-0.074-2.427c2.131,0.075,4.39,0.147,6.542,0.147
-   
c2.331,0,4.559-0.072,6.692-0.147c0.44,0.442,0.44,1.985,0,2.427c-3.088,0.44-2.795,1.69-0.781,5.882l3.619,7.426l0.323,0.33
-   
l3.896-7.315c2.278-4.264,2.573-5.883-0.59-6.323C44.137,17.758,44.137,16.215,44.577,15.773z/
-   /g
-/g
-/svg
diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml
index f161afb..7e0e7c8 100644
--- a/wikipedia/AndroidManifest.xml
+++ b/wikipedia/AndroidManifest.xml
@@ -30,7 +30,6 @@
 android:allowBackup=true
 android:supportsRtl=true
 android:icon=@drawable/launcher
-android:logo=@drawable/search_w
 android:label=@string/app_name
 android:name=.WikipediaApp
 android:theme=@style/AppTheme
diff --git a/wikipedia/res/drawable-hdpi/search_w.png 
b/wikipedia/res/drawable-hdpi/search_w.png
deleted file mode 100644
index 7ceb58e..000
--- a/wikipedia/res/drawable-hdpi/search_w.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/res/drawable-ldpi/search_w.png 
b/wikipedia/res/drawable-ldpi/search_w.png
deleted file mode 100644
index e610d32..000
--- a/wikipedia/res/drawable-ldpi/search_w.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/res/drawable-mdpi/search_w.png 
b/wikipedia/res/drawable-mdpi/search_w.png
deleted file mode 100644
index c2f178c..000
--- a/wikipedia/res/drawable-mdpi/search_w.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/res/drawable-xhdpi/search_w.png 
b/wikipedia/res/drawable-xhdpi/search_w.png
deleted file mode 100644
index 4f79534..000
--- a/wikipedia/res/drawable-xhdpi/search_w.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/res/drawable-xxhdpi/search_w.png 
b/wikipedia/res/drawable-xxhdpi/search_w.png
deleted file mode 100644
index 7108665..000
--- a/wikipedia/res/drawable-xxhdpi/search_w.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/res/layout/activity_main.xml 
b/wikipedia/res/layout/activity_main.xml
index 640c00d..dff9a4a 100644
--- a/wikipedia/res/layout/activity_main.xml
+++ b/wikipedia/res/layout/activity_main.xml
@@ -42,14 +42,7 @@
 android.support.v7.widget.Toolbar
 android:id=@+id/main_toolbar
 android:layout_width=match_parent
-android:layout_height=?attr/actionBarSize
-View
-

[MediaWiki-commits] [Gerrit] Material Design icons - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175490

Change subject: Material Design icons
..

Material Design icons

from https://github.com/google/material-design-icons
Some svg files had to be fixed because our convert script
created some weird streaks in them. I loaded the svg files in
Inkscape, rotated the object cw and ccw, and saved as new file.
See also https://github.com/google/material-design-icons/issues/22.
I tried to use the same names as the originals so that it's easier
to find them in the Google repo. I just skipped the _..px suffix.
The _24px files go into the /24/ folder.
The _18px files go into the /18/ folder, and so on.
The dark theme versions of ic_expand_less and ic_expand_more
have been manually tinted light gray.

Created a new hist_search icon based on ic_search but
different color and smaller.

Also removed a few unused images:
ic_fulltextsearch
ic_menu_moreoverflow...
ic_save

Change-Id: I488205e74adb0ef7e7336d643a2ed91d16d52841
---
A icon-svgs/18/hist_search.svg
M icon-svgs/24/ic_delete.noflip.svg
A icon-svgs/24/ic_expand_less.noflip.svg
A icon-svgs/24/ic_expand_less_dark.noflip.svg
A icon-svgs/24/ic_expand_more.noflip.svg
A icon-svgs/24/ic_expand_more_dark.noflip.svg
D icon-svgs/24/ic_fulltextsearch.svg
A icon-svgs/24/ic_refresh.svg
D icon-svgs/24/ic_save.svg
A icon-svgs/24/ic_search.svg
A icon-svgs/24/ic_toc.svg
D icon-svgs/32/search.svg
D icon-svgs/32/toc_collapsed.svg
D icon-svgs/32/toc_expanded.svg
A wikipedia/res/drawable-hdpi/hist_search.png
M wikipedia/res/drawable-hdpi/ic_delete.png
A wikipedia/res/drawable-hdpi/ic_expand_less.png
A wikipedia/res/drawable-hdpi/ic_expand_less_dark.png
A wikipedia/res/drawable-hdpi/ic_expand_more.png
A wikipedia/res/drawable-hdpi/ic_expand_more_dark.png
D wikipedia/res/drawable-hdpi/ic_fulltextsearch.png
D wikipedia/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png
M wikipedia/res/drawable-hdpi/ic_refresh.png
A wikipedia/res/drawable-hdpi/ic_search.png
A wikipedia/res/drawable-hdpi/ic_toc.png
D wikipedia/res/drawable-hdpi/search.png
D wikipedia/res/drawable-hdpi/toc_collapsed.png
D wikipedia/res/drawable-hdpi/toc_expanded.png
A wikipedia/res/drawable-ldpi/hist_search.png
M wikipedia/res/drawable-ldpi/ic_delete.png
A wikipedia/res/drawable-ldpi/ic_expand_less.png
A wikipedia/res/drawable-ldpi/ic_expand_less_dark.png
A wikipedia/res/drawable-ldpi/ic_expand_more.png
A wikipedia/res/drawable-ldpi/ic_expand_more_dark.png
D wikipedia/res/drawable-ldpi/ic_fulltextsearch.png
M wikipedia/res/drawable-ldpi/ic_refresh.png
A wikipedia/res/drawable-ldpi/ic_search.png
A wikipedia/res/drawable-ldpi/ic_toc.png
D wikipedia/res/drawable-ldpi/search.png
D wikipedia/res/drawable-ldpi/toc_collapsed.png
D wikipedia/res/drawable-ldpi/toc_expanded.png
A wikipedia/res/drawable-ldrtl-hdpi/hist_search.png
D wikipedia/res/drawable-ldrtl-hdpi/ic_fulltextsearch.png
A wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png
A wikipedia/res/drawable-ldrtl-hdpi/ic_search.png
A wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png
D wikipedia/res/drawable-ldrtl-hdpi/search.png
D wikipedia/res/drawable-ldrtl-hdpi/toc_collapsed.png
D wikipedia/res/drawable-ldrtl-hdpi/toc_expanded.png
A wikipedia/res/drawable-ldrtl-ldpi/hist_search.png
D wikipedia/res/drawable-ldrtl-ldpi/ic_fulltextsearch.png
A wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png
A wikipedia/res/drawable-ldrtl-ldpi/ic_search.png
A wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png
D wikipedia/res/drawable-ldrtl-ldpi/search.png
D wikipedia/res/drawable-ldrtl-ldpi/toc_collapsed.png
D wikipedia/res/drawable-ldrtl-ldpi/toc_expanded.png
A wikipedia/res/drawable-ldrtl-mdpi/hist_search.png
D wikipedia/res/drawable-ldrtl-mdpi/ic_fulltextsearch.png
A wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png
A wikipedia/res/drawable-ldrtl-mdpi/ic_search.png
A wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png
D wikipedia/res/drawable-ldrtl-mdpi/search.png
D wikipedia/res/drawable-ldrtl-mdpi/toc_collapsed.png
D wikipedia/res/drawable-ldrtl-mdpi/toc_expanded.png
A wikipedia/res/drawable-ldrtl-xhdpi/hist_search.png
D wikipedia/res/drawable-ldrtl-xhdpi/ic_fulltextsearch.png
A wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png
A wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png
A wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png
D wikipedia/res/drawable-ldrtl-xhdpi/search.png
D wikipedia/res/drawable-ldrtl-xhdpi/toc_collapsed.png
D wikipedia/res/drawable-ldrtl-xhdpi/toc_expanded.png
A wikipedia/res/drawable-ldrtl-xxhdpi/hist_search.png
D wikipedia/res/drawable-ldrtl-xxhdpi/ic_fulltextsearch.png
A wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png
A wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png
A wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png
D wikipedia/res/drawable-ldrtl-xxhdpi/search.png
D wikipedia/res/drawable-ldrtl-xxhdpi/toc_collapsed.png
D wikipedia/res/drawable-ldrtl-xxhdpi/toc_expanded.png
A wikipedia/res/drawable-mdpi/hist_search.png
M

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175494

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: Ia6124a376df16252d341149c7c32f78e93f47b64
---
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-ce/strings.xml
M wikipedia/res/values-it/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
7 files changed, 37 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/94/175494/1

diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index 46cd632..a8aaba0 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -241,11 +241,15 @@
   string name=search_redirect_titleRedirecció de «%s»./string
   string name=search_recent_headerCerques recents:/string
   string name=button_clear_all_recent_searches fuzzy=trueEsborra cerques 
recents/string
+  string name=clear_recent_searches_confirmEsteu segur que voleu esborrar 
l\'historial de cerca?/string
   string name=search_titles_buttonTítols/string
   string name=search_full_buttonDins d\'articles/string
   string name=toc_hintFeu lliscar el dit cap a l\'esquerra per a les 
seccions, o utilitzeu el botó de menú a la part superior dreta./string
   string name=toc_know_itHo he entès/string
   string name=error_browser_not_foundNo s\'ha pogut obrir la pàgina web 
(no s\'ha trobat cap navegador)/string
+  string name=table_infoboxDades bàsiques/string
+  string name=table_otherMés informació/string
+  string name=table_closeTanca/string
   string name=app_store_descriptionAplicació oficial de la Viquipèdia per 
a l\'Android. La Viquipèdia és una enciclopèdia lliure que conté més de 32 
milions d\'articles en 280 llengües. Es tracta d\'una de les obres de 
referència més usades i comprensives mai compilada per la humanitat. 
L\'aplicació ha estat reescrita de bell nou i és millor que mai.
 
 Característiques:
@@ -260,4 +264,5 @@
 El codi és totalment obert. Si teniu experiència en Java i en l\'SDK de 
l\'Android, «feu-ne fork»! 
https://github.com/wikimedia/apps-android-wikipedia/string
   string name=alpha_update_notification_titleHi ha disponible una nova 
versió alfa/string
   string name=alpha_update_notification_textToqueu per descarregar/string
+  string name=dialog_close_descriptionTanca/string
 /resources
diff --git a/wikipedia/res/values-ce/strings.xml 
b/wikipedia/res/values-ce/strings.xml
index 4de2529..6c22e73 100644
--- a/wikipedia/res/values-ce/strings.xml
+++ b/wikipedia/res/values-ce/strings.xml
@@ -66,6 +66,7 @@
   string name=saved_pages_empty_message fuzzy=trueӀалашйина агӀонаш 
яц./string
   string name=history_empty_titleКеста хьаьжна агӀонаш яц./string
   string name=history_empty_message fuzzy=trueХьа истори еса ю./string
+  string name=delete_selected_historyДӀаяккха/string
   string 
name=wp_stylizedlt;biggt;Вlt;/biggt;ИКИПЕДlt;biggt;Иlt;/biggt;/string
   string name=wp_tag_lineМаьрша энциклопеди/string
   string name=skipӀадйита/string
diff --git a/wikipedia/res/values-it/strings.xml 
b/wikipedia/res/values-it/strings.xml
index 6cda31e..108d4a6 100644
--- a/wikipedia/res/values-it/strings.xml
+++ b/wikipedia/res/values-it/strings.xml
@@ -107,6 +107,7 @@
   string name=saved_pages_empty_messageLe pagine salvate sono fantastiche. 
Considerale come preferiti che puoi leggere anche quando sei offline./string
   string name=history_empty_titleNessuna pagina recente qui!/string
   string name=history_empty_messageProbabilmente hai cancellato tutto. La 
prossima volta che vai in una pagina, puoi tornarci da qui./string
+  string name=delete_selected_historyCancella/string
   string 
name=wp_stylizedlt;biggt;Wlt;/biggt;IKIPEDIlt;biggt;Alt;/biggt;/string
   string name=wp_tag_lineL\'enciclopedia libera/string
   string name=skipSalta/string
@@ -245,6 +246,8 @@
   string name=toc_hintScorri a sinistra per le sezioni, o usa il tasto del 
menu in alto a destra./string
   string name=toc_know_itOK!/string
   string name=error_browser_not_foundImpossibile aprire la pagina web 
(nessun app browser trovato)./string
+  string name=table_otherUlteriori informazioni/string
+  string name=table_closeChiudi/string
   string name=app_store_descriptionApp ufficiale di Wikipedia per Android.
 Wikipedia è l\'enciclopedia libera con oltre 32 milioni di voci in 280 lingue, 
ed è l\'opera di consultazione più completa e più diffusa che l\'uomo abbia mai 
compilato. L\'app è stata completamente riscritta ed è di gran lunga migliore.
 
@@ -261,4 +264,5 @@
 https://github.com/wikimedia/apps-android-wikipedia/string
   string name=alpha_update_notification_titleNuovo aggiornamento alfa 
disponibile/string
   string name=alpha_update_notification_textTocca per

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175495

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: I4e4fc4731d2140b5237f5ff3c4c570960d080e1c
---
M wikipedia/br.lproj/Localizable.strings
M wikipedia/ca.lproj/Localizable.strings
M wikipedia/ce.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/it.lproj/Localizable.strings
M wikipedia/lb.lproj/Localizable.strings
M wikipedia/mk.lproj/Localizable.strings
M wikipedia/nl.lproj/Localizable.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/sr-ec.lproj/Localizable.strings
M wikipedia/sv.lproj/Localizable.strings
M wikipedia/vi.lproj/Localizable.strings
M wikipedia/zh-hans.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Main_iPhone.strings
22 files changed, 88 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/95/175495/1

diff --git a/wikipedia/br.lproj/Localizable.strings 
b/wikipedia/br.lproj/Localizable.strings
index d344f80..e411b91 100644
--- a/wikipedia/br.lproj/Localizable.strings
+++ b/wikipedia/br.lproj/Localizable.strings
@@ -79,6 +79,9 @@
 search-loading-section-remaining = O kargañ ar peurrest eus ar 
rannskrid...;
 search-loading-article-loaded = Pennad karget.;
 search-cancel = Nullañ;
+search-titles = Titloù;
+search-within-articles = Er pennadoù;
+search-did-you-mean = N'ho poa ket soñjet kentoc'h e : $1;
 main-menu-title = Muioc'h;
 main-menu-language-title = Furchal $1 Wikipedia;
 main-menu-language-toggle-show = Diskouez ar yezhoù;
diff --git a/wikipedia/ca.lproj/Localizable.strings 
b/wikipedia/ca.lproj/Localizable.strings
index 2b086f4..f78e204 100644
--- a/wikipedia/ca.lproj/Localizable.strings
+++ b/wikipedia/ca.lproj/Localizable.strings
@@ -81,6 +81,9 @@
 search-loading-section-remaining = S'està carregant la resta de 
l'article...;
 search-loading-article-loaded = S'ha carregat l'article.;
 search-cancel = Cancel·la;
+search-titles = Títols;
+search-within-articles = Dins d'articles;
+search-did-you-mean = Volíeu dir: $1?;
 main-menu-title = Més;
 main-menu-language-title = Cerca la wiki en llengua $1;
 main-menu-language-toggle-show = Mostra idiomes;
@@ -150,6 +153,8 @@
 about-title = Quant a;
 about-wikipedia = Viquipèdia;
 about-contributors = col·laboradors;
+about-testers = provadors;
+about-testers-details = Provat per $1;
 about-translators = traductors;
 about-translators-details = Traduït per voluntaris a $1;
 about-libraries = biblioteques utilitzades;
diff --git a/wikipedia/ce.lproj/Localizable.strings 
b/wikipedia/ce.lproj/Localizable.strings
index 0b4064e..20e7bbd 100644
--- a/wikipedia/ce.lproj/Localizable.strings
+++ b/wikipedia/ce.lproj/Localizable.strings
@@ -33,6 +33,9 @@
 wikitext-upload-save-license-name = CC BY-SA 3.0;
 open-link-title = Хьажорг схьаелла;
 open-link-cancel = Цаоьшу;
+search-titles = Корташ;
+search-within-articles = Яззамашкахь;
+search-did-you-mean = Хила мега ахьа лоьхарг: $1;
 main-menu-title = Кхин;
 main-menu-language-title = $1 вики чухула лахаран мотт;
 main-menu-account-login = ЧугӀо;
@@ -59,6 +62,7 @@
 navbar-title-mode-edit-wikitext-preview = Хьалха муха ю хьажар;
 credits-wikimedia-repos = Викимедиа;
 credits-external-libraries = АгӀонгара;
+about-testers = тестераш;
 share-menu-save-page = Ӏалашъе агӀо;
 share-menu-page-saved = АгӀо Ӏалашйина;
 timestamp-days = %d де хьалха;
diff --git a/wikipedia/de.lproj/Localizable.strings 
b/wikipedia/de.lproj/Localizable.strings
index 03e72fe..d311639 100644
--- a/wikipedia/de.lproj/Localizable.strings
+++ b/wikipedia/de.lproj/Localizable.strings
@@ -77,6 +77,9 @@
 search-loading-section-remaining = Lade den Rest des Artikels …;
 search-loading-article-loaded = Artikel geladen.;
 search-cancel = Abbrechen;
+search-titles = Titel;
+search-within-articles = Innerhalb Artikeln;
+search-did-you-mean = Meintest du $1?;
 main-menu-title = Weitere;
 main-menu-language-title = Sprachwiki $1 durchsuchen;
 main-menu-language-toggle-show = Sprachen anzeigen;
diff --git a/wikipedia/es.lproj/Localizable.strings 
b/wikipedia/es.lproj/Localizable.strings
index bdb52d6..c675119 100644
--- a/wikipedia/es.lproj/Localizable.strings
+++ b/wikipedia/es.lproj/Localizable.strings
@@ -82,6 +82,9 @@
 search-loading-section-remaining = Cargando el resto del artículo…;
 search-loading-article-loaded = Artículo cargado.;
 search-cancel = Cancelar;
+search-titles = Títulos;
+search-within-articles = Dentro de los artículos;
+search-did-you-mean = ¿Quisiste decir $1?;
 main-menu-title = Más;

[MediaWiki-commits] [Gerrit] Updated support libraries to 21.0.2 - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175546

Change subject: Updated support libraries to 21.0.2
..

Updated support libraries to 21.0.2

Please update extra-android-m2repository component
of your local Android SDK.

Change-Id: Ifb8e5cbdf60f744ab33691353af1aca456922569
---
M wikipedia/build.gradle
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/46/175546/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index 39598ab..d6506f4 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -110,8 +110,8 @@
 exclude group: 'org.json', module: 'json'
 }
 compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
-compile 'com.android.support:support-v4:21.0.0'
-compile 'com.android.support:appcompat-v7:21.0.0'
+compile 'com.android.support:support-v4:21.0.2'
+compile 'com.android.support:appcompat-v7:21.0.2'
 }
 
 // The next block is for setting the release signing config from a file 
outside the git repo

-- 
To view, visit https://gerrit.wikimedia.org/r/175546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb8e5cbdf60f744ab33691353af1aca456922569
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Updated squareup libraries - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175588

Change subject: Updated squareup libraries
..

Updated squareup libraries

The big change is in OkHttp from 1.3 to 2.1.
A few API changes regarding caches required code changes.
See https://github.com/square/okhttp/blob/master/CHANGELOG.md
for full list.

Also remove explicit entry for support-v4 since it's
transitively included through the appcompat-v7 dependency.
That way we don't accidentally have incompatible versions
of those two.

Change-Id: I0b2532276c72757e5941aef63cfc2f2dea8445ad
---
M wikipedia/build.gradle
M wikipedia/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
2 files changed, 9 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/88/175588/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index d6506f4..b4d44ae 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -97,21 +97,17 @@
 compile('org.mediawiki.api:json:1.3-SNAPSHOT') {
 exclude group: 'org.json', module: 'json'
 }
-compile 'com.squareup.okhttp:okhttp:1.3.0'
-//compile 'com.squareup.okhttp:okhttp:1.6.0'
-// maybe even 2.0.0
-compile 'com.squareup:otto:1.3.4'
-//compile 'com.squareup:otto:1.3.5'
-compile 'com.squareup.picasso:picasso:2.1.1'
-//compile 'com.squareup.picasso:picasso:2.3.2'
+compile 'com.squareup.okhttp:okhttp-urlconnection:2.1.0'
+compile 'com.squareup.okhttp:okhttp:2.1.0'
+compile 'com.squareup:otto:1.3.5'
+compile 'com.squareup.picasso:picasso:2.4.0'
 compile 'com.mobsandgeeks:android-saripaar:1.0.3'
 compile 'com.nineoldandroids:library:2.4.0'
 compile('ch.acra:acra:4.5.0') {
 exclude group: 'org.json', module: 'json'
 }
 compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
-compile 'com.android.support:support-v4:21.0.2'
-compile 'com.android.support:appcompat-v7:21.0.2'
+compile 'com.android.support:appcompat-v7:21.0.2' // includes support-v4
 }
 
 // The next block is for setting the release signing config from a file 
outside the git repo
diff --git a/wikipedia/src/main/java/org/wikipedia/OkHttpConnectionFactory.java 
b/wikipedia/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
index e7bfb04..245062d 100644
--- a/wikipedia/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
+++ b/wikipedia/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
@@ -2,8 +2,9 @@
 
 import android.content.Context;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.squareup.okhttp.HttpResponseCache;
+import com.squareup.okhttp.Cache;
 import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.OkUrlFactory;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -20,7 +21,7 @@
 
client.setCookieHandler(((WikipediaApp)context.getApplicationContext()).getCookieManager());
 
 try {
-client.setResponseCache(new 
HttpResponseCache(context.getCacheDir(), HTTP_CACHE_SIZE));
+client.setCache(new Cache(context.getCacheDir(), HTTP_CACHE_SIZE));
 } catch (IOException e) {
 // Shouldn't happen...
 throw new RuntimeException(e);
@@ -28,7 +29,7 @@
 }
 
 public HttpURLConnection create(URL url) throws IOException {
-return client.open(url);
+return new OkUrlFactory(client).open(url);
 }
 
 @Override

-- 
To view, visit https://gerrit.wikimedia.org/r/175588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b2532276c72757e5941aef63cfc2f2dea8445ad
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make toolbar icons lighter - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175608

Change subject: Make toolbar icons lighter
..

Make toolbar icons lighter

and make them a bit more transparent;
according to Android guidelines at
http://developer.android.com/design/style/iconography.html

Change-Id: I18095d15356bdc19fc6dda204769d793da44649d
---
M icon-svgs/24/ic_delete.noflip.svg
M icon-svgs/24/ic_expand_less.noflip.svg
M icon-svgs/24/ic_expand_less_dark.noflip.svg
M icon-svgs/24/ic_expand_more.noflip.svg
M icon-svgs/24/ic_expand_more_dark.noflip.svg
M icon-svgs/24/ic_refresh.svg
M icon-svgs/24/ic_search.svg
M icon-svgs/24/ic_toc.svg
M wikipedia/res/drawable-ldpi/ic_delete.png
M wikipedia/res/drawable-ldpi/ic_expand_less.png
M wikipedia/res/drawable-ldpi/ic_expand_less_dark.png
M wikipedia/res/drawable-ldpi/ic_expand_more.png
M wikipedia/res/drawable-ldpi/ic_expand_more_dark.png
M wikipedia/res/drawable-ldpi/ic_refresh.png
M wikipedia/res/drawable-ldpi/ic_search.png
M wikipedia/res/drawable-ldpi/ic_toc.png
M wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png
M wikipedia/res/drawable-ldrtl-hdpi/ic_search.png
M wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png
M wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png
M wikipedia/res/drawable-ldrtl-ldpi/ic_search.png
M wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png
M wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png
M wikipedia/res/drawable-ldrtl-mdpi/ic_search.png
M wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png
M wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png
M wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png
M wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png
M wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png
M wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png
M wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png
M wikipedia/res/drawable-mdpi/ic_delete.png
M wikipedia/res/drawable-mdpi/ic_expand_less.png
M wikipedia/res/drawable-mdpi/ic_expand_less_dark.png
M wikipedia/res/drawable-mdpi/ic_expand_more.png
M wikipedia/res/drawable-mdpi/ic_expand_more_dark.png
M wikipedia/res/drawable-mdpi/ic_refresh.png
M wikipedia/res/drawable-mdpi/ic_search.png
M wikipedia/res/drawable-mdpi/ic_toc.png
M wikipedia/res/drawable-xhdpi/ic_delete.png
M wikipedia/res/drawable-xhdpi/ic_expand_less.png
M wikipedia/res/drawable-xhdpi/ic_expand_less_dark.png
M wikipedia/res/drawable-xhdpi/ic_expand_more.png
M wikipedia/res/drawable-xhdpi/ic_expand_more_dark.png
M wikipedia/res/drawable-xhdpi/ic_refresh.png
M wikipedia/res/drawable-xhdpi/ic_search.png
M wikipedia/res/drawable-xhdpi/ic_toc.png
M wikipedia/res/drawable-xxhdpi/ic_delete.png
M wikipedia/res/drawable-xxhdpi/ic_expand_less.png
M wikipedia/res/drawable-xxhdpi/ic_expand_less_dark.png
M wikipedia/res/drawable-xxhdpi/ic_expand_more.png
M wikipedia/res/drawable-xxhdpi/ic_expand_more_dark.png
M wikipedia/res/drawable-xxhdpi/ic_refresh.png
M wikipedia/res/drawable-xxhdpi/ic_search.png
M wikipedia/res/drawable-xxhdpi/ic_toc.png
55 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/08/175608/1

diff --git a/icon-svgs/24/ic_delete.noflip.svg 
b/icon-svgs/24/ic_delete.noflip.svg
index 870f878..5229822 100644
--- a/icon-svgs/24/ic_delete.noflip.svg
+++ b/icon-svgs/24/ic_delete.noflip.svg
@@ -50,5 +50,6 @@
   path
  d=m 6,19 c 0,1.1 0.9,2 2,2 l 8,0 c 1.1,0 2,-0.9 2,-2 L 18,7 6,7 6,19 z M 
19,4 15.5,4 14.5,3 9.5,3 8.5,4 5,4 5,6 19,6 19,4 z
  id=path3286
+ style=fill:#33;fill-opacity:0.6
  inkscape:connector-curvature=0 /
 /svg
diff --git a/icon-svgs/24/ic_expand_less.noflip.svg 
b/icon-svgs/24/ic_expand_less.noflip.svg
index 535f6d3..599719e 100644
--- a/icon-svgs/24/ic_expand_less.noflip.svg
+++ b/icon-svgs/24/ic_expand_less.noflip.svg
@@ -1,3 +1,3 @@
 svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 
24
-path d=M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z/
+path d=M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z 
style=fill:#33;fill-opacity:0.6/
 /svg
\ No newline at end of file
diff --git a/icon-svgs/24/ic_expand_less_dark.noflip.svg 
b/icon-svgs/24/ic_expand_less_dark.noflip.svg
index 82c6b90..2fbd151 100644
--- a/icon-svgs/24/ic_expand_less_dark.noflip.svg
+++ b/icon-svgs/24/ic_expand_less_dark.noflip.svg
@@ -1,3 +1,3 @@
 svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 
24
-path d=M12 8l-6 6 1.41 1.41 4.59-4.58 4.59 4.58 1.41-1.41z 
style=fill:#aa;fill-opacity:1/
+path d=M12 8l-6 6 1.41 1.41 4.59-4.58 4.59 4.58 1.41-1.41z 
style=fill:#ff;fill-opacity:0.8/
 /svg
diff --git a/icon-svgs/24/ic_expand_more.noflip.svg 
b/icon-svgs/24/ic_expand_more.noflip.svg
index e3e13c5..cd8264a 100644
--- a/icon-svgs/24/ic_expand_more.noflip.svg
+++ b/icon-svgs/24/ic_expand_more.noflip.svg
@@ -1 +1 @@
-svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 
24path d=M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z//svg
\ No

[MediaWiki-commits] [Gerrit] Remove obsolete strings from translations - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175628

Change subject: Remove obsolete strings from translations
..

Remove obsolete strings from translations

Had compiler warnings in Android Studio because of that.

Change-Id: I36d4b3c9877fb390dab4b6131673f5058a2f7033
---
M wikipedia/res/values-gu/strings.xml
M wikipedia/res/values-hu/strings.xml
M wikipedia/res/values-lt/strings.xml
M wikipedia/res/values-sq/strings.xml
4 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/28/175628/1

diff --git a/wikipedia/res/values-gu/strings.xml 
b/wikipedia/res/values-gu/strings.xml
index bf7764e..e74564e 100644
--- a/wikipedia/res/values-gu/strings.xml
+++ b/wikipedia/res/values-gu/strings.xml
@@ -14,7 +14,6 @@
   string name=toast_save_page_failedપાનું સંગ્રહવાનું નિષ્ફળ :(/string
   string name=delete_selected_saved_pagesદૂર કરો/string
   string name=preference_title_languageભાષા/string
-  string name=nav_item_preferencesગોઠવણીઓ/string
   string name=preference_languages_filter_hintશોધ/string
   string name=langlinks_filter_hintશોધ/string
   string name=menu_other_languagesઅન્ય ભાષાઓ/string
diff --git a/wikipedia/res/values-hu/strings.xml 
b/wikipedia/res/values-hu/strings.xml
index a9090de..046a844 100644
--- a/wikipedia/res/values-hu/strings.xml
+++ b/wikipedia/res/values-hu/strings.xml
@@ -14,7 +14,6 @@
   string name=page_error_retryÚjra/string
   string name=menu_clear_all_historyElőzmények törlése/string
   string name=dialog_title_clear_historyTörlöd az előzményeket?/string
-  string name=dialog_message_clear_historyBiztosan törölni szeretnéd az 
előzményeket?/string
   string name=saved_pages_activity_titleElmentett lapok/string
   string name=nav_item_saved_pagesElmentett lapok/string
   string name=menu_save_pageLap mentése/string
@@ -30,7 +29,6 @@
   string name=content_license_htmlA tartalom a lt;a class=\external\ 
rel=\nofollow\ href=\//creativecommons.org/licenses/by-sa/3.0/\gt;CC BY-SA 
3.0lt;/agt; licenc alatt elérhető, ha nincs másképp feltüntetve/string
   string name=preference_title_languageNyelv/string
   string name=preference_summary_languageA tartalom nyelve/string
-  string name=nav_item_preferencesBeállítások/string
   string name=preference_languages_filter_hintKeresés/string
   string name=langlinks_filter_hintKeresés/string
   string name=menu_other_languagesTovábbi nyelvek/string
@@ -38,7 +36,6 @@
   string name=langlinks_emptyEz a szócikk nem érhető el más 
nyelveken/string
   string name=settings_activity_titleBeállítások/string
   string name=langlinks_activity_titleTovábbi nyelvek/string
-  string name=editsection_activity_titleSzakasz szerkesztése/string
   string name=edit_section_error_retryÚjra/string
   string name=dialog_saving_in_progressMentés.../string
   string name=edit_saved_successfullySzerkesztése elmentve!/string
diff --git a/wikipedia/res/values-lt/strings.xml 
b/wikipedia/res/values-lt/strings.xml
index 48c34f8..2f05410 100644
--- a/wikipedia/res/values-lt/strings.xml
+++ b/wikipedia/res/values-lt/strings.xml
@@ -8,14 +8,12 @@
   string name=history_activity_titleIstorija/string
   string name=page_error_retryBandykite dar kartą/string
   string name=dialog_title_clear_historyValyti istoriją?/string
-  string name=dialog_message_clear_historyAr tikrai norite išvalyti visą 
istoriją?/string
   string name=menu_save_page fuzzy=trueIšsaugoti puslapį/string
   string name=menu_share_pageDalintis/string
   string name=toast_saving_page fuzzy=trueSaugomas puslapis.../string
   string name=delete_selected_saved_pagesIštrinti/string
   string name=last_updated_textPaskutinį kartą atnaujinta %1$s/string
   string name=preference_title_language fuzzy=trueKalba/string
-  string name=nav_item_preferencesNustatymai/string
   string name=preference_languages_filter_hintIeškoti/string
   string name=langlinks_filter_hintIeškoti/string
   string name=menu_other_languagesKitos kalbos/string
diff --git a/wikipedia/res/values-sq/strings.xml 
b/wikipedia/res/values-sq/strings.xml
index 9b8218e..dbbd8ca 100644
--- a/wikipedia/res/values-sq/strings.xml
+++ b/wikipedia/res/values-sq/strings.xml
@@ -8,7 +8,6 @@
   string name=page_error_retryRiprovo/string
   string name=menu_clear_all_historyFshij historikun?/string
   string name=dialog_title_clear_historyFshij historikun?/string
-  string name=dialog_message_clear_historyJeni i sigurt se doni të fshini 
të gjithë historisë?/string
   string name=saved_pages_activity_title fuzzy=trueFaqet e 
ruajtura/string
   string name=menu_save_page fuzzy=trueRuaj faqen/string
   string name=menu_share_pagendaj/string

-- 
To view, visit https://gerrit.wikimedia.org/r/175628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36d4b3c9877fb390dab4b6131673f5058a2f7033
Gerrit-PatchSet: 1
Gerrit-Project:

[MediaWiki-commits] [Gerrit] Set search tab text color. - change (apps...wikipedia)

2014-11-24 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175666

Change subject: Set search tab text color.
..

Set search tab text color.

This fixes an issue on 2.3 where the non active tab in search
is not readable in dark mode: black text on black background.

Change-Id: Ia675eecd3ba530713610b82ea5661aa59609bdad
---
M wikipedia/res/layout/fragment_search.xml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/66/175666/1

diff --git a/wikipedia/res/layout/fragment_search.xml 
b/wikipedia/res/layout/fragment_search.xml
index 67a19d7..c18f7eb 100644
--- a/wikipedia/res/layout/fragment_search.xml
+++ b/wikipedia/res/layout/fragment_search.xml
@@ -27,6 +27,7 @@
 android:layout_weight=0.5
 android:id=@+id/button_search_title
 android:background=?attr/window_background_color
+android:textColor=?attr/edit_text_color
 android:text=@string/search_titles_button
 /
 
@@ -38,6 +39,7 @@
 android:layout_weight=0.5
 android:id=@+id/button_search_full
 android:background=?attr/window_background_color
+android:textColor=?attr/edit_text_color
 android:text=@string/search_full_button
 /
 /LinearLayout

-- 
To view, visit https://gerrit.wikimedia.org/r/175666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia675eecd3ba530713610b82ea5661aa59609bdad
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ToC tweaks: always on ToC - change (apps...wikipedia)

2014-11-25 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/175931

Change subject: ToC tweaks: always on ToC
..

ToC tweaks: always on ToC

- ToC button is always visible and enabled
- still: ToC opened automatically for all pages except Main page
- if user invokes ToC on Main page the onboarding text could show up
- show progress bar inside ToC drawer if ToC is opened while page is still 
loading

Change-Id: If9371dce97589d1c904fe1ca6c37057e74a433c0
---
M wikipedia/res/menu/menu_page_actions.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
3 files changed, 14 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/31/175931/1

diff --git a/wikipedia/res/menu/menu_page_actions.xml 
b/wikipedia/res/menu/menu_page_actions.xml
index ece6806..ba0bda1 100644
--- a/wikipedia/res/menu/menu_page_actions.xml
+++ b/wikipedia/res/menu/menu_page_actions.xml
@@ -7,7 +7,6 @@
   android:title=@string/menu_show_toc
   android:icon=@drawable/ic_toc
   app:showAsAction=ifRoom
-  android:visible=false
   /
 item android:id=@+id/menu_other_languages
   android:title=@string/menu_other_languages
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 2b9dbc5..fecc895 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -319,9 +319,6 @@
 
 app = (WikipediaApp)getActivity().getApplicationContext();
 
-// disable TOC drawer until the page is loaded
-tocDrawer.setSlidingEnabled(false);
-
 savedPagesFunnel = 
app.getFunnelManager().getSavedPagesFunnel(title.getSite());
 
 connectionIssueFunnel = new ConnectionIssueFunnel(app);
@@ -424,6 +421,13 @@
 page = PAGE_CACHE.get(titleOriginal);
 title = page.getTitle();
 state = STATE_COMPLETE_FETCH;
+}
+
+if (tocHandler == null) {
+tocHandler = new ToCHandler(getActivity(),
+tocDrawer,
+bridge,
+title.getSite());
 }
 
 setState(state);
@@ -551,14 +555,7 @@
 
 // FIXME: Move this out into a PageComplete event of sorts
 if (state == STATE_COMPLETE_FETCH) {
-if (tocHandler == null) {
-tocHandler = new ToCHandler(getActivity(),
-tocDrawer,
-bridge);
-}
 tocHandler.setupToC(page);
-
-getActivity().supportInvalidateOptionsMenu();
 
 //add the page to cache!
 PAGE_CACHE.put(titleOriginal, page);
@@ -570,9 +567,6 @@
 
 public void onPrepareOptionsMenu(Menu menu) {
 
app.adjustDrawableToTheme(getResources().getDrawable(R.drawable.ic_toc));
-
-MenuItem tocMenuItem = menu.findItem(R.id.menu_toc);
-tocMenuItem.setVisible(tocDrawer.getSlidingEnabled(Gravity.END));
 
 switch (state) {
 case PageViewFragmentInternal.STATE_NO_FETCH:
@@ -839,8 +833,8 @@
 if (!isAdded()) {
 return;
 }
-// in any case, make sure the TOC drawer is closed and disabled
-tocDrawer.setSlidingEnabled(false);
+// in any case, make sure the TOC drawer is closed
+tocDrawer.closeDrawers();
 getActivity().updateProgressBar(false, true, 0);
 refreshView.setRefreshing(false);
 
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index 6b2a5df..ef3b0f5 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -1,6 +1,7 @@
 package org.wikipedia.page;
 
 import org.wikipedia.R;
+import org.wikipedia.Site;
 import org.wikipedia.Utils;
 import org.wikipedia.ViewAnimations;
 import org.wikipedia.WikipediaApp;
@@ -48,10 +49,12 @@
 private boolean openedViaSwipe = true;
 
 public ToCHandler(final ActionBarActivity activity, final 
DisableableDrawerLayout slidingPane,
-  final CommunicationBridge bridge) {
+  final CommunicationBridge bridge, final Site site) {
 this.parentActivity = activity;
 this.bridge = bridge;
 this.slidingPane = slidingPane;
+
+funnel = new 
ToCInteractionFunnel((WikipediaApp)slidingPane.getContext().getApplicationContext(),
 site);
 
 this.tocList = (ListView) slidingPane.findViewById(R.id.page_toc_list);
 this.tocProgress = (ProgressBar)

[MediaWiki-commits] [Gerrit] WIP: Disambiguation and page issues more like search results - change (apps...wikipedia)

2014-11-05 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/171442

Change subject: WIP: Disambiguation and page issues more like search results
..

WIP: Disambiguation and page issues more like search results

Change-Id: I8e4a9d9564625115a7a886a26dee3520b6972d6a
---
M wikipedia/assets/bundle.js
A wikipedia/res/layout/dialog_page_info.xml
M wikipedia/res/layout/fragment_page.xml
A wikipedia/res/layout/group_page_info_headers.xml
M wikipedia/res/layout/item_issue.xml
M wikipedia/res/values/colors.xml
M wikipedia/res/values/strings.xml
M wikipedia/res/values/styles.xml
A wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigHandler.java
M wikipedia/src/main/java/org/wikipedia/page/IssuesHandler.java
A wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
A wikipedia/src/main/java/org/wikipedia/page/PageInfoHandler.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ReferenceDialog.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M www/js/actions.js
M www/js/issues.js
M www/js/sections.js
19 files changed, 310 insertions(+), 150 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/42/171442/1

diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 04b7957..c194417 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -441,30 +441,19 @@
 
 content = transformer.transform( leadSection, content );
 content = transformer.transform( section, content );
-content = transformer.transform(displayDisambigLink, content);
-content = transformer.transform(displayIssuesLink, content);
 
-//if there were no page issues, then hide the container
-if (!issuesContainer.hasChildNodes()) {
-document.getElementById( content ).removeChild(issuesContainer);
+var hasDisambig = false;
+var hatnotes = content.querySelectorAll( div.hatnote );
+if ( hatnotes.length  0 ) {
+hasDisambig = true;
 }
-//update the text of the disambiguation link, if there is one
-var disambigBtn = document.getElementById( disambig_button );
-if (disambigBtn !== null) {
-disambigBtn.innerText = payload.string_page_similar_titles;
+var hasIssues = false;
+var issues = content.querySelectorAll( 
table.ambox:not([class*='ambox-multiple_issues']):not([class*='ambox-notice'])
 );
+if ( issues.length  0 ) {
+hasIssues = true;
 }
-//update the text of the page-issues link, if there is one
-var issuesBtn = document.getElementById( issues_button );
-if (issuesBtn !== null) {
-issuesBtn.innerText = payload.string_page_issues;
-}
-//if we have both issues and disambiguation, then insert the separator
-if (issuesBtn !== null  disambigBtn !== null) {
-var separator = document.createElement( 'span' );
-separator.innerText = '|';
-separator.className = 'issues_separator';
-issuesContainer.insertBefore(separator, issuesBtn.parentNode);
-}
+console.log( BBB:  + hasDisambig + , hasIssues + hasIssues );
+bridge.sendMessage( pageInfo, { hasDisambig: hasDisambig, hasIssues: 
hasIssues } );
 
 document.getElementById( content ).appendChild( content );
 
diff --git a/wikipedia/res/layout/dialog_page_info.xml 
b/wikipedia/res/layout/dialog_page_info.xml
new file mode 100644
index 000..ab992ec
--- /dev/null
+++ b/wikipedia/res/layout/dialog_page_info.xml
@@ -0,0 +1,34 @@
+?xml version=1.0 encoding=utf-8?
+
+LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
+xmlns:tools=http://schemas.android.com/tools;
+android:layout_width=match_parent
+android:layout_height=wrap_content
+android:orientation=vertical
+android:background=?attr/page_background_color
+
+
+View
+android:layout_width=match_parent
+android:layout_height=0.5dp
+android:background=@color/nav_border /
+
+include layout=@layout/group_page_info_headers /
+
+View
+android:layout_width=match_parent
+android:layout_height=1dp
+android:background=?android:listDivider /
+
+ListView
+android:id=@+id/page_info_list
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:layout_gravity=start
+android:paddingBottom=0dp
+android:paddingLeft=16dp
+android:paddingRight=16dp
+android:paddingTop=0dp
+/
+
+/LinearLayout
diff --git a/wikipedia/res/layout/fragment_page.xml 
b/wikipedia/res/layout/fragment_page.xml
index ec17a32..04a2a69 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -17,11 +17,20 @@
 android:layout_height=match_parent
 
 
-

[MediaWiki-commits] [Gerrit] Disambiguation and page issues dialog comes up from bottom - change (apps...wikipedia)

2014-11-05 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/171512

Change subject: Disambiguation and page issues dialog comes up from bottom
..

Disambiguation and page issues dialog comes up from bottom

Change-Id: If216e2b73cfc94184fca64c384575a5d1d903add
---
M wikipedia/assets/bundle.js
M wikipedia/assets/preview.js
A wikipedia/res/layout/dialog_page_info.xml
M wikipedia/res/layout/item_issue.xml
M wikipedia/res/values/colors.xml
M wikipedia/res/values/strings.xml
M wikipedia/res/values/styles.xml
A wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java
D wikipedia/src/main/java/org/wikipedia/page/DisambigHandler.java
A wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
D wikipedia/src/main/java/org/wikipedia/page/IssuesHandler.java
A wikipedia/src/main/java/org/wikipedia/page/IssuesListAdapter.java
A wikipedia/src/main/java/org/wikipedia/page/PageInfo.java
A wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
A wikipedia/src/main/java/org/wikipedia/page/PageInfoHandler.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ReferenceDialog.java
M www/js/actions.js
18 files changed, 578 insertions(+), 356 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/12/171512/1

diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 04b7957..bf925e2 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -66,30 +66,6 @@
 curNode = curNode.parentNode;
 }
 
-function collectIssues( sourceNode ) {
-var res = [];
-var issues = sourceNode.parentNode.querySelectorAll( 'table.ambox' );
-var i = 0,
-len = issues.length;
-for (; i  len; i++) {
-// .ambox- is used e.g. on eswiki
-res.push( issues[i].querySelector( '.mbox-text, .ambox-text' 
).innerHTML );
-}
-
-bridge.sendMessage( 'issuesClicked', { issues: res } );
-}
-
-function handleDisambig( sourceNode ) {
-var res = [];
-var hatnotes = sourceNode.parentNode.querySelectorAll( 'div.hatnote' );
-var i = 0,
-len = hatnotes.length;
-for (; i  len; i++) {
-res.push( hatnotes[i].innerHTML );
-}
-bridge.sendMessage( 'disambigClicked', { hatnotes: res } );
-}
-
 if (sourceNode) {
 if ( sourceNode.hasAttribute( data-action ) ) {
 var action = sourceNode.getAttribute( data-action );
@@ -101,10 +77,10 @@
 var href = sourceNode.getAttribute( href );
 if ( href[0] === # ) {
 var targetId = href.slice(1);
-if (issues === targetId) {
-collectIssues(sourceNode);
-} else if (disambig === targetId) {
-handleDisambig(sourceNode);
+if ( issues === targetId ) {
+issuesClicked( sourceNode );
+} else if ( disambig === targetId ) {
+disambigClicked( sourceNode );
 } else {
 handleReference( targetId, ancestorContainsClass( 
sourceNode, mw-cite-backlink ) );
 }
@@ -116,6 +92,41 @@
 }
 };
 
+function issuesClicked( sourceNode ) {
+var issues = collectIssues( sourceNode.parentNode );
+var disambig = collectDisambig( document ); // the other node is not a 
child of sourceNode
+bridge.sendMessage( 'issuesClicked', { hatnotes: disambig, issues: 
issues } );
+}
+
+function disambigClicked( sourceNode ) {
+var disambig = collectDisambig( sourceNode.parentNode );
+var issues = collectIssues( document ); // the other node is not a child 
of sourceNode
+bridge.sendMessage( 'disambigClicked', { hatnotes: disambig, issues: 
issues } );
+}
+
+function collectDisambig( sourceNode ) {
+var res = [];
+var hatnotes = sourceNode.querySelectorAll( 'div.hatnote' );
+var i = 0,
+len = hatnotes.length;
+for (; i  len; i++) {
+res.push( hatnotes[i].innerHTML );
+}
+return res;
+}
+
+function collectIssues( sourceNode ) {
+var res = [];
+var issues = sourceNode.querySelectorAll( 'table.ambox' );
+var i = 0,
+len = issues.length;
+for (; i  len; i++) {
+// .ambox- is used e.g. on eswiki
+res.push( issues[i].querySelector( '.mbox-text, .ambox-text' 
).innerHTML );
+}
+return res;
+}
+
 module.exports = new ActionsHandler();
 
 },{./bridge:2}],2:[function(require,module,exports){
diff --git a/wikipedia/assets/preview.js b/wikipedia/assets/preview.js
index d173794..4c2d353 100644
--- a/wikipedia/assets/preview.js
+++ b/wikipedia/assets/preview.js
@@ -66,30 +66,6 @@
 curNode = curNode.parentNode;
 }
 
-function collectIssues( sourceNode ) {
-var res = [];
-var issues =

[MediaWiki-commits] [Gerrit] Slide up/down animations for BottomDialogs - change (apps...wikipedia)

2014-11-06 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/171725

Change subject: Slide up/down animations for BottomDialogs
..

Slide up/down animations for BottomDialogs

Change-Id: Id496b25b7b412986b9c277c5ff2a3f9391bfb771
---
M wikipedia/res/values/styles.xml
M wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java
2 files changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/25/171725/1

diff --git a/wikipedia/res/values/styles.xml b/wikipedia/res/values/styles.xml
index 582a0b4..333a7cd 100644
--- a/wikipedia/res/values/styles.xml
+++ b/wikipedia/res/values/styles.xml
@@ -38,4 +38,12 @@
 item name=android:textColor@color/page_info_heading/item
 /style
 
+!-- For dialog Animation, uses appcompat-v7 --
+style name=DialogAnimation
+item 
name=android:windowEnterAnimation@anim/abc_slide_in_bottom/item
+item 
name=android:windowExitAnimation@anim/abc_slide_out_bottom/item
+/style
+style name=DialogSlideAnim parent=@android:style/Theme.Dialog
+item name=android:windowAnimationStyle@style/DialogAnimation/item
+/style
 /resources
diff --git a/wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java 
b/wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java
index 6002864..fefcd43 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/BottomDialog.java
@@ -1,5 +1,6 @@
 package org.wikipedia.page;
 
+import org.wikipedia.R;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Build;
@@ -11,12 +12,15 @@
 
 /**
  * A dialog that appears at the bottom of the page.
+ *
+ * It slides up when the dialog is opened, and down when the dialog is closed.
+ * see R.style.DialogSlideAnim for the animation
  */
 public class BottomDialog extends Dialog {
 private View dialogLayout;
 
 public BottomDialog(Context context, int dialogLayoutResId) {
-super(context);
+super(context, R.style.DialogSlideAnim);
 
 LayoutInflater inflater = (LayoutInflater) 
context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 dialogLayout = inflater.inflate(dialogLayoutResId, null);

-- 
To view, visit https://gerrit.wikimedia.org/r/171725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id496b25b7b412986b9c277c5ff2a3f9391bfb771
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Just thumbnail and title for disambig items - change (apps...wikipedia)

2014-11-07 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/171876

Change subject: Just thumbnail and title for disambig items
..

Just thumbnail and title for disambig items

Design wants to just display the thumbnail,title, and Wikidata description,
The latter will come in later commit.

Collecting the disambig titles and the link html in JS code
to avoid having to parse the HTML in Java.

Using the title to request page images (thumbnails) of
the disambig items.

TODO for later:
The page images cache should probably be centralized and refactored.

Change-Id: Ic06de893a4ff6aa3faad57d7999ebf5f74b82d0a
---
M wikipedia/assets/bundle.js
M wikipedia/assets/preview.js
M wikipedia/res/layout/dialog_page_info.xml
M wikipedia/res/layout/item_disambig.xml
M wikipedia/res/layout/item_full_search_result.xml
M wikipedia/res/layout/item_issue.xml
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
A wikipedia/src/main/java/org/wikipedia/page/DisambigResult.java
M wikipedia/src/main/java/org/wikipedia/page/PageInfo.java
M wikipedia/src/main/java/org/wikipedia/page/PageInfoHandler.java
M www/js/actions.js
11 files changed, 203 insertions(+), 83 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/76/171876/1

diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index bf925e2..823e22a 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -106,11 +106,11 @@
 
 function collectDisambig( sourceNode ) {
 var res = [];
-var hatnotes = sourceNode.querySelectorAll( 'div.hatnote' );
+var links = sourceNode.querySelectorAll( 'div.hatnote  a' );
 var i = 0,
-len = hatnotes.length;
+len = links.length;
 for (; i  len; i++) {
-res.push( hatnotes[i].innerHTML );
+res.push( { title: links[i].innerHTML, html: links[i].outerHTML } 
);
 }
 return res;
 }
diff --git a/wikipedia/assets/preview.js b/wikipedia/assets/preview.js
index 4c2d353..160b976 100644
--- a/wikipedia/assets/preview.js
+++ b/wikipedia/assets/preview.js
@@ -106,11 +106,11 @@
 
 function collectDisambig( sourceNode ) {
 var res = [];
-var hatnotes = sourceNode.querySelectorAll( 'div.hatnote' );
+var links = sourceNode.querySelectorAll( 'div.hatnote  a' );
 var i = 0,
-len = hatnotes.length;
+len = links.length;
 for (; i  len; i++) {
-res.push( hatnotes[i].innerHTML );
+res.push( { title: links[i].innerHTML, html: links[i].outerHTML } 
);
 }
 return res;
 }
diff --git a/wikipedia/res/layout/dialog_page_info.xml 
b/wikipedia/res/layout/dialog_page_info.xml
index 715ee66..65c245f 100644
--- a/wikipedia/res/layout/dialog_page_info.xml
+++ b/wikipedia/res/layout/dialog_page_info.xml
@@ -79,20 +79,12 @@
 android:layout_width=wrap_content
 android:layout_height=wrap_content
 android:layout_gravity=start
-android:paddingBottom=0dp
-android:paddingLeft=16dp
-android:paddingRight=16dp
-android:paddingTop=0dp
 /
 ListView
 android:id=@+id/page_issues_list
 android:layout_width=wrap_content
 android:layout_height=wrap_content
 android:layout_gravity=start
-android:paddingBottom=0dp
-android:paddingLeft=16dp
-android:paddingRight=16dp
-android:paddingTop=0dp
 /
 
 /ViewFlipper
diff --git a/wikipedia/res/layout/item_disambig.xml 
b/wikipedia/res/layout/item_disambig.xml
index 2645ead..ddea079 100644
--- a/wikipedia/res/layout/item_disambig.xml
+++ b/wikipedia/res/layout/item_disambig.xml
@@ -1,26 +1,50 @@
 ?xml version=1.0 encoding=utf-8?
 
 LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
-  android:layout_width=match_parent
-  android:layout_height=wrap_content
-  android:orientation=horizontal
-  android:padding=8dp
+android:layout_width=match_parent
+android:layout_height=wrap_content
+android:background=@drawable/selectable_item_background
+android:orientation=horizontal
 
 ImageView
-android:id=@+id/disambig_icon
-android:layout_width=wrap_content
-android:layout_height=wrap_content
-android:layout_marginLeft=8dp
-android:layout_gravity=center_vertical
-android:src=@drawable/link /
+android:id=@+id/disambig_icon
+android:layout_width=@dimen/defaultListItemSize
+android:layout_height=@dimen/defaultListItemSize
+android:layout_gravity=top
+android:contentDescription=@null
+android:src=@drawable/ic_pageimage_placeholder
+android:scaleType=centerCrop /
 
-TextView
-android:id=@+id/disambig_text
-android:padding=8dp
+

[MediaWiki-commits] [Gerrit] Left/right animation inside page info dialog - change (apps...wikipedia)

2014-11-07 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/171875

Change subject: Left/right animation inside page info dialog
..

Left/right animation inside page info dialog

Now have two different ListViews inside a ViewFlipper
and animate the transitions between them.

Change-Id: Id9dba17d6f44c8a77ab1aac5ac370a02828972a3
---
M wikipedia/res/layout/dialog_page_info.xml
M wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
2 files changed, 48 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/75/171875/1

diff --git a/wikipedia/res/layout/dialog_page_info.xml 
b/wikipedia/res/layout/dialog_page_info.xml
index 8a03eb4..715ee66 100644
--- a/wikipedia/res/layout/dialog_page_info.xml
+++ b/wikipedia/res/layout/dialog_page_info.xml
@@ -69,15 +69,32 @@
 android:layout_height=1dp
 android:background=?android:listDivider /
 
-ListView
-android:id=@+id/page_info_list
+ViewFlipper
+android:id=@+id/page_info_flipper
 android:layout_width=wrap_content
 android:layout_height=wrap_content
-android:layout_gravity=start
-android:paddingBottom=0dp
-android:paddingLeft=16dp
-android:paddingRight=16dp
-android:paddingTop=0dp
-/
+
+ListView
+android:id=@+id/disambig_list
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:layout_gravity=start
+android:paddingBottom=0dp
+android:paddingLeft=16dp
+android:paddingRight=16dp
+android:paddingTop=0dp
+/
+ListView
+android:id=@+id/page_issues_list
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:layout_gravity=start
+android:paddingBottom=0dp
+android:paddingLeft=16dp
+android:paddingRight=16dp
+android:paddingTop=0dp
+/
+
+/ViewFlipper
 
 /LinearLayout
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
index 8cef693..8006e31 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
@@ -7,26 +7,23 @@
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.ViewFlipper;
 
 /**
  * A dialog to host page issues and disambig information.
  */
 class PageInfoDialog extends BottomDialog {
-private final Activity activity;
-private final PageInfo info;
-private final LinkMovementMethodExt movementMethod;
-private ListView list;
-private TextView disambigHeading;
-private TextView issuesHeading;
+private final ViewFlipper flipper;
+private final TextView disambigHeading;
+private final TextView issuesHeading;
 
 PageInfoDialog(Activity activity, PageInfo pageInfo, int height, 
LinkMovementMethodExt movementMethod) {
 super(activity, R.layout.dialog_page_info);
-this.activity = activity;
-info = pageInfo;
-this.movementMethod = movementMethod;
 
 View parentView = getDialogLayout();
-list = (ListView) parentView.findViewById(R.id.page_info_list);
+flipper = (ViewFlipper) 
parentView.findViewById(R.id.page_info_flipper);
+ListView disambigList = (ListView) 
parentView.findViewById(R.id.disambig_list);
+ListView issuesList = (ListView) 
parentView.findViewById(R.id.page_issues_list);
 disambigHeading = (TextView) 
parentView.findViewById(R.id.page_info_similar_titles_heading);
 issuesHeading = (TextView) 
parentView.findViewById(R.id.page_info_page_issues_heading);
 View separatorHeading = 
parentView.findViewById(R.id.page_info_heading_separator);
@@ -41,6 +38,10 @@
 
 //parentView.setMinimumHeight(height);
 parentView.setLayoutParams(new 
FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height));
+
+disambigList.setAdapter(new DisambigListAdapter(activity, 
pageInfo.getDisambigs(), movementMethod));
+issuesList.setAdapter(new IssuesListAdapter(activity, 
pageInfo.getIssues()));
+
 if (pageInfo.getDisambigs().length  0) {
 disambigHeading.setOnClickListener(new View.OnClickListener() {
 @Override
@@ -66,13 +67,23 @@
 }
 
 void showDisambig() {
-list.setAdapter(new DisambigListAdapter(activity, info.getDisambigs(), 
movementMethod));
+if (flipper.getCurrentView() != flipper.getChildAt(0)) {
+flipper.setInAnimation(getContext(), R.anim.slide_in_left);
+flipper.setOutAnimation(getContext(), R.anim.slide_out_right);
+

[MediaWiki-commits] [Gerrit] Make disambig item clicks open linked page. - change (apps...wikipedia)

2014-11-10 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172426

Change subject: Make disambig item clicks open linked page.
..

Make disambig item clicks open linked page.

Strangely, disambigList.setOnItemClickListener doesn't seem to work.
So, hacking this by setting click listeners on individual items instead.

Change-Id: I230baa3d1a8c7b6eceac7c518068fc601f01ec50
---
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
A wikipedia/src/main/java/org/wikipedia/page/PageNavigator.java
3 files changed, 30 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/26/172426/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java 
b/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
index 0eb8b7b..7b6269f 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
@@ -29,6 +29,7 @@
 private final ParcelableLruCacheString pageImagesCache
 = new ParcelableLruCacheString(MAX_CACHE_SIZE_IMAGES, 
String.class);
 private final Activity activity;
+private final PageNavigator pageNavigator;
 private final DisambigResult[] items;
 private final WikipediaApp app;
 private final Site site;
@@ -40,9 +41,10 @@
  * @param activity The current activity.
  * @param items The objects to represent in the ListView.
  */
-public DisambigListAdapter(Activity activity, DisambigResult[] items) {
+public DisambigListAdapter(Activity activity, PageNavigator pageNavigator, 
DisambigResult[] items) {
 super(activity, 0, items);
 this.activity = activity;
+this.pageNavigator = pageNavigator;
 this.items = items;
 app = (WikipediaApp) getContext().getApplicationContext();
 site = app.getPrimarySite();
@@ -177,15 +179,12 @@
 final DisambigResult item = items[position];
 holder.title.setText(item.getTitle().getPrefixedText());
 
-//convertView.setOnClickListener(new View.OnClickListener() {
-//@Override
-//public void onClick(View v) {
-//PageTitle title = item.getTitle();
-//HistoryEntry historyEntry = new HistoryEntry(title, 
HistoryEntry.SOURCE_INTERNAL_LINK);
-dismiss();
-activity.displayNewPage(title, historyEntry);
-//}
-//});
+convertView.setOnClickListener(new View.OnClickListener() {
+@Override
+public void onClick(View v) {
+pageNavigator.navigateToTitle(item.getTitle());
+}
+});
 
 String description = null;
 String wikidataId = titleWikidataIdMap.get(item.getTitle());
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
index 5654253..862b861 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
@@ -3,10 +3,8 @@
 import org.wikipedia.PageTitle;
 import org.wikipedia.R;
 import org.wikipedia.history.HistoryEntry;
-import org.wikipedia.search.FullSearchResult;
 import android.graphics.Typeface;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -15,13 +13,15 @@
 /**
  * A dialog to host page issues and disambig information.
  */
-class PageInfoDialog extends BottomDialog {
+class PageInfoDialog extends BottomDialog implements PageNavigator {
 private final ViewFlipper flipper;
 private final TextView disambigHeading;
 private final TextView issuesHeading;
+private final PageActivity pageActivity;
 
 PageInfoDialog(final PageActivity activity, PageInfo pageInfo, int height) 
{
 super(activity, R.layout.dialog_page_info);
+pageActivity = activity;
 
 View parentView = getDialogLayout();
 flipper = (ViewFlipper) 
parentView.findViewById(R.id.page_info_flipper);
@@ -41,18 +41,8 @@
 
 parentView.setLayoutParams(new 
FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height));
 
-disambigList.setAdapter(new DisambigListAdapter(activity, 
pageInfo.getDisambigs()));
+disambigList.setAdapter(new DisambigListAdapter(activity, this, 
pageInfo.getDisambigs()));
 issuesList.setAdapter(new IssuesListAdapter(activity, 
pageInfo.getIssues()));
-
-disambigList.setOnItemClickListener(new 
AdapterView.OnItemClickListener() {
-@Override
-public void onItemClick(AdapterView? parent, View view, int 
position, long id) {
-PageTitle

[MediaWiki-commits] [Gerrit] Page info dialog header click feedback - change (apps...wikipedia)

2014-11-10 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172479

Change subject: Page info dialog header click feedback
..

Page info dialog header click feedback

- Make the TextView into Buttons
- Disable the button that doesn't change the view
- Add selector to provide pressed feedback

Change-Id: I9f38a6dca0f062bfe7cf2349109a340be1b77b01
---
A wikipedia/res/drawable/button_selector_transparent.xml
A wikipedia/res/drawable/button_shape_simple.xml
A wikipedia/res/drawable/button_shape_subtle_gray_highlight.xml
A wikipedia/res/drawable/button_shape_transparent.xml
M wikipedia/res/layout/dialog_page_info.xml
M wikipedia/res/values/colors.xml
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/PageInfoDialog.java
8 files changed, 57 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/79/172479/1

diff --git a/wikipedia/res/drawable/button_selector_transparent.xml 
b/wikipedia/res/drawable/button_selector_transparent.xml
new file mode 100644
index 000..4fa032b
--- /dev/null
+++ b/wikipedia/res/drawable/button_selector_transparent.xml
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8?
+
+selector xmlns:android=http://schemas.android.com/apk/res/android;
+item android:state_pressed=true 
android:drawable=@drawable/button_shape_subtle_gray_highlight /
+item android:drawable=@drawable/button_shape_transparent /
+/selector
\ No newline at end of file
diff --git a/wikipedia/res/drawable/button_shape_simple.xml 
b/wikipedia/res/drawable/button_shape_simple.xml
new file mode 100644
index 000..cfc7b8d
--- /dev/null
+++ b/wikipedia/res/drawable/button_shape_simple.xml
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8?
+shape xmlns:android=http://schemas.android.com/apk/res/android;
+android:shape=rectangle android:padding=10dp
+solid android:color=@android:color/transparent/
+corners android:radius=@dimen/corner_radius_smaller/
+/shape
\ No newline at end of file
diff --git a/wikipedia/res/drawable/button_shape_subtle_gray_highlight.xml 
b/wikipedia/res/drawable/button_shape_subtle_gray_highlight.xml
new file mode 100644
index 000..c8743e8
--- /dev/null
+++ b/wikipedia/res/drawable/button_shape_subtle_gray_highlight.xml
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8?
+shape xmlns:android=http://schemas.android.com/apk/res/android;
+android:shape=rectangle android:padding=10dp
+solid android:color=@color/subtle_gray_light/
+corners android:radius=@dimen/corner_radius_smaller/
+/shape
\ No newline at end of file
diff --git a/wikipedia/res/drawable/button_shape_transparent.xml 
b/wikipedia/res/drawable/button_shape_transparent.xml
new file mode 100644
index 000..cfc7b8d
--- /dev/null
+++ b/wikipedia/res/drawable/button_shape_transparent.xml
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8?
+shape xmlns:android=http://schemas.android.com/apk/res/android;
+android:shape=rectangle android:padding=10dp
+solid android:color=@android:color/transparent/
+corners android:radius=@dimen/corner_radius_smaller/
+/shape
\ No newline at end of file
diff --git a/wikipedia/res/layout/dialog_page_info.xml 
b/wikipedia/res/layout/dialog_page_info.xml
index 74ff9c2..577fe9d 100644
--- a/wikipedia/res/layout/dialog_page_info.xml
+++ b/wikipedia/res/layout/dialog_page_info.xml
@@ -19,32 +19,40 @@
 android:padding=8dp
 
 
-TextView
+Button
 android:id=@+id/page_info_similar_titles_heading
 android:layout_width=wrap_content
 android:layout_height=wrap_content
-android:layout_margin=8dp
+android:paddingBottom=8dp
+android:paddingTop=8dp
+android:paddingLeft=16dp
+android:paddingRight=16dp
 style=@style/text_heading_gray
+android:background=@drawable/button_selector_transparent
 android:text=@string/page_similar_titles /
 
 TextView
 android:id=@+id/page_info_heading_separator
 android:layout_width=wrap_content
 android:layout_height=wrap_content
-android:layout_marginBottom=8dp
-android:layout_marginTop=8dp
-android:layout_marginLeft=7dp
-android:layout_marginRight=7dp
+android:paddingBottom=8dp
+android:paddingTop=8dp
+android:paddingLeft=4dp
+android:paddingRight=4dp
 style=@style/text_heading_gray
 android:text=|
 tools:ignore=HardcodedText /
 
-TextView
+Button
 android:id=@+id/page_info_page_issues_heading
 android:layout_width=wrap_content
 android:layout_height=wrap_content
-android:layout_margin=8dp
+android:paddingBottom=8dp
+

[MediaWiki-commits] [Gerrit] Faster up/down animations for bottom dialogs - change (apps...wikipedia)

2014-11-10 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172496

Change subject: Faster up/down animations for bottom dialogs
..

Faster up/down animations for bottom dialogs

Change-Id: I7814aa7541491b39fe7136e7d38e9886264232ca
(cherry picked from commit 50a1ff820f2a0aa222388170caf6e420346f5d77)
---
A wikipedia/res/anim/slide_in_bottom.xml
A wikipedia/res/anim/slide_out_bottom.xml
M wikipedia/res/values/styles.xml
3 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/96/172496/1

diff --git a/wikipedia/res/anim/slide_in_bottom.xml 
b/wikipedia/res/anim/slide_in_bottom.xml
new file mode 100644
index 000..7e3c4cf
--- /dev/null
+++ b/wikipedia/res/anim/slide_in_bottom.xml
@@ -0,0 +1,5 @@
+?xml version=1.0 encoding=utf-8?
+translate xmlns:android=http://schemas.android.com/apk/res/android;
+   android:interpolator=@android:anim/decelerate_interpolator
+   android:fromYDelta=50%p android:toYDelta=0
+   android:duration=@android:integer/config_shortAnimTime/
diff --git a/wikipedia/res/anim/slide_out_bottom.xml 
b/wikipedia/res/anim/slide_out_bottom.xml
new file mode 100644
index 000..ef90f7e
--- /dev/null
+++ b/wikipedia/res/anim/slide_out_bottom.xml
@@ -0,0 +1,5 @@
+?xml version=1.0 encoding=utf-8?
+translate xmlns:android=http://schemas.android.com/apk/res/android;
+   android:interpolator=@android:anim/accelerate_interpolator
+   android:fromYDelta=0 android:toYDelta=50%p
+   android:duration=@android:integer/config_shortAnimTime/
\ No newline at end of file
diff --git a/wikipedia/res/values/styles.xml b/wikipedia/res/values/styles.xml
index 333a7cd..1dddae3 100644
--- a/wikipedia/res/values/styles.xml
+++ b/wikipedia/res/values/styles.xml
@@ -38,10 +38,10 @@
 item name=android:textColor@color/page_info_heading/item
 /style
 
-!-- For dialog Animation, uses appcompat-v7 --
+!-- For dialog Animation --
 style name=DialogAnimation
-item 
name=android:windowEnterAnimation@anim/abc_slide_in_bottom/item
-item 
name=android:windowExitAnimation@anim/abc_slide_out_bottom/item
+item name=android:windowEnterAnimation@anim/slide_in_bottom/item
+item name=android:windowExitAnimation@anim/slide_out_bottom/item
 /style
 style name=DialogSlideAnim parent=@android:style/Theme.Dialog
 item name=android:windowAnimationStyle@style/DialogAnimation/item

-- 
To view, visit https://gerrit.wikimedia.org/r/172496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7814aa7541491b39fe7136e7d38e9886264232ca
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 Android string translations from TWN - change (apps...wikipedia)

2014-12-01 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176695

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: I6f9d017e7a5341448a6ad36f85532aabab251688
---
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-gl/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-ko/strings.xml
M wikipedia/res/values-kw/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt-rBR/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sk/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-uz/strings.xml
M wikipedia/res/values-yi/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
22 files changed, 160 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/95/176695/1

diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index a8aaba0..536549c 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -47,7 +47,7 @@
   string name=nearby_empty_messageQuan us mogueu a una ubicació nova, 
proveu de refrescar la pàgina per saber què hi ha al voltant./string
   string name=nearby_distance_in_meters%d m/string
   string name=nearby_distance_in_kilometers%.2f km/string
-  string name=nearby_distance_in_feet fuzzy=true%d ft/string
+  string name=nearby_distance_in_feet%d peus/string
   string name=nearby_distance_in_miles%.2f mi/string
   string name=nearby_no_networkNo hi ha connexió a la xarxa/string
   string name=nearby_server_errorNo s\'ha pogut recuperar la llista de 
llocs propers./string
@@ -76,6 +76,9 @@
   string name=dialog_message_edit_failedL\'edició no s\'ha desat!/string
   string name=dialog_message_edit_failed_retryReintenta/string
   string name=dialog_message_edit_failed_cancelCancel·la/string
+  string name=dialog_message_leaving_edit«Els canvis no s\'han desat 
encara. Esteu segur que voleu sortir d\'aquesta pàgina?»/string
+  string name=dialog_message_leaving_edit_leaveSurt/string
+  string name=dialog_message_leaving_edit_stayRoman/string
   string name=menu_show_tocTaula de continguts/string
   string name=search_no_results_foundCap resultat/string
   string name=edit_section_captcha_messagePer ajudar a protegir contra 
l\'spam automàtic, si us plau, introduïu les paraules que apareixen a 
sota/string
@@ -240,7 +243,7 @@
   string name=search_error_retryTorna a provar/string
   string name=search_redirect_titleRedirecció de «%s»./string
   string name=search_recent_headerCerques recents:/string
-  string name=button_clear_all_recent_searches fuzzy=trueEsborra cerques 
recents/string
+  string name=button_clear_all_recent_searchesEsborra les cerques 
recents/string
   string name=clear_recent_searches_confirmEsteu segur que voleu esborrar 
l\'historial de cerca?/string
   string name=search_titles_buttonTítols/string
   string name=search_full_buttonDins d\'articles/string
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 323afe0..7678847 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -76,6 +76,9 @@
   string name=dialog_message_edit_failedBearbeitung 
fehlgeschlagen!/string
   string name=dialog_message_edit_failed_retryErneut versuchen/string
   string name=dialog_message_edit_failed_cancelAbbrechen/string
+  string name=dialog_message_leaving_edit„Deine Änderungen wurden noch 
nicht gespeichert. Bist du sicher, dass du diese Seite verlassen 
möchtest?“/string
+  string name=dialog_message_leaving_edit_leaveVerlassen/string
+  string name=dialog_message_leaving_edit_stayBleiben/string
   string name=menu_show_tocInhaltsverzeichnis/string
   string name=search_no_results_foundKeine Ergebnisse gefunden/string
   string name=edit_section_captcha_messageZum Schutz vor automatisiertem 
Spam gib bitte die unten erscheinenden Wörter ein./string
diff --git a/wikipedia/res/values-es/strings.xml 
b/wikipedia/res/values-es/strings.xml
index 0d1a068..0d6446d 100644
--- a/wikipedia/res/values-es/strings.xml
+++ b/wikipedia/res/values-es/strings.xml
@@ -76,6 +76,9 @@
   string name=dialog_message_edit_failed¡Error de edición!/string
   string name=dialog_message_edit_failed_retryReintentar/string
   string name=dialog_message_edit_failed_cancelCancelar/string
+  string name=dialog_message_leaving_edit\Los cambios no se han guardado 
aún. ¿Estás seguro de que quieres salir de esta página?\/string
+

[MediaWiki-commits] [Gerrit] Manual import of iOS string translations from TWN - change (apps...wikipedia)

2014-12-01 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176697

Change subject: Manual import of iOS string translations from TWN
..

Manual import of iOS string translations from TWN

Change-Id: I72ad704d3783024b7f601b9ddb04fe95aafe933d
---
M wikipedia/azb.lproj/Localizable.strings
M wikipedia/ca.lproj/Localizable.strings
M wikipedia/ce.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/lb.lproj/Localizable.strings
M wikipedia/mk.lproj/Localizable.strings
M wikipedia/nl.lproj/Localizable.strings
M wikipedia/pl.lproj/Localizable.strings
M wikipedia/pt.lproj/Localizable.strings
M wikipedia/ro.lproj/Localizable.strings
M wikipedia/ru.lproj/Localizable.strings
M wikipedia/sk.lproj/Localizable.strings
M wikipedia/sr-ec.lproj/Localizable.strings
M wikipedia/sv.lproj/Localizable.strings
M wikipedia/uz.lproj/Localizable.strings
M wikipedia/vi.lproj/Localizable.strings
M wikipedia/zh-hans.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Localizable.strings
21 files changed, 106 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/97/176697/1

diff --git a/wikipedia/azb.lproj/Localizable.strings 
b/wikipedia/azb.lproj/Localizable.strings
index 85e7e3d..7c32707 100644
--- a/wikipedia/azb.lproj/Localizable.strings
+++ b/wikipedia/azb.lproj/Localizable.strings
@@ -9,11 +9,15 @@
 history-label = سون;
 history-section-today = بوگون;
 history-section-yesterday = دونن;
+history-section-lastweek = گئچن هفته;
 history-section-lastmonth = گئچن آی;
 history-clear-cancel = پوْز;
 history-clear-delete-all = هامیسین سیل;
 zero-interstitial-continue = چیخ;
 zero-interstitial-cancel = بوردا قال;
+zero-learn-more-learn-more = آردی‌سی;
+zero-learn-more-no-thanks = باغلا;
+account-creation-logging-in = گیریش ائدیلیر...;
 account-creation-saving = ساخلانیلیر...;
 account-creation-login = اؤنجه‌دن حسابینیز وارمی؟ گیرینیز.;
 account-creation-username-placeholder-text = ایشلدن آدی;
@@ -24,6 +28,7 @@
 wikitext-upload-save = ساخلانیلیر...;
 wikitext-upload-save-sign-in = گیریش;
 wikitext-upload-save-anonymously = آدسیز ساخلا;
+open-link-title = باغلانتی‌نی آچ;
 open-link-cancel = پوْز;
 search-searching = آختاریلیر...;
 search-field-placeholder-text = ویکی‌پئدیادا آختار;
@@ -31,6 +36,9 @@
 search-loading-section-remaining = مقاله‌نین قالانی یوکله‌نیر...;
 search-loading-article-loaded = مقاله یوکلندی.;
 search-cancel = پوْز;
+search-titles = باشلیق‌لار;
+search-recent-clear-cancel = وازگئچ;
+search-recent-clear-delete-all = هامیسین سیل;
 main-menu-title = آرتیق;
 main-menu-language-title = ویکی‌پئدیادا 1$ آختار;
 main-menu-language-toggle-show = دیللری گؤستر;
@@ -44,8 +52,11 @@
 main-menu-show-history = سون;
 main-menu-show-saved = ساخلانیلمیش صحیفه‌لر;
 main-menu-random = تصادوفی;
+main-menu-feedback-heading = دؤنوت;
+main-menu-send-feedback =  اویغولاما دؤنوتونو گؤندر;
 main-menu-privacy-policy = گیزلیلیک سیاستی;
 main-menu-terms-of-use = ایشلتمک شرطلری;
+main-menu-rate-app = اویغولامانی دَیرلندیر;
 main-menu-show-today = بوگون;
 main-menu-nearby = یاخیندا;
 main-menu-more = داها...;
@@ -66,6 +77,10 @@
 edit-summary-choice-added-missing-info = آرتیریلمیش ایتگین بیلگیلر;
 edit-summary-choice-other = آیری;
 article-pull-to-refresh-is-refreshing = مقاله تازالانیر;
+about-title = گؤره;
+about-wikipedia = ویکی‌پدیا;
+about-contributors = چالیشقان‌لار;
+about-translators = چئویریجی‌لر;
 share-menu-save-page = صحیفه‌نی ساخلا;
 timestamp-just-now = ایندی;
 timestamp-minutes = d% دقیقه قاباق;
@@ -91,10 +106,12 @@
 menu-preview-accessibility-label = اؤن‌گؤستریش;
 menu-back-accessibility-label = دالی;
 menu-forward-accessibility-label = قاباق;
+menu-w-accessibility-label = منو;
 menu-toc-accessibility-label = ایچینده‌کیلر;
 menu-search-accessibility-label = آختار;
 menu-cancel-accessibility-label = پوْز;
 menu-share-accessibility-label = پایلاش;
+menu-more-accessibility-label = چوخراق تنظیم‌لر;
 menu-trash-accessibility-label = سیل;
 nearby-title = یاخیندا;
 nearby-distance-label-meters = $1 مئتیر;
diff --git a/wikipedia/ca.lproj/Localizable.strings 
b/wikipedia/ca.lproj/Localizable.strings
index f78e204..ae438e0 100644
--- a/wikipedia/ca.lproj/Localizable.strings
+++ b/wikipedia/ca.lproj/Localizable.strings
@@ -84,6 +84,11 @@
 search-titles = Títols;
 search-within-articles = Dins d'articles;
 search-did-you-mean = Volíeu dir: $1?;
+search-recent-title = Cerques recents;
+search-recent-clear-confirmation-heading = Voleu suprimir totes les cerques 
recents?;
+search-recent-clear-confirmation-sub-heading = No es pot desfer l'acció!;
+search-recent-clear-cancel = Cancel·la;
+search-recent-clear-delete-all = Suprimeix-ho tot;
 main-menu-title = Més;
 main-menu-language-title = Cerca la wiki en llengua $1;
 main-menu-language-toggle-show = Mostra idiomes;

[MediaWiki-commits] [Gerrit] Remove extra quotes in string resource - change (apps...wikipedia)

2014-12-01 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176699

Change subject: Remove extra quotes in string resource
..

Remove extra quotes in string resource

Change-Id: Ib0531dcbb4eca98dc78a2007aa6bdc4f614dd809
---
M wikipedia/res/values/strings.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/99/176699/1

diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index a92963f..0e15c6a 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -82,7 +82,7 @@
 string name=dialog_message_edit_failedEdit failed!/string
 string name=dialog_message_edit_failed_retryRetry/string
 string name=dialog_message_edit_failed_cancelCancel/string
-string name=dialog_message_leaving_editYour changes have not been 
saved yet. Are you sure you want to leave this page?/string
+string name=dialog_message_leaving_editYour changes have not been 
saved yet. Are you sure you want to leave this page?/string
 string name=dialog_message_leaving_edit_leaveLeave/string
 string name=dialog_message_leaving_edit_stayStay/string
 string name=menu_show_tocTable of Contents/string

-- 
To view, visit https://gerrit.wikimedia.org/r/176699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0531dcbb4eca98dc78a2007aa6bdc4f614dd809
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix ToC icon color in dark mode on 5.0 - change (apps...wikipedia)

2014-12-01 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176893

Change subject: Fix ToC icon color in dark mode on 5.0
..

Fix ToC icon color in dark mode on 5.0

On Lollipop the adjustDrawableToTheme call for the
ToC icon didn't seem to have any lasting effect.

Change-Id: I0cfd7505c50f5a93f86ce29884defb5e6524a228
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/93/176893/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 7ac7bd6..b0cbb4d 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -567,7 +567,7 @@
 }
 
 public void onPrepareOptionsMenu(Menu menu) {
-
app.adjustDrawableToTheme(getResources().getDrawable(R.drawable.ic_toc));
+app.adjustDrawableToTheme(menu.findItem(R.id.menu_toc).getIcon());
 
 switch (state) {
 case PageViewFragmentInternal.STATE_NO_FETCH:

-- 
To view, visit https://gerrit.wikimedia.org/r/176893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cfd7505c50f5a93f86ce29884defb5e6524a228
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move adjustDrawableToTheme call to onCreateOptionsMenu - change (apps...wikipedia)

2014-12-01 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176894

Change subject: Move adjustDrawableToTheme call to onCreateOptionsMenu
..

Move adjustDrawableToTheme call to onCreateOptionsMenu

Saves a call when tapping on the overflow menu, and is
more consistent with the rest of the adjustDrawableToTheme calls.

Change-Id: I4aa6c8934b07093f1acc54f325af562b3b8e06d7
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/94/176894/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 103fb45..892d0b3 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -146,6 +146,7 @@
 return;
 }
 inflater.inflate(R.menu.menu_page_actions, menu);
+fragment.onCreateOptionsMenu(menu, inflater);
 }
 
 @Override
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index b0cbb4d..3f2d7fe 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -37,6 +37,7 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.view.MenuItemCompat;
@@ -48,6 +49,7 @@
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -566,9 +568,11 @@
 }
 }
 
-public void onPrepareOptionsMenu(Menu menu) {
+public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 app.adjustDrawableToTheme(menu.findItem(R.id.menu_toc).getIcon());
+}
 
+public void onPrepareOptionsMenu(Menu menu) {
 switch (state) {
 case PageViewFragmentInternal.STATE_NO_FETCH:
 case PageViewFragmentInternal.STATE_INITIAL_FETCH:

-- 
To view, visit https://gerrit.wikimedia.org/r/176894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aa6c8934b07093f1acc54f325af562b3b8e06d7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Prevent NPE in ToCHandler.scrollToSection - change (apps...wikipedia)

2014-12-02 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177148

Change subject: Prevent NPE in ToCHandler.scrollToSection
..

Prevent NPE in ToCHandler.scrollToSection

Bug: T75402
Change-Id: I468d8ade39170c069073491ac85f8165622a4223
---
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/48/177148/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index f96535b..9044900 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -151,7 +151,9 @@
 }
 
 public void scrollToSection(Section section) {
-scrollToSection(section.isLead() ? heading_ + section.getId() : 
section.getAnchor());
+if (section != null) {
+scrollToSection(section.isLead() ? heading_ + section.getId() : 
section.getAnchor());
+}
 }
 
 public void setupToC(final Page page) {

-- 
To view, visit https://gerrit.wikimedia.org/r/177148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I468d8ade39170c069073491ac85f8165622a4223
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Check if EditSectionActivity is finished - change (apps...wikipedia)

2014-12-02 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177161

Change subject: Check if EditSectionActivity is finished
..

Check if EditSectionActivity is finished

Bug: T73299
Change-Id: I438a77d2116237016bb2a4fd73e4f82e7adb2a0d
---
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 11 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/61/177161/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java 
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index 44a7ea2..b4d511a 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -71,7 +71,6 @@
 
 private String sectionWikitext;
 
-private SyntaxHighlighter syntaxHighlighter;
 private EditText sectionText;
 private boolean sectionTextModified = false;
 private boolean sectionTextFirstLoad = true;
@@ -79,7 +78,6 @@
 private View sectionProgress;
 private View sectionContainer;
 private View sectionError;
-private Button sectionErrorRetry;
 
 private View abusefilterContainer;
 private ImageView abuseFilterImage;
@@ -93,8 +91,6 @@
 private EditPreviewFragment editPreviewFragment;
 
 private EditSummaryFragment editSummaryFragment;
-
-private TextView editLicenseText;
 
 private EditFunnel funnel;
 
@@ -125,13 +121,13 @@
 sectionText = (EditText) findViewById(R.id.edit_section_text);
 
 if (app.getReleaseType() != WikipediaApp.RELEASE_PROD) {
-syntaxHighlighter = new SyntaxHighlighter(this, sectionText);
+new SyntaxHighlighter(this, sectionText);
 }
 
 sectionProgress = findViewById(R.id.edit_section_load_progress);
 sectionContainer = findViewById(R.id.edit_section_container);
 sectionError = findViewById(R.id.edit_section_error);
-sectionErrorRetry = (Button) 
findViewById(R.id.edit_section_error_retry);
+Button sectionErrorRetry = (Button) 
findViewById(R.id.edit_section_error_retry);
 
 abusefilterContainer = 
findViewById(R.id.edit_section_abusefilter_container);
 abuseFilterImage = (ImageView) 
findViewById(R.id.edit_section_abusefilter_image);
@@ -213,7 +209,7 @@
 }
 
 private void updateEditLicenseText() {
-editLicenseText = (TextView) 
findViewById(R.id.edit_section_license_text);
+TextView editLicenseText = (TextView) 
findViewById(R.id.edit_section_license_text);
 if (app.getUserInfoStorage().isLoggedIn()) {
 
editLicenseText.setText(Html.fromHtml(getString(R.string.edit_save_action_license_logged_in)));
 } else {
@@ -288,7 +284,9 @@
 new DoEditTask(EditSectionActivity.this, title, 
sectionText.getText().toString(), sectionID, token, summaryText) {
 @Override
 public void onBeforeExecute() {
-progressDialog.show();
+if (!isFinishing()) {
+progressDialog.show();
+}
 }
 
 @Override
@@ -298,7 +296,7 @@
 
 @Override
 public void onCatch(Throwable caught) {
-if (!progressDialog.isShowing()) {
+if (isFinishing() || !progressDialog.isShowing()) {
 // no longer attached to activity!
 return;
 }
@@ -315,7 +313,7 @@
 
 @Override
 public void onFinish(EditingResult result) {
-if (!progressDialog.isShowing()) {
+if (isFinishing() || !progressDialog.isShowing()) {
 // no longer attached to activity!
 return;
 }
@@ -363,6 +361,9 @@
 
 @Override
 public void onTokenFailed(Throwable caught) {
+if (isFinishing()) {
+return;
+}
 if (!(caught instanceof ApiException)) {
 throw new RuntimeException(caught);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/177161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I438a77d2116237016bb2a4fd73e4f82e7adb2a0d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Avoid rehashing when building HashMaps in staticdata - change (apps...wikipedia)

2014-12-03 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177311

Change subject: Avoid rehashing when building HashMaps in staticdata
..

Avoid rehashing when building HashMaps in staticdata

Setting load factor to 1, and capacity slightly larger than what we need.

Change-Id: Ifa6659306892415e4eb8dba934a5b00e1222d958
---
M scripts/templates/basichash.java.jinja
M wikipedia/src/main/java/org/wikipedia/staticdata/FileAliasData.java
M wikipedia/src/main/java/org/wikipedia/staticdata/MainPageNameData.java
M wikipedia/src/main/java/org/wikipedia/staticdata/SpecialAliasData.java
4 files changed, 276 insertions(+), 276 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/11/177311/1

diff --git a/scripts/templates/basichash.java.jinja 
b/scripts/templates/basichash.java.jinja
index bbb4440..652df98 100644
--- a/scripts/templates/basichash.java.jinja
+++ b/scripts/templates/basichash.java.jinja
@@ -11,8 +11,8 @@
 
 @SuppressWarnings({checkstyle:methodlength, SpellCheckingInspection})
 private static void setupData() {
-final int size = {{wikis|length}};
-DATA_MAP = new HashMapString, String(size);
+final int size = {{wikis|length + 1}};
+DATA_MAP = new HashMapString, String(size, 1.0f);
 
 {%- for wiki in wikis %}
 DATA_MAP.put({{wiki.lang}}, {{wiki.props[key]}});
diff --git 
a/wikipedia/src/main/java/org/wikipedia/staticdata/FileAliasData.java 
b/wikipedia/src/main/java/org/wikipedia/staticdata/FileAliasData.java
index 2ad4b11..242ef15 100644
--- a/wikipedia/src/main/java/org/wikipedia/staticdata/FileAliasData.java
+++ b/wikipedia/src/main/java/org/wikipedia/staticdata/FileAliasData.java
@@ -11,59 +11,59 @@
 
 @SuppressWarnings({checkstyle:methodlength, SpellCheckingInspection})
 private static void setupData() {
-final int size = 287;
-DATA_MAP = new HashMapString, String(size);
+final int size = 288;
+DATA_MAP = new HashMapString, String(size, 1.0f);
 DATA_MAP.put(en, File);
+DATA_MAP.put(sv, Fil);
 DATA_MAP.put(nl, Bestand);
 DATA_MAP.put(de, Datei);
-DATA_MAP.put(sv, Fil);
 DATA_MAP.put(fr, Fichier);
-DATA_MAP.put(it, File);
+DATA_MAP.put(war, Paypay);
+DATA_MAP.put(ceb, Payl);
 DATA_MAP.put(ru, Файл);
+DATA_MAP.put(it, File);
 DATA_MAP.put(es, Archivo);
 DATA_MAP.put(vi, Tập tin);
-DATA_MAP.put(war, Paypay);
 DATA_MAP.put(pl, Plik);
-DATA_MAP.put(ceb, Payl);
 DATA_MAP.put(ja, ファイル);
 DATA_MAP.put(pt, Ficheiro);
 DATA_MAP.put(zh, File);
 DATA_MAP.put(uk, Файл);
 DATA_MAP.put(ca, Fitxer);
-DATA_MAP.put(no, Fil);
 DATA_MAP.put(fa, پرونده);
+DATA_MAP.put(no, Fil);
 DATA_MAP.put(fi, Tiedosto);
 DATA_MAP.put(id, Berkas);
-DATA_MAP.put(cs, Soubor);
 DATA_MAP.put(ar, ملف);
+DATA_MAP.put(sr, Датотека);
+DATA_MAP.put(cs, Soubor);
 DATA_MAP.put(ko, 파일);
+DATA_MAP.put(sh, Datoteka);
 DATA_MAP.put(ms, Fail);
 DATA_MAP.put(hu, Fájl);
-DATA_MAP.put(sr, Датотека);
 DATA_MAP.put(ro, Fișier);
 DATA_MAP.put(tr, Dosya);
 DATA_MAP.put(min, Berkas);
 DATA_MAP.put(kk, Сурет);
 DATA_MAP.put(eo, Dosiero);
-DATA_MAP.put(sh, Datoteka);
+DATA_MAP.put(eu, Fitxategi);
 DATA_MAP.put(sk, Súbor);
 DATA_MAP.put(da, Fil);
-DATA_MAP.put(eu, Fitxategi);
-DATA_MAP.put(lt, Vaizdas);
 DATA_MAP.put(bg, Файл);
+DATA_MAP.put(lt, Vaizdas);
 DATA_MAP.put(he, קובץ);
 DATA_MAP.put(hr, Datoteka);
 DATA_MAP.put(sl, Slika);
-DATA_MAP.put(uz, Fayl);
-DATA_MAP.put(et, Pilt);
 DATA_MAP.put(hy, Պատկեր);
+DATA_MAP.put(et, Pilt);
+DATA_MAP.put(uz, Fayl);
 DATA_MAP.put(vo, Ragiv);
-DATA_MAP.put(nn, Fil);
-DATA_MAP.put(gl, Ficheiro);
 DATA_MAP.put(simple, File);
+DATA_MAP.put(gl, Ficheiro);
+DATA_MAP.put(nn, Fil);
 DATA_MAP.put(hi, चित्र);
-DATA_MAP.put(la, Fasciculus);
 DATA_MAP.put(el, Αρχείο);
+DATA_MAP.put(la, Fasciculus);
 DATA_MAP.put(az, Şəkil);
 DATA_MAP.put(th, ไฟล์);
 DATA_MAP.put(oc, Fichièr);
@@ -71,83 +71,83 @@
 DATA_MAP.put(mk, Податотека);
 DATA_MAP.put(be, Файл);
 DATA_MAP.put(new, किपा);
+DATA_MAP.put(ce, Файл);
+DATA_MAP.put(ta, படிமம்);
 DATA_MAP.put(tt, Файл);
 DATA_MAP.put(pms, Figura);
 DATA_MAP.put(tl, Talaksan);
-DATA_MAP.put(ta, படிமம்);
-DATA_MAP.put(te, దస్త్రం);
+DATA_MAP.put(ur, ملف);
 DATA_MAP.put(cy, Delwedd);
+DATA_MAP.put(te, దస్త్రం);
 DATA_MAP.put(lv,

[MediaWiki-commits] [Gerrit] Whoops: explicitly set placeholder image for thumbnails. - change (apps...wikipedia)

2014-12-04 Thread BearND (Code Review)

BearND has submitted this change and it was merged.

Change subject: Whoops: explicitly set placeholder image for thumbnails.
..


Whoops: explicitly set placeholder image for thumbnails.

...because views can be recycled.

Change-Id: Id147dc4912d63b08eab71022865fcbf6b38f91fc
---
M wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
5 files changed, 20 insertions(+), 0 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java 
b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
index 161e2c7..8167357 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -267,6 +267,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(thumbnail);
+} else {
+Picasso.with(getActivity())
+   .load(R.drawable.ic_pageimage_placeholder)
+   .into(thumbnail);
 }
 
 // Check the previous item, see if the times differ enough
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 282ea4e..62142fd 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -602,6 +602,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(viewHolder.thumbnail);
+} else {
+Picasso.with(getActivity())
+   .load(R.drawable.ic_pageimage_placeholder)
+   .into(viewHolder.thumbnail);
 }
 return convertView;
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
index bfb8f5a..ce6707e 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
@@ -251,6 +251,10 @@
.placeholder(R.drawable.ic_pageimage_placeholder)
.error(R.drawable.ic_pageimage_placeholder)
.into(thumbnail);
+} else {
+Picasso.with(getActivity())
+   .load(R.drawable.ic_pageimage_placeholder)
+   .into(thumbnail);
 }
 
 // If this page title's first letter is different from the 
previous title's
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
index cdf3f90..9ba88ae 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
@@ -299,6 +299,10 @@
 .placeholder(R.drawable.ic_pageimage_placeholder)
 .error(R.drawable.ic_pageimage_placeholder)
 .into(imageView);
+} else {
+Picasso.with(getActivity())
+   .load(R.drawable.ic_pageimage_placeholder)
+   .into(imageView);
 }
 
 //...and lastly, if we've scrolled to the last item in the list, 
then
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
index 5621063..d3660d3 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
@@ -248,6 +248,10 @@
 .placeholder(R.drawable.ic_pageimage_placeholder)
 .error(R.drawable.ic_pageimage_placeholder)
 .into(imageView);
+} else {
+Picasso.with(getActivity())
+   .load(R.drawable.ic_pageimage_placeholder)
+   .into(imageView);
 }
 
 return convertView;

-- 
To view, visit https://gerrit.wikimedia.org/r/177405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged

[MediaWiki-commits] [Gerrit] Enable basic ProGuard minification - change (apps...wikipedia)

2014-12-11 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179174

Change subject: Enable basic ProGuard minification
..

Enable basic ProGuard minification

We can make the ProGuard config more aggressive later.
Want to keep it on the lighter side initially.
This is mainly driven by the desire to fix the bugs mentioned below.

Bug: T78197
Bug: T76279
Change-Id: Ic91e83e6dc4d25780dc8815318aba2e2a0c009fb
---
M wikipedia/build.gradle
M wikipedia/proguard-rules.pro
2 files changed, 60 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/74/179174/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index a4f3329..90f2360 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -17,7 +17,7 @@
 }
 buildTypes {
 release {
-minifyEnabled false
+minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 
'proguard-rules.pro'
 signingConfig signingConfigs.release
 }
diff --git a/wikipedia/proguard-rules.pro b/wikipedia/proguard-rules.pro
index 200fdff..a5c166b 100644
--- a/wikipedia/proguard-rules.pro
+++ b/wikipedia/proguard-rules.pro
@@ -15,3 +15,62 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+###
+# from https://github.com/ACRA/acra/wiki/ProGuard
+#ACRA specifics
+# Restore some Source file names and restore approximate line numbers in the 
stack traces,
+# otherwise the stack traces are pretty useless
+-keepattributes SourceFile,LineNumberTable
+
+# ACRA needs annotations so add this...
+# Note: This may already be defined in the default 
proguard-android-optimize.txt
+# file in the SDK. If it is, then you don't need to duplicate it. See your
+# project.properties file to get the path to the default 
proguard-android-optimize.txt.
+-keepattributes *Annotation*
+
+-keepattributes Signature
+
+## instead of the remaining ACRA proguard config: just keep all classes for now
+-keep class org.acra.** {*;}
+
+###
+# Other libraries:
+
+# https://github.com/square/okio/issues/60
+-dontwarn okio.**
+
+-dontwarn com.squareup.okhttp.**
+-dontnote com.squareup.okhttp.internal.Platform
+
+-keep class com.nineoldandroids.animation.** {*;}
+-keep class com.nineoldandroids.util.Property {*;}
+
+-keep class com.mobsandgeeks.saripaar.** {*;}
+
+-keep class com.squareup.picasso.** {*;}
+
+-keep class uk.co.senab.photoview.** {*;}
+
+-keep class com.github.kevinsawicki.http.** {*;}
+
+###
+# Android support libraries:
+
+# https://phabricator.wikimedia.org/T78197:
+# NoClassDefFoundError: android.support.v7.internal.view.menu.MenuBuilder
+# 
http://stackoverflow.com/questions/26657348/appcompat-v7-v21-0-0-causing-crash-on-samsung-devices-with-android-v4-2-2
+# Allow obfuscation of android.support.v7.internal.view.menu.** but not the 
rest of android.support
+# to avoid problem on Samsung 4.2.2 devices with appcompat v21
+# see https://code.google.com/p/android/issues/detail?id=78377#hc150
+-keep class !android.support.v7.internal.view.menu.MenuBuilder
+-keep class !android.support.v7.internal.view.menu.SubMenuBuilder
+
+-dontnote android.support.v4.text.ICUCompatIcs
+
+#-dontwarn android.support.**
+
+###
+# Our code:
+-keep class org.wikipedia.** {*;}
+-keep class org.mediawiki.api.json.** {*;}

-- 
To view, visit https://gerrit.wikimedia.org/r/179174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic91e83e6dc4d25780dc8815318aba2e2a0c009fb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Enable Lint - change (apps...wikipedia)

2014-12-11 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179227

Change subject: Enable Lint
..

Enable Lint

Mark string files that never get translated to ignore missing translations.
Set MissingTranslation to warnings.

Change-Id: If3235273632b17118e0a2096caa79a6fd51fe6d9
---
M wikipedia/build.gradle
M wikipedia/res/values/credits.xml
M wikipedia/res/values/device_prop.xml
M wikipedia/res/values/languages_list.xml
M wikipedia/res/values/last_updated.xml
M wikipedia/res/values/preference_keys.xml
6 files changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/27/179227/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index a4f3329..9cc0088 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -76,10 +76,7 @@
 }
 // while we still have lint errors; remove once those are fixed
 lintOptions {
-checkReleaseBuilds false
-// Or, if you prefer, you can continue to check for errors in release 
builds,
-// but continue the build even when errors are found:
-abortOnError false
+warning 'MissingTranslation'
 }
 }
 
diff --git a/wikipedia/res/values/credits.xml b/wikipedia/res/values/credits.xml
index 91e02b1..15b75a5 100644
--- a/wikipedia/res/values/credits.xml
+++ b/wikipedia/res/values/credits.xml
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=utf-8?
-resources
+resources xmlns:tools=http://schemas.android.com/tools; 
tools:ignore=MissingTranslation
 string name=contributors_listAdam Baso, Amir E. Aharoni, Anirudh S, 
Bernd Sitzmann, Brion Vibber, Dan Garry, Dmitry Brant, Kenan Wang, Maryana 
Pinchuk, Max Semenik, Moiz Syed, Monte Hurd, Mun May Tee, Nicole Borrelli, 
Niklas Laxström, Thomas PT, Tomasz Finc, Vibha Bamba, Yuvi Panda/string
 string name=libraries_lista href=http://acra.ch;ACRA/a
 !--  https://raw.githubusercontent.com/ACRA/acra/master/LICENSE --
diff --git a/wikipedia/res/values/device_prop.xml 
b/wikipedia/res/values/device_prop.xml
index 22485b8..4453c92 100644
--- a/wikipedia/res/values/device_prop.xml
+++ b/wikipedia/res/values/device_prop.xml
@@ -1,4 +1,4 @@
 ?xml version=1.0 encoding=utf-8?
-resources
+resources xmlns:tools=http://schemas.android.com/tools; 
tools:ignore=MissingTranslation
 string name=device_typePhone/string
 /resources
\ No newline at end of file
diff --git a/wikipedia/res/values/languages_list.xml 
b/wikipedia/res/values/languages_list.xml
index 4c7cb1c..8ee16e1 100644
--- a/wikipedia/res/values/languages_list.xml
+++ b/wikipedia/res/values/languages_list.xml
@@ -1,5 +1,5 @@
 ?xml version='1.0' encoding='utf-8'?
-resources
+resources xmlns:tools=http://schemas.android.com/tools; 
tools:ignore=MissingTranslation
   string-array name=preference_language_keys
 itemen/item
 itemnl/item
diff --git a/wikipedia/res/values/last_updated.xml 
b/wikipedia/res/values/last_updated.xml
index f0438ee..7d8fc9f 100644
--- a/wikipedia/res/values/last_updated.xml
+++ b/wikipedia/res/values/last_updated.xml
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=utf-8?
-resources
+resources xmlns:tools=http://schemas.android.com/tools; 
tools:ignore=MissingTranslation
 !-- timestamp of when the bundled styles were last updated in ISO 8601--
 string name=bundled_styles_updated2019-06-17T00:00:00Z/string
 /resources
\ No newline at end of file
diff --git a/wikipedia/res/values/preference_keys.xml 
b/wikipedia/res/values/preference_keys.xml
index bd71d3d..17cd48e 100644
--- a/wikipedia/res/values/preference_keys.xml
+++ b/wikipedia/res/values/preference_keys.xml
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=utf-8?
-resources
+resources xmlns:tools=http://schemas.android.com/tools; 
tools:ignore=MissingTranslation
 string name=preference_key_languagecontent_language/string
 string name=preference_cookie_domainscookie_domains/string
 string 
name=preference_cookies_for_domaincookies_for_domain_%1$s/string

-- 
To view, visit https://gerrit.wikimedia.org/r/179227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3235273632b17118e0a2096caa79a6fd51fe6d9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Code inspections - change (apps...wikipedia)

2014-12-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179492

Change subject: Code inspections
..

Code inspections

Fix some low hanging fruit code inspections in Android Studio

Change-Id: Ib3845d2a65a37b7dbef8c619fcce3a3d6d59afcd
---
M wikipedia-it/pom.xml
M wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
M wikipedia/pom.xml
M wikipedia/res/layout/activity_about.xml
M wikipedia/res/layout/dialog_themechooser.xml
M wikipedia/res/layout/fragment_history.xml
M wikipedia/res/layout/fragment_navdrawer.xml
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/layout/fragment_saved_pages.xml
M wikipedia/res/layout/item_saved_page_entry.xml
M wikipedia/res/layout/simple_list_item_activated_2.xml
M wikipedia/res/values-gl/strings.xml
M wikipedia/res/values/last_updated.xml
M wikipedia/src/main/java/org/wikipedia/NonEmptyValidator.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/bridge/CommunicationBridge.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M wikipedia/src/main/java/org/wikipedia/settings/PreferenceActivityWithBack.java
M wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
20 files changed, 34 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/92/179492/1

diff --git a/wikipedia-it/pom.xml b/wikipedia-it/pom.xml
index 0774ac0..039dfd6 100644
--- a/wikipedia-it/pom.xml
+++ b/wikipedia-it/pom.xml
@@ -9,7 +9,6 @@
 version1.0-SNAPSHOT/version
 /parent
 
-groupIdorg.wikimedia/groupId
 artifactIdwikipedia-it/artifactId
 version1.0-SNAPSHOT/version
 packagingapk/packaging
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
index f179599..476141f 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
@@ -24,7 +24,6 @@
 final Site testWiki = new Site(test.wikipedia.org);
 final String username = someusername + System.currentTimeMillis();
 final String password = somepassword + System.currentTimeMillis();
-final WikipediaApp app = 
(WikipediaApp)getInstrumentation().getTargetContext().getApplicationContext();
 
 final CountDownLatch completionLatch = new CountDownLatch(1);
 runTestOnUiThread(new Runnable() {
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index f4dd535..dc9a5dc 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -169,7 +169,7 @@
 }
 }
 
-public void checkTranslationHasParameter(Res res, String paramName, Object 
val1, String alternateFormat) throws Exception {
+public void checkTranslationHasParameter(Res res, String paramName, Object 
val1, String alternateFormat) {
 String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, val1);
 //Log.i(TAG, myLocale + : + translatedString);
 if (!translatedString.contains(String.format(paramName, val1))
diff --git a/wikipedia/pom.xml b/wikipedia/pom.xml
index 46b3abf..1193d4d 100644
--- a/wikipedia/pom.xml
+++ b/wikipedia/pom.xml
@@ -9,7 +9,6 @@
 version1.0-SNAPSHOT/version
 /parent
 
-groupIdorg.wikimedia/groupId
 artifactIdwikipedia/artifactId
 version1.0-SNAPSHOT/version
 packagingapk/packaging
diff --git a/wikipedia/res/layout/activity_about.xml 
b/wikipedia/res/layout/activity_about.xml
index 8003ce9..065f968 100644
--- a/wikipedia/res/layout/activity_about.xml
+++ b/wikipedia/res/layout/activity_about.xml
@@ -25,6 +25,7 @@
 android:layout_width=96dp
 android:layout_height=96dp
 android:src=@drawable/about_logo
+android:contentDescription=@null
 /
 LinearLayout android:layout_width=0dp
   android:layout_height=72dp
diff --git a/wikipedia/res/layout/dialog_themechooser.xml 
b/wikipedia/res/layout/dialog_themechooser.xml
index d6ea87c..c9a9335 100644
--- a/wikipedia/res/layout/dialog_themechooser.xml
+++ b/wikipedia/res/layout/dialog_themechooser.xml
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 
 FrameLayout xmlns:android=http://schemas.android.com/apk/res/android;
+ xmlns:tools=http://schemas.android.com/tools;
  android:layout_width=match_parent
  android:layout_height=wrap_content
 
@@ -34,7 +35,7 @@

[MediaWiki-commits] [Gerrit] Save ProGuard mapping files - change (apps...wikipedia)

2014-12-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179569

Change subject: Save ProGuard mapping files
..

Save ProGuard mapping files

In case we need them to unscramble stack traces.
We haven't turned up ProGuard very much but better be safe than sorry.

Also wrapped some long lines since Checkstyle doesn't like that.

Change-Id: I45a230f064f27c377e0f224bd6b3f5e123160277
---
M scripts/make-release.py
1 file changed, 26 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/69/179569/1

diff --git a/scripts/make-release.py b/scripts/make-release.py
index 60ee5cc..e5b5203 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -13,7 +13,8 @@
 - TODO (Not implemented yet): Uploads certain bits to 
releases.mediawiki.org: releasesprod, beta
 
 To run
-1) tell people on #wikimedia-mobile you're about to bump the version, so hold 
off on merging to master
+1) tell people on #wikimedia-mobile you're about to bump the version,
+   so hold off on merging to master
 2) git checkout master
 3) git pull
 4) git reset --hard
@@ -82,10 +83,21 @@
 def make_release(flavors, custom_channel, custom_app):
 sh.cd(PATH_PREFIX)
 # ./gradlew -q assembleDevDebug
-args = [GRADLEW, '-q', 'clean', '-PcustomChannel=' + custom_channel, 
'-PcustomApplicationId=' + custom_app]
+args = [GRADLEW,
+'-q',
+'clean',
+'-PcustomChannel=' + custom_channel,
+'-PcustomApplicationId=' + custom_app]
 tasks = ['assemble{0}Release'.format(flavor.title()) for flavor in flavors]
 args += tasks
 subprocess.call(args)
+
+
+def copy_artifacts(flavor, target):
+folder_path = 'releases'
+sh.mkdir(-p, folder_path)
+copy_apk(flavor, target)
+copy_proguard_mapping(flavor, target)
 
 
 def copy_apk(flavor, target):
@@ -94,6 +106,15 @@
 output_file = '%s/wikipedia-%s.apk' % (folder_path, 
get_release_name(target))
 sh.cp('wikipedia/build/outputs/apk/wikipedia-%s-release.apk' % flavor, 
output_file)
 print ' apk: %s' % output_file
+
+
+def copy_proguard_mapping(flavor, target):
+folder_path = 'releases'
+sh.mkdir(-p, folder_path)
+output_file = '%s/wikipedia-%s.mapping.tar.gz' % (folder_path, 
get_release_name(target))
+input_file = 'wikipedia/build/outputs/mapping/%s/release/mapping.txt' % 
flavor
+sh.tar('czf', output_file, input_file)
+print ' proguard mapping: %s' % output_file
 
 
 def main():
@@ -149,10 +170,10 @@
 push_to_gerrit(target)
 else:
 make_release(flavors, custom_channel, custom_app)
-copy_apk(flavors[0], targets[0])
+copy_artifacts(flavors[0], targets[0])
 if flavors[0] == 'prod':
-copy_apk(flavors[1], flavors[1])
-print('Please test the APK. After that, run w/ --push flag, and as 
needed release the tested APK.')
+copy_artifacts(flavors[1], flavors[1])
+print('Please test the APK. After that, run w/ --push flag, and 
release the tested APK.')
 print('A useful command for collecting the release notes:')
 print('git log --pretty=format:%h | %cr | %s --abbrev-commit 
--no-merges '
   + '`git tag --list ' + targets[0] + '/* | tail -1`..')

-- 
To view, visit https://gerrit.wikimedia.org/r/179569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45a230f064f27c377e0f224bd6b3f5e123160277
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add releases folder to gitignore - change (apps...wikipedia)

2014-12-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179570

Change subject: Add releases folder to gitignore
..

Add releases folder to gitignore

Now that we also store mappings files there.

Change-Id: Id6aeeae15dd2a7179d0393ddf1f89847ae8c930d
---
M .gitignore
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/70/179570/1

diff --git a/.gitignore b/.gitignore
index a1e4f09..a74bff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@
 
 # Should never check in apk files
 *.apk
+# Older releases
+/releases

-- 
To view, visit https://gerrit.wikimedia.org/r/179570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6aeeae15dd2a7179d0393ddf1f89847ae8c930d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Hide system and navigation bars in GalleryActivity - change (apps...wikipedia)

2014-12-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179963

Change subject: Hide system and navigation bars in GalleryActivity
..

Hide system and navigation bars in GalleryActivity

when controls are hidden.

Change-Id: I00b24b5c45bfefa9ab3462532680f0d95bc14159
---
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/63/179963/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
index b8a2c7c..9ede638 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
@@ -10,9 +10,12 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.page.LinkMovementMethodExt;
 import org.wikipedia.page.PageActivity;
+
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.text.TextUtils;
@@ -96,6 +99,21 @@
 pageTitle = getIntent().getParcelableExtra(EXTRA_PAGETITLE);
 currentImageTitle = getIntent().getParcelableExtra(EXTRA_IMAGETITLE);
 Log.d(TAG, image title:  + currentImageTitle.getPrefixedText());
+
+if (Build.VERSION.SDK_INT = Build.VERSION_CODES.JELLY_BEAN) {
+View decorView = getWindow().getDecorView();
+decorView.setOnSystemUiVisibilityChangeListener
+(new View.OnSystemUiVisibilityChangeListener() {
+@Override
+public void onSystemUiVisibilityChange(int visibility) 
{
+if ((visibility  View.SYSTEM_UI_FLAG_FULLSCREEN) 
== 0) {
+// The system bars are visible. Bring back 
controls right away
+// to avoid the user having to click another 
time to get them back.
+setControlsShowing(true);
+}
+}
+});
+}
 
 if (savedInstanceState != null) {
 controlsShowing = savedInstanceState.getBoolean(controlsShowing);
@@ -185,6 +203,13 @@
 } else {
 ViewAnimations.ensureTranslationY(toolbarContainer, 
-toolbarContainer.getHeight());
 ViewAnimations.ensureTranslationY(infoContainer, 
infoContainer.getHeight());
+if (Build.VERSION.SDK_INT = Build.VERSION_CODES.JELLY_BEAN) {
+// Hide the status and navigation bars.
+int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+| View.SYSTEM_UI_FLAG_FULLSCREEN;
+View decorView = getWindow().getDecorView();
+decorView.setSystemUiVisibility(uiOptions);
+}
 }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/179963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00b24b5c45bfefa9ab3462532680f0d95bc14159
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Stop making gallery view info labels bold - change (apps...wikipedia)

2014-12-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179964

Change subject: Stop making gallery view info labels bold
..

Stop making gallery view info labels bold

Change-Id: I6af64b29bfda736bae85363c69400c932b0de28c
---
M wikipedia/res/layout/item_gallery_details.xml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/64/179964/1

diff --git a/wikipedia/res/layout/item_gallery_details.xml 
b/wikipedia/res/layout/item_gallery_details.xml
index 79a52e7..9aae97a 100644
--- a/wikipedia/res/layout/item_gallery_details.xml
+++ b/wikipedia/res/layout/item_gallery_details.xml
@@ -13,7 +13,6 @@
 android:layout_width=match_parent
 android:layout_height=wrap_content
 android:layout_gravity=center
-android:textStyle=bold
 android:textColor=@color/lead_text_color
 android:textColorLink=@color/lead_text_color
 android:textSize=16sp /

-- 
To view, visit https://gerrit.wikimedia.org/r/179964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6af64b29bfda736bae85363c69400c932b0de28c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 iOS string translations from TWN - change (apps...wikipedia)

2014-12-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179966

Change subject: Manual import of iOS string translations from TWN
..

Manual import of iOS string translations from TWN

Change-Id: Ibd2d885bdf4667354ff8d0acc079895a8c381887
---
M wikipedia/bn.lproj/InfoPlist.strings
M wikipedia/bn.lproj/Localizable.strings
M wikipedia/bn.lproj/Main_iPhone.strings
A wikipedia/ka.lproj/InfoPlist.strings
M wikipedia/ka.lproj/Localizable.strings
A wikipedia/ka.lproj/Main_iPhone.strings
M wikipedia/ko.lproj/Localizable.strings
M wikipedia/lb.lproj/Localizable.strings
M wikipedia/mk.lproj/Localizable.strings
M wikipedia/ms.lproj/Localizable.strings
10 files changed, 134 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/66/179966/1

diff --git a/wikipedia/bn.lproj/InfoPlist.strings 
b/wikipedia/bn.lproj/InfoPlist.strings
index 17b96a9..d408ff8 100644
--- a/wikipedia/bn.lproj/InfoPlist.strings
+++ b/wikipedia/bn.lproj/InfoPlist.strings
@@ -1,5 +1,6 @@
 // Messages for Bengali (বাংলা)
 // Exported from translatewiki.net
 // Author: Aftab1995
+// Author: Aftabuzzaman
 
 CFBundleDisplayName = উইকিপিডিয়া;
diff --git a/wikipedia/bn.lproj/Localizable.strings 
b/wikipedia/bn.lproj/Localizable.strings
index cc456d1..f8b2292 100644
--- a/wikipedia/bn.lproj/Localizable.strings
+++ b/wikipedia/bn.lproj/Localizable.strings
@@ -1,6 +1,7 @@
 // Messages for Bengali (বাংলা)
 // Exported from translatewiki.net
 // Author: Aftab1995
+// Author: Aftabuzzaman
 // Author: Tauhid16
 
 article-languages-label = ভাষা নির্বাচন করুন;
diff --git a/wikipedia/bn.lproj/Main_iPhone.strings 
b/wikipedia/bn.lproj/Main_iPhone.strings
index b4f9ce3..eda32ba 100644
--- a/wikipedia/bn.lproj/Main_iPhone.strings
+++ b/wikipedia/bn.lproj/Main_iPhone.strings
@@ -1,6 +1,7 @@
 // Messages for Bengali (বাংলা)
 // Exported from translatewiki.net
 // Author: Aftab1995
+// Author: Aftabuzzaman
 
 21c-U6-yfo.normalTitle = আরেকটি ক্যাপচা দেখান;
 5cT-2Y-0Ie.placeholder = ব্যবহারকারী নাম;
diff --git a/wikipedia/ka.lproj/InfoPlist.strings 
b/wikipedia/ka.lproj/InfoPlist.strings
new file mode 100644
index 000..2e01486
--- /dev/null
+++ b/wikipedia/ka.lproj/InfoPlist.strings
@@ -0,0 +1,5 @@
+// Messages for Georgian (ქართული)
+// Exported from translatewiki.net
+// Author: MIKHEIL
+
+CFBundleDisplayName = ვიკიპედია;
diff --git a/wikipedia/ka.lproj/Localizable.strings 
b/wikipedia/ka.lproj/Localizable.strings
index 0d2192b..860f3f1 100644
--- a/wikipedia/ka.lproj/Localizable.strings
+++ b/wikipedia/ka.lproj/Localizable.strings
@@ -7,30 +7,49 @@
 article-languages-cancel = გაუქმება;
 article-languages-downloading = სტატიის ენები იტვირთება...;
 article-languages-filter-placeholder = ენის ფილტრი;
+language-button-text = ამ სტატიის წაკითხვა შეგიძლიათ % სხვა ენებზე;
 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-charged-verbiage = ვიკიპედია ზერო გამორთულია;
+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-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 = არ გაქვს ანგარიში? შეუერთდი ვიკიპედიას.;
 login-username-placeholder-text = მომხმარებლის სახელი;
 login-password-placeholder-text = პაროლი;
 wikitext-downloading = შიგთავსი იტვირთება…;
+wikitext-download-failed = უახლესი ვერსიის ხილვა

[MediaWiki-commits] [Gerrit] Manual import of Android string translations from TWN - change (apps...wikipedia)

2014-12-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179971

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: Icf737841dacc0c0cb5204a18d401695aa77e564f
---
M wikipedia/res/values-bn/strings.xml
M wikipedia/res/values-br/strings.xml
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-ce/strings.xml
M wikipedia/res/values-da/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-el/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fa/strings.xml
M wikipedia/res/values-fi/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-id/strings.xml
M wikipedia/res/values-it/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-ka/strings.xml
M wikipedia/res/values-km/strings.xml
M wikipedia/res/values-ko/strings.xml
M wikipedia/res/values-kw/strings.xml
M wikipedia/res/values-ky/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-lt/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-mr/strings.xml
M wikipedia/res/values-ms/strings.xml
M wikipedia/res/values-my/strings.xml
M wikipedia/res/values-nb/strings.xml
M wikipedia/res/values-nl/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-ta/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-uz/strings.xml
M wikipedia/res/values-vi/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
40 files changed, 176 insertions(+), 102 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/71/179971/1

diff --git a/wikipedia/res/values-bn/strings.xml 
b/wikipedia/res/values-bn/strings.xml
index ee3016a..2934f46 100644
--- a/wikipedia/res/values-bn/strings.xml
+++ b/wikipedia/res/values-bn/strings.xml
@@ -239,4 +239,7 @@
   string name=toc_know_itবুঝেছি/string
   string name=alpha_update_notification_titleনতুন আলফা হালনাগাদ 
উপলব্ধ/string
   string name=alpha_update_notification_textডাউনলোড করতে টোকা দিন/string
+  string name=gallery_menu_more_infoআরও তথ্য/string
+  string name=gallery_license_text fuzzy=trueলাইসেন্স: %s/string
+  string name=gallery_credit_text fuzzy=trueকৃতিত্ব: %s/string
 /resources
diff --git a/wikipedia/res/values-br/strings.xml 
b/wikipedia/res/values-br/strings.xml
index 54a5d12..c6adad1 100644
--- a/wikipedia/res/values-br/strings.xml
+++ b/wikipedia/res/values-br/strings.xml
@@ -245,8 +245,6 @@
   string name=search_recent_headerEnklaskoù nevez :/string
   string name=button_clear_all_recent_searchesdiverkañ an enklaskoù 
nevez/string
   string name=clear_recent_searches_confirmHa sur eo ho peus c\'hoant da 
ziverkañ roll-istor  hoc\'h enklaskoù ?/string
-  string name=search_titles_buttonTitloù/string
-  string name=search_full_buttonEr pennadoù/string
   string name=toc_hintTorchañ war-zu an tu kleiz evit ar rannskridoù, pe 
implijout bouton al lañser e krec\'h a-zehoù./string
   string name=toc_know_itMat eo/string
   string name=error_browser_not_foundNe c\'haller ket digeriñ ar bajenn 
web (n\'eus bet kavet arload  merdeer)/string
diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index 1bf378b..b5a8918 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -76,7 +76,7 @@
   string name=dialog_message_edit_failedL\'edició no s\'ha desat!/string
   string name=dialog_message_edit_failed_retryReintenta/string
   string name=dialog_message_edit_failed_cancelCancel·la/string
-  string name=dialog_message_leaving_edit fuzzy=true«Els canvis no 
s\'han desat encara. Esteu segur que voleu sortir d\'aquesta pàgina?»/string
+  string name=dialog_message_leaving_editEls canvis no s\'han desat 
encara. Esteu segur que voleu sortir d\'aquesta pàgina?/string
   string name=dialog_message_leaving_edit_leaveSurt/string
   string name=dialog_message_leaving_edit_stayRoman/string
   string name=menu_show_tocTaula de continguts/string
@@ -245,8 +245,6 @@
   string name=search_recent_headerCerques recents:/string
   string name=button_clear_all_recent_searchesEsborra les cerques 
recents/string
   string name=clear_recent_searches_confirmEsteu segur que voleu esborrar 
l\'historial de cerca?/string
-  string name=search_titles_buttonTítols/string
-  string name=search_full_buttonDins d\'articles/string
   string name=toc_hintFeu lliscar el dit cap a l\'esquerra per a les 
seccions, o utilitzeu el botó de menú a la part superior dreta./string
   string name=toc_know_itHo he entès/string
   string name=error_browser_not_foundNo s\'ha pogut obrir

[MediaWiki-commits] [Gerrit] Fix test compilation - change (apps...wikipedia)

2014-12-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/179973

Change subject: Fix test compilation
..

Fix test compilation

Change-Id: I266d256f131ed0c19fe61bbfb6d3a2da333a5ba7
---
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/73/179973/1

diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
index bb8d4da..f2cf666 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
@@ -21,7 +21,7 @@
 sections.add(new Section(i, 1, Something  + i, Something_ + i, 
Content Something + i));
 }
 PageTitle title = new PageTitle(null, Test, new 
Site(en.wikipedia.org));
-PageProperties props = new PageProperties(2001-02-03T04:00:00Z, 
Test, null, true, true, null);
+PageProperties props = new PageProperties(2001-02-03T04:00:00Z, 
Test, null, true, true, null, null);
 Page page = new Page(title, sections, props);
 assertEquals(page, new Page(page.toJSON()));
 }
diff --git a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
index a5ccdca..6d830f6 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
@@ -51,7 +51,7 @@
 sections.add(new Section(i, 1, Something  + i, Something_ + i, 
Content Something + i));
 }
 PageTitle title = new PageTitle(null, Test, new 
Site(en.wikipedia.org));
-PageProperties props = new PageProperties(, Something, 
autoconfirmed, false, false, null);
+PageProperties props = new PageProperties(, Something, 
autoconfirmed, false, false, null, null);
 parcelAndTestObjects(title);
 parcelAndTestObjects(props);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/179973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I266d256f131ed0c19fe61bbfb6d3a2da333a5ba7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tweak styling of collapsed infoboxes. - change (mediawiki...MobileApp)

2014-12-16 Thread BearND (Code Review)

BearND has submitted this change and it was merged.

Change subject: Tweak styling of collapsed infoboxes.
..


Tweak styling of collapsed infoboxes.

Also removed some unused stuff.

Change-Id: Id8b883fb4947be45dc65d5f8c81fa83591b00a52
---
M images/table_collapse.png
M images/table_expand.png
M styles/android.less
M styles/night.less
M styles/tables.less
5 files changed, 12 insertions(+), 28 deletions(-)

Approvals:
  BearND: Verified; Looks good to me, approved



diff --git a/images/table_collapse.png b/images/table_collapse.png
index cdf731a..86f59ee 100644
--- a/images/table_collapse.png
+++ b/images/table_collapse.png
Binary files differ
diff --git a/images/table_expand.png b/images/table_expand.png
index cdda8ea..f94b525 100644
--- a/images/table_expand.png
+++ b/images/table_expand.png
Binary files differ
diff --git a/styles/android.less b/styles/android.less
index 431f6e6..cc027a5 100644
--- a/styles/android.less
+++ b/styles/android.less
@@ -1,7 +1,3 @@
-body {
-   padding-top: 48px;
-}
-
 /* Loading animation in pure CSS
Thanks to http://dabblet.com/gist/7708654 */
 .loading {
@@ -24,14 +20,4 @@
 margin: 8px auto;
 height: 24px;
 width: 24px;
-}
-
-/* Last updated info */
-#attribution {
-  border-top: 1px solid #ccc;
-  padding: 8px;
-  text-align: center;
-  color: #888;
-  font-size: 80%;
-  clear: both;
 }
diff --git a/styles/night.less b/styles/night.less
index 49c603c..09f64ba 100644
--- a/styles/night.less
+++ b/styles/night.less
@@ -28,8 +28,11 @@
 background: #000;
 }
 
+.app_table_container {
+box-shadow: 0px 1px 4px 4px rgba(128,128,128,.12);
+}
+
 .app_table_collapsed_container {
-border: solid 1px #505050;
 background-color: #202020;
 }
 
@@ -38,6 +41,5 @@
 }
 
 .app_table_collapsed_bottom {
-border: solid 1px #505050;
 background-color: #202020;
 }
diff --git a/styles/tables.less b/styles/tables.less
index 17ada49..21de7a0 100644
--- a/styles/tables.less
+++ b/styles/tables.less
@@ -1,34 +1,33 @@
 
 .app_table_container {
-display: inline;
 width: 100%;
+margin-top: 14px;
+margin-bottom: 14px;
+border-radius: 2px 2px 2px 2px;
+box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.12), 0px 1px 5px 0px 
rgba(0,0,0,0.24);
 }
 
 .app_table_collapsed_container {
 width: 100%;
-margin-top: 10px;
 padding-left: 12px;
 padding-right: 48px;
 padding-top: 12px;
 padding-bottom: 12px;
-line-height: 100%;
-border: solid 1px #b0b0b0;
+line-height: 120%;
 background-color: #f0f0f0;
 background-repeat: no-repeat;
 background-position: 95% 50%;
-background-size: 20px 20px;
+background-size: 16px 16px;
 }
 
 .app_table_collapsed_open {
 border-radius: 2px 2px 2px 2px;
-margin-bottom: 10px;
 /* @embed */
 background-image: url( '../images/table_expand.png' );
 }
 
 .app_table_collapse_close {
 border-radius: 2px 2px 0px 0px;
-margin-bottom: 0px;
 }
 
 .app_table_collapse_icon {
@@ -43,17 +42,14 @@
 .app_table_collapsed_bottom {
 width: 100%;
 color: #808080;
-margin-top: 0px;
-margin-bottom: 10px;
 padding-left: 12px;
 padding-right: 48px;
 padding-top: 12px;
 padding-bottom: 12px;
-line-height: 100%;
-border: solid 1px #b0b0b0;
+line-height: 120%;
 border-radius: 0px 0px 2px 2px;
 background-color: #f0f0f0;
 background-repeat: no-repeat;
 background-position: 95% 50%;
-background-size: 20px 20px;
+background-size: 16px 16px;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/179919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8b883fb4947be45dc65d5f8c81fa83591b00a52
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@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 NPE in LeadImagesHandler.beginLayout - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180321

Change subject: Fix NPE in LeadImagesHandler.beginLayout
..

Fix NPE in LeadImagesHandler.beginLayout

Bug: T78501
Change-Id: Idc1b027ceca932bf83b8a3ec3760937bca5caf55
---
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
1 file changed, 22 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/21/180321/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index b84a469..263d04b 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -29,7 +29,10 @@
 import org.wikipedia.ViewAnimations;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.bridge.CommunicationBridge;
+import org.wikipedia.page.Page;
+import org.wikipedia.page.PageProperties;
 import org.wikipedia.page.PageViewFragment;
+import org.wikipedia.page.PageViewFragmentInternal;
 import org.wikipedia.views.ObservableWebView;
 import org.wikipedia.wikidata.WikidataCache;
 
@@ -262,7 +265,7 @@
  * @param listener Listener that will receive an event when the layout is 
completed.
  */
 public void beginLayout(OnLeadImageLayoutListener listener) {
-String thumbUrl = 
parentFragment.getFragment().getPage().getPageProperties().getLeadImageUrl();
+String thumbUrl = getLeadImageUrl();
 
 if (!WikipediaApp.getInstance().showImages() || displayHeight  
MIN_SCREEN_HEIGHT_DP
 || WikipediaApp.getInstance().getReleaseType() == 
WikipediaApp.RELEASE_PROD) {
@@ -281,6 +284,23 @@
 // kick off the (asynchronous) laying out of the page title text
 
layoutPageTitle((int)(parentFragment.getResources().getDimension(R.dimen.titleTextSize)
 / displayDensity), listener);
+}
+
+// NPE, you shall not pass: https://phabricator.wikimedia.org/T78501
+private String getLeadImageUrl() {
+final PageViewFragmentInternal internalFragment = 
parentFragment.getFragment();
+if (internalFragment == null) {
+return null;
+}
+final Page page = internalFragment.getPage();
+if (page == null) {
+return null;
+}
+final PageProperties pageProperties = page.getPageProperties();
+if (pageProperties == null) {
+return null;
+}
+return pageProperties.getLeadImageUrl();
 }
 
 /**
@@ -435,7 +455,7 @@
 bridge.sendMessage(setPaddingTop, payload);
 
 // and start fetching the lead image, if we have one
-String thumbUrl = 
parentFragment.getFragment().getPage().getPageProperties().getLeadImageUrl();
+String thumbUrl = getLeadImageUrl();
 if (!isMainPage  thumbUrl != null  leadImagesEnabled) {
 thumbUrl = WikipediaApp.getInstance().getNetworkProtocol() + : + 
thumbUrl;
 Picasso.with(parentFragment.getActivity())

-- 
To view, visit https://gerrit.wikimedia.org/r/180321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc1b027ceca932bf83b8a3ec3760937bca5caf55
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] More space between wordmark and slogan - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180350

Change subject: More space between wordmark and slogan
..

More space between wordmark and slogan

Also, better wordmark alignment in OnboardingActivity for Hebrew

Bug: T78350
Change-Id: Ic69e2f1632f56fd8daef677c9a76adc6d683a587
---
M wikipedia/res/layout/group_onboarding1.xml
M wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
2 files changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/50/180350/1

diff --git a/wikipedia/res/layout/group_onboarding1.xml 
b/wikipedia/res/layout/group_onboarding1.xml
index 95125cb..152c6b6 100644
--- a/wikipedia/res/layout/group_onboarding1.xml
+++ b/wikipedia/res/layout/group_onboarding1.xml
@@ -17,8 +17,8 @@
 android:layout_width=@dimen/onboarding_wp_globe
 android:layout_height=wrap_content
 android:layout_gravity=center_horizontal
-android:layout_marginTop=-12dp
-android:layout_marginBottom=-12dp
+android:layout_marginTop=-8dp
+android:layout_marginBottom=-8dp
 android:contentDescription=@string/app_name
 android:scaleType=fitCenter
 android:src=@drawable/wp_wordmark /
@@ -28,8 +28,8 @@
 android:layout_width=wrap_content
 android:layout_height=wrap_content
 android:layout_gravity=center_horizontal
-android:layout_marginTop=-12dp
-android:layout_marginBottom=-12dp
+android:layout_marginTop=-8dp
+android:layout_marginBottom=-4dp
 android:text=@string/app_name
 android:textSize=@dimen/onboarding_wp_logo_text
 android:textAllCaps=true
diff --git 
a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java 
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
index a60fd33..44fd93b 100644
--- a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
@@ -17,6 +17,8 @@
 import org.wikipedia.login.LoginActivity;
 import org.wikipedia.settings.PrefKeys;
 
+import java.util.Locale;
+
 /**
  * Onboarding screen, which shows up the first time this app is started unless 
the user is already logged in.
  * From there you can create an account, login, or skip to the main activity.
@@ -49,6 +51,11 @@
 } else {
 wikipediaWordMarkImage.setVisibility(View.GONE);
 
wikipediaWordMarkText.setText(Html.fromHtml(getString(R.string.wp_stylized)));
+if (iw.equals(Locale.getDefault().getLanguage())) {
+final float dp = WikipediaApp.getInstance().getScreenDensity();
+// move wordmark a bit to the right so it lines up better with 
the slogan
+wikipediaWordMarkText.setPadding((int) (10 * dp), 0, 0, 0);
+}
 }
 
 createAccountButton.setOnClickListener(new View.OnClickListener() {

-- 
To view, visit https://gerrit.wikimedia.org/r/180350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic69e2f1632f56fd8daef677c9a76adc6d683a587
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WIP: Long click action on link: save page - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180372

Change subject: WIP: Long click action on link: save page
..

WIP: Long click action on link: save page

TODO:
[] handle more link types (like external links)
[] thumbnail of newly saved page is not showing up

Change-Id: I68d2616e4ed104a43636b053d3f2cafb14c2ef4b
---
M wikipedia/res/values-qq/strings.xml
R wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPageTask.java
R wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPagesHandler.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
M wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
5 files changed, 131 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/72/180372/1

diff --git a/wikipedia/res/values-qq/strings.xml 
b/wikipedia/res/values-qq/strings.xml
index 66fb2fe..048fd90 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -39,7 +39,7 @@
 {{Identical|Update saved page}}/string
   string name=dialog_prompt_refresh_all_saved_pagesPrompt before updating 
all saved pages/string
   string name=toast_saved_page_refreshedSmall toast (popup) message saying 
that all saved pages were updated/string
-  string name=menu_save_pageMenu item text for saving the currently active 
page.
+  string name=menu_save_pageMenu item text for saving the currently active 
or a linked page.
 {{Identical|Save page}}/string
   string name=menu_share_pageMenu item text for sharing the currently 
active page. Uses the build-in Android sharing functionality, so translate it 
the same way as the operating system does.
 {{Identical|Share}}/string
diff --git 
a/wikipedia/src/main/java/org/wikipedia/savedpages/RefreshSavedPageTask.java 
b/wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPageTask.java
similarity index 75%
rename from 
wikipedia/src/main/java/org/wikipedia/savedpages/RefreshSavedPageTask.java
rename to 
wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPageTask.java
index bfd0e56..9177f93 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/RefreshSavedPageTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPageTask.java
@@ -7,6 +7,7 @@
 import org.mediawiki.api.json.Api;
 import org.mediawiki.api.json.ApiResult;
 import org.mediawiki.api.json.RequestBuilder;
+import org.wikipedia.PageTitle;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.page.Page;
 import org.wikipedia.page.PageProperties;
@@ -17,18 +18,19 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-public class RefreshSavedPageTask extends SectionsFetchTask {
-private final SavedPage savedPage;
+/**
+ * A task to save a page we're not currently on.
+ * It gets the page content of the other page and then uses {@link 
SavePageTask} to save it.
+ */
+public class SaveOtherPageTask extends SectionsFetchTask {
+private final PageTitle pageTitle;
 private final WikipediaApp app;
 
-private PageProperties pageProperties;
-
-public RefreshSavedPageTask(Context context, SavedPage savedPage) {
-super(context, savedPage.getTitle(), all);
-this.savedPage = savedPage;
+public SaveOtherPageTask(Context context, PageTitle pageTitle) {
+super(context, pageTitle, all);
+this.pageTitle = pageTitle;
 this.app = WikipediaApp.getInstance();
 }
-
 
 @Override
 public RequestBuilder buildRequest(Api api) {
@@ -42,9 +44,9 @@
 public ListSection processResult(ApiResult result) throws Throwable {
 JSONObject mobileView = result.asObject().optJSONObject(mobileview);
 if (mobileView != null) {
-pageProperties = PageProperties.parseJSON(mobileView);
+PageProperties pageProperties = 
PageProperties.parseJSON(mobileView);
 ListSection sections = super.processResult(result);
-final Page page = new Page(savedPage.getTitle(), 
(ArrayListSection) sections, pageProperties);
+final Page page = new Page(pageTitle, (ArrayListSection) 
sections, pageProperties);
 final CountDownLatch savePagesLatch = new CountDownLatch(1);
 new Handler(Looper.getMainLooper()).post(new Runnable() {
 @Override
diff --git 
a/wikipedia/src/main/java/org/wikipedia/savedpages/RefreshPagesHandler.java 
b/wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPagesHandler.java
similarity index 71%
rename from 
wikipedia/src/main/java/org/wikipedia/savedpages/RefreshPagesHandler.java
rename to 
wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPagesHandler.java
index 8b97814..dfcb04a 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/RefreshPagesHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/savedpages/SaveOtherPagesHandler.java
@@ -6,15 +6,17 @@
 import

[MediaWiki-commits] [Gerrit] Read More only for regular pages - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180382

Change subject: Read More only for regular pages
..

Read More only for regular pages

Don't add a ToC entry and don't even try to request
one from the server for main, file and special pages.

Change-Id: Ia47c8131facf38469368c6a7f9fea980e8ad25a2
---
M wikipedia/src/main/java/org/wikipedia/page/Page.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M 
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
3 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/82/180382/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java 
b/wikipedia/src/main/java/org/wikipedia/page/Page.java
index 1e4e696..bc911bf 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/Page.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java
@@ -42,6 +42,12 @@
 return pageProperties;
 }
 
+public boolean couldHaveReadMoreSection() {
+return !getPageProperties().isMainPage()
+ !getTitle().isFilePage()
+ !getTitle().isSpecial();
+}
+
 @Override
 public boolean equals(Object o) {
 if (!(o instanceof Page)) {
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index be09ea0..2122a4a 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -225,7 +225,7 @@
 sections.add(s);
 }
 }
-if (!page.getPageProperties().isMainPage()) {
+if (page.couldHaveReadMoreSection()) {
 // add a fake section at the end to represent the read more 
contents at the bottom:
 sections.add(new Section(READ_MORE_SECTION_ID, 0,
 parentActivity.getString(R.string.read_more_section), 
, ));
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
 
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 0d56c08..97076b5 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -193,11 +193,11 @@
 
 public void beginLayout() {
 setupAttribution();
-if 
(parentFragment.getFragment().getPage().getPageProperties().isMainPage()) {
+if (parentFragment.getFragment().getPage().couldHaveReadMoreSection()) 
{
+requestReadMoreItems(activity.getLayoutInflater());
+} else {
 
bottomContentContainer.findViewById(R.id.read_more_container).setVisibility(View.GONE);
 layoutContent();
-} else {
-requestReadMoreItems(activity.getLayoutInflater());
 }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/180382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia47c8131facf38469368c6a7f9fea980e8ad25a2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Back button goes back to calling activity if on first page - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180400

Change subject: Back button goes back to calling activity if on first page
..

Back button goes back to calling activity if on first page

The problem was that it opened the ToC drawer automatically.

Bug: T75918
Change-Id: Ia822b3e7beb73a80d15be690cb9dcd90546481f4
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
2 files changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/00/180400/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 4c37581..eb3efc8 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -435,13 +435,19 @@
 tocHandler = new ToCHandler(getActivity(),
 tocDrawer,
 bridge,
-title.getSite());
+title.getSite(),
+isFirstPage());
 }
 
 setState(state);
 performActionForState(state);
 }
 
+private boolean isFirstPage() {
+return parentFragment.getFragmentManager().getBackStackEntryCount() == 0
+ !webView.canGoBack();
+}
+
 /**
  * Update the WebView's base font size, based on the specified font size 
from the app preferences.
  */
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index be09ea0..e14f6ef 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -42,6 +42,11 @@
 private final ActionBarActivity parentActivity;
 
 /**
+ * We don't want to open the ToC drawer on the first page loaded 
automatically
+ * so the back button sends users back to the previous activity.
+ */
+private final boolean firstPage;
+/**
  * Flag to track if the drawer is closing because a link was clicked.
  * Used to make sure that we don't track closes that are caused by
  * the user clicking on a section.
@@ -50,10 +55,11 @@
 private boolean openedViaSwipe = true;
 
 public ToCHandler(final ActionBarActivity activity, final 
DisableableDrawerLayout slidingPane,
-  final CommunicationBridge bridge, final Site site) {
+  final CommunicationBridge bridge, final Site site, 
boolean firstPage) {
 this.parentActivity = activity;
 this.bridge = bridge;
 this.slidingPane = slidingPane;
+this.firstPage = firstPage;
 
 funnel = new 
ToCInteractionFunnel((WikipediaApp)slidingPane.getContext().getApplicationContext(),
 site);
 
@@ -190,7 +196,7 @@
 }
 });
 
-if (!page.getPageProperties().isMainPage()) {
+if (!page.getPageProperties().isMainPage()  !firstPage) {
 final SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(parentActivity);
 final boolean knowsToC = 
prefs.getBoolean(PrefKeys.getKnowTocDrawer(), false);
 if (!knowsToC) {

-- 
To view, visit https://gerrit.wikimedia.org/r/180400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia822b3e7beb73a80d15be690cb9dcd90546481f4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Back button goes back to calling activity from onboarding ac... - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180401

Change subject: Back button goes back to calling activity from onboarding 
activity
..

Back button goes back to calling activity from onboarding activity

Change-Id: I13695441c202dfcecfee462599fc70ae1fa9eb37
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/01/180401/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index f575abd..ac6ee9c 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -65,6 +65,7 @@
 public static final int ACTIVITY_REQUEST_LANGLINKS = 0;
 public static final int ACTIVITY_REQUEST_EDIT_SECTION = 1;
 public static final int ACTIVITY_REQUEST_GALLERY = 2;
+public static final int ACTIVITY_REQUEST_ONBOARDING = 3;
 
 private Bus bus;
 private WikipediaApp app;
@@ -237,7 +238,8 @@
 new RecurringTasksExecutor(this).run();
 
 if (showOnboarding()) {
-startActivity(new Intent(this, OnboardingActivity.class));
+startActivityForResult(new Intent(this, OnboardingActivity.class),
+ACTIVITY_REQUEST_ONBOARDING);
 }
 }
 
@@ -711,6 +713,8 @@
 handleIntent(data);
 }
 });
+} else if (requestCode == ACTIVITY_REQUEST_ONBOARDING) {
+finish();
 } else {
 super.onActivityResult(requestCode, resultCode, data);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/180401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13695441c202dfcecfee462599fc70ae1fa9eb37
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 Android string translations from TWN - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180545

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: I6407ce9c551ec0bc7f0f01a187c6f2d6cf4c3291
---
M wikipedia/res/values-ce/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-id/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-zh/strings.xml
13 files changed, 80 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/45/180545/1

diff --git a/wikipedia/res/values-ce/strings.xml 
b/wikipedia/res/values-ce/strings.xml
index 62e33dd..72eda5c 100644
--- a/wikipedia/res/values-ce/strings.xml
+++ b/wikipedia/res/values-ce/strings.xml
@@ -133,4 +133,10 @@
   string name=toc_know_itКхетий/string
   string name=table_closeДӀачӀагӀа/string
   string name=dialog_close_descriptionДӀачӀагӀа/string
+  string name=gallery_menu_more_infoКхин тӀе хаам/string
+  string name=menu_gallery_visit_pageФайлан агӀонг гӀо/string
+  string name=gallery_error_draw_failedСурт гучудаккха цаделира/string
+  string name=license_titleЛицензин йоза %s библиотекина/string
+  string name=gallery_license_textЛицензи – %s/string
+  string name=gallery_credit_textАвтор – %s/string
 /resources
diff --git a/wikipedia/res/values-es/strings.xml 
b/wikipedia/res/values-es/strings.xml
index 6d0c945..ed6df36 100644
--- a/wikipedia/res/values-es/strings.xml
+++ b/wikipedia/res/values-es/strings.xml
@@ -76,7 +76,7 @@
   string name=dialog_message_edit_failed¡Error de edición!/string
   string name=dialog_message_edit_failed_retryReintentar/string
   string name=dialog_message_edit_failed_cancelCancelar/string
-  string name=dialog_message_leaving_edit fuzzy=true\Los cambios no se 
han guardado aún. ¿Estás seguro de que quieres salir de esta página?\/string
+  string name=dialog_message_leaving_editLos cambios no se han guardado 
aún. ¿Estás seguro de que quieres salir de esta página?/string
   string name=dialog_message_leaving_edit_leaveSalir/string
   string name=dialog_message_leaving_edit_stayPermanecer/string
   string name=menu_show_tocTabla de contenidos/string
@@ -266,4 +266,12 @@
   string name=alpha_update_notification_titleHay una actualización alfa 
disponible/string
   string name=alpha_update_notification_textToca para descargar/string
   string name=dialog_close_descriptionCerrar/string
+  string name=preference_title_show_imagesMostrar imágenes/string
+  string name=read_more_sectionLeer más/string
+  string name=gallery_menu_more_infoMás información/string
+  string name=gallery_error_draw_failedNo se pudo dibujar la 
imagen./string
+  string name=license_titleTexto de la licencia de la biblioteca 
%s/string
+  string name=gallery_license_textLicencia – %s/string
+  string name=gallery_credit_textAutor - %s/string
+  string name=gallery_image_infoInformación de la imagen/string
 /resources
diff --git a/wikipedia/res/values-he/strings.xml 
b/wikipedia/res/values-he/strings.xml
index cc3c40a..3291ede 100644
--- a/wikipedia/res/values-he/strings.xml
+++ b/wikipedia/res/values-he/strings.xml
@@ -272,6 +272,7 @@
   string name=menu_gallery_visit_pageללכת לדף הקובץ/string
   string name=gallery_error_draw_failedלא היה אפשר לצייר את 
התמונה./string
   string name=license_titleטקסט הרישיון עבור הספרייה %s/string
-  string name=gallery_license_text fuzzy=trueרישיון: %s/string
-  string name=gallery_credit_text fuzzy=trueמאת: %s/string
+  string name=gallery_license_textרישיון – %s/string
+  string name=gallery_credit_textמאת – %s/string
+  string name=gallery_image_infoמידע על התמונה/string
 /resources
diff --git a/wikipedia/res/values-id/strings.xml 
b/wikipedia/res/values-id/strings.xml
index 7d8074d..23cfded 100644
--- a/wikipedia/res/values-id/strings.xml
+++ b/wikipedia/res/values-id/strings.xml
@@ -76,6 +76,9 @@
   string name=dialog_message_edit_failedPenyuntingan gagal!/string
   string name=dialog_message_edit_failed_retryCoba lagi/string
   string name=dialog_message_edit_failed_cancelBatal/string
+  string name=dialog_message_leaving_editPerubahan anda belum disimpan. 
Anda yakin ingin meninggalkan halaman ini?/string
+  string name=dialog_message_leaving_edit_leaveTinggalkan/string
+  string name=dialog_message_leaving_edit_stayTetap/string
   string name=menu_show_tocDaftar isi/string
   string name=search_no_results_foundTidak ada hasil yang 
ditemukan/string
   string name=edit_section_captcha_messageUntuk membantu melindungi 
terhadap spam otomatis, masukkan kata-kata yang muncul di bawah

[MediaWiki-commits] [Gerrit] Missing qq string - change (apps...wikipedia)

2014-11-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172896

Change subject: Missing qq string
..

Missing qq string

Change-Id: I307ed850f25900ec1dc3f4f4fac2ada9d86dcf77
---
M wikipedia/res/values-qq/strings.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/96/172896/1

diff --git a/wikipedia/res/values-qq/strings.xml 
b/wikipedia/res/values-qq/strings.xml
index 54f1e9f..158eb04 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -339,7 +339,7 @@
   string name=search_full_buttonButton label for searching the full text 
of pages./string
   string name=toc_hintInstructions how to open the Table of Contents 
drawer. In left-to-right languages (most) this means to swipe left from the 
right edge. In right-to-left languages (Hebrew, Arabic, etc.) this means to 
swipe right from the left edge. \'\'\'In RTL languages\'\'\' please adjust the 
text to say right swipe instead of left swipe./string
   string name=toc_know_itButton text to acknowledge instructions for 
opening Table of Contents drawer./string
-  string name=error_browser_not_found/
+  string name=error_browser_not_foundToast message shown when we try to 
open an external browser but none seems to be installed./string
   string name=app_store_descriptionDescription of the app as put up on the 
Google Play Store/string
   string name=alpha_update_notification_titleTitle for notification when 
new alpha update is available.
   string name=table_infoboxTitle displayed in a collapsed infobox 
table./string

-- 
To view, visit https://gerrit.wikimedia.org/r/172896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I307ed850f25900ec1dc3f4f4fac2ada9d86dcf77
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Change Other meanings string back to Similar pages - change (apps...wikipedia)

2014-11-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172907

Change subject: Change Other meanings string back to Similar pages
..

Change Other meanings string back to Similar pages

Change-Id: I3deb60e3390a35b35100c3ac647a1cd77222e00d
---
M wikipedia/res/values/strings.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/07/172907/1

diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 90667b4..f2b43db 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -239,7 +239,7 @@
 string name=color_theme_selectTheme/string
 string name=color_theme_lightLight/string
 string name=color_theme_darkDark/string
-string name=page_similar_titlesOther meanings/string
+string name=page_similar_titlesSimilar pages/string
 string name=search_within_pagesSearch within pages…/string
 string name=search_no_resultsNo results found for \%s\./string
 string name=search_did_you_meanDid you mean \%s\?/string

-- 
To view, visit https://gerrit.wikimedia.org/r/172907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3deb60e3390a35b35100c3ac647a1cd77222e00d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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)

2014-11-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172908

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: I293daf88f73482834f5a3225d9e45f1df5d4c643
---
M wikipedia/ca.lproj/Localizable.strings
M wikipedia/ca.lproj/Main_iPhone.strings
M wikipedia/lb.lproj/Localizable.strings
A wikipedia/my.lproj/Main_iPhone.strings
M wikipedia/qqq.lproj/Localizable.strings
M wikipedia/sk.lproj/Localizable.strings
M wikipedia/tr.lproj/Localizable.strings
M wikipedia/vi.lproj/Localizable.strings
M wikipedia/zh-hans.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Main_iPhone.strings
11 files changed, 102 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/08/172908/1

diff --git a/wikipedia/ca.lproj/Localizable.strings 
b/wikipedia/ca.lproj/Localizable.strings
index 8cc72a5..47a3741 100644
--- a/wikipedia/ca.lproj/Localizable.strings
+++ b/wikipedia/ca.lproj/Localizable.strings
@@ -1,5 +1,6 @@
 // Messages for Catalan (català)
 // Exported from translatewiki.net
+// Author: Alvaro Vidal-Abarca
 // Author: Fitoschido
 // Author: Gerardduenas
 // Author: SMP
@@ -15,20 +16,19 @@
 history-section-yesterday = Ahir;
 history-section-lastweek = Darrera setmana;
 history-section-lastmonth = Darrer mes;
+history-clear-confirmation-heading = Eliminar els elements recents?;
 history-clear-confirmation-sub-heading = No es pot desfer l'acció!;
 history-clear-cancel = Cancel·la;
+history-clear-delete-all = Esborra tot;
 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);
+zero-charged-verbiage = Viquipèdia Zero DESACTIVAT;
+zero-charged-verbiage-extended = La càrrega d'articles pot comportar en 
costos de dades. Els articles emmagatzemats fora de línia no utilitzen les 
dades i són gratuïts.;
 zero-webpage-url = 
https://wikimediafoundation.org/wiki/Wikipedia_Zero_App_FAQ;;
 zero-interstitial-title = Sortida de Wikipedia Zero;
-// Fuzzy
-zero-interstitial-leave-app = Desitja continuar? Està sortint de 
l'aplicaió, es podrien carregar cobrar addicionals;
-// Fuzzy
-zero-interstitial-continue = Continuar;
+zero-interstitial-leave-app = Poden aplicar-se costos de dades. Voleu 
continuar a un lloc extern?;
+zero-interstitial-continue = Deixa;
 zero-interstitial-cancel = Roman aquí;
-// Fuzzy
-zero-learn-more = Voleu saber més sobre la Viquipèdia Zero?;
+zero-learn-more = S'aplicaran costos de dades per a aquesta aplicació de la 
Viquipèdia.;
 zero-learn-more-learn-more = Més informació;
 zero-learn-more-no-thanks = Descarta;
 zero-wikipedia-zero-heading = Wikipedia Zero;
@@ -45,7 +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-illegal = Heu introduït un nom d'usuari invàlid.;
 login-name-does-not-exist = El nom d'usuari que heu proporcionat no 
existeix.;
+login-password-empty = És necessària la contrasenya per iniciar sessió.;
 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.;
@@ -57,10 +59,17 @@
 wikitext-download-success = S'ha carregat el contingut.;
 wikitext-preview-changes = S'està recuperant una vista prèvia dels 
canvis...;
 wikitext-preview-changes-none = No s'ha fet cap canvi per previsualitzar.;
+wikitext-upload-result-unknown = No s'ha pogut determinar el resultat de la 
càrrega del viquitext.;
+wikitext-upload-captcha-error = Error de verificació de CAPTCHA.;
+wikitext-upload-captcha-needed = Cal verificació de CAPTCHA.;
 wikitext-upload-save = S'està desant...;
 wikitext-upload-save-sign-in = Inicia una sessió;
+wikitext-upload-save-sign-in-benefits = Així, els co-editors poden 
connectar-se amb tu i podràs veure els articles que has editat.;
 wikitext-upload-save-anonymously = Desa anònimament;
+wikitext-upload-save-anonymously-warning = Les edicions seran atribuïdes a 
l'adreça IP del dispositiu. Si vostè span class=\notranslate\ 
traduir=\no\$1/span disposarà de més privadesa.;
+wikitext-upload-save-terms-and-license = Si deseu, accepteu els span 
class=\notranslate\ traduir=\no\$1/span, i accepteu també alliberar 
irrevocablement les vostres contribucions sota la llicència $2.;
 wikitext-upload-save-terms-name = Condicions d'ús;
+wikitext-upload-save-license-name = CC BY-SA 3.0;
 open-link-title = Obre l'enllaç;
 open-link-cancel = Cancel·la;
 search-searching = S'està cercant...;
@@ -89,14 +98,21 @@
 main-menu-send-feedback = Envieu un suggeriment

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

2014-11-12 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172920

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: Ib9c87c0c4fd6492c11c87b99a87cd9d383c6ad94
---
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-el/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-ka/strings.xml
M wikipedia/res/values-ko/strings.xml
M wikipedia/res/values-lb/strings.xml
A wikipedia/res/values-my/strings.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values-ta/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
12 files changed, 256 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/20/172920/1

diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index c59b2a5..ed45701 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -11,7 +11,7 @@
   string name=search_hintCerca a la Viquipèdia/string
   string name=history_activity_titleHistorial/string
   string name=nav_item_historyHistorial/string
-  string name=error_network_error fuzzy=trueNo s\'ha pogut connectar a 
la xarxa :(/string
+  string name=error_network_errorNo hi ha connexió a la xarxa :(/string
   string name=search_network_errorError de xarxa. Toca la pantalla per 
intentar-ho de nou./string
   string name=page_error_retryTornar a provar/string
   string name=menu_clear_all_historyNeteja l\'historial/string
@@ -43,14 +43,18 @@
   string name=nearby_activity_titleA prop/string
   string name=nav_item_nearbyA prop/string
   string name=menu_update_nearbyActualitza les properes/string
-  string name=nearby_empty_title fuzzy=trueNo hi ha cap pàgina 
propera/string
-  string name=nearby_empty_message fuzzy=truePodeu refrescar la pàgina 
quan us mogueu a una ubicació nova./string
+  string name=nearby_empty_titleCap pàgina propera des d\'aquí!/string
+  string name=nearby_empty_messageQuan us mogueu a una ubicació nova, 
proveu de refrescar la pàgina per saber què hi ha al voltant./string
   string name=nearby_distance_in_meters%d m/string
   string name=nearby_distance_in_kilometers%.2f km/string
+  string name=nearby_distance_in_feetlt;span class=\notranslate\ 
traduir=\no\gt;%dlt;/spangt;/string
+  string name=nearby_distance_in_miles%.2f mi/string
   string name=nearby_no_networkNo hi ha connexió a la xarxa/string
   string name=nearby_server_errorNo s\'ha pogut recuperar la llista de 
llocs propers./string
   string name=nearby_no_locationNo s\'ha pogut obtenir la ubicació/string
   string name=nearby_dialog_goto_settingsLes actualitzacions d\'ubicació 
no estan actives al vostre dispositiu. Voldríeu anar als paràmetres del 
dispositiu per tal d\'habilitar-les?/string
+  string name=nearby_set_metricMostra m/km/string
+  string name=nearby_set_imperialMostra peus/milles/string
   string name=last_updated_textÚltima actualització %1$s/string
   string name=content_license_htmlEl contingut està disponible sota 
llicència lt;a href=\//creativecommons.org/licenses/by-sa/3.0/\gt;CC BY-SA 
3.0lt;/agt; si no s\'indica el contrari/string
   string name=edit_save_action_license_logged_inEn desar accepteu les 
lt;a href=\https://wikimediafoundation.org/wiki/Terms_of_Use\gt;condicions 
d\'úslt;/agt; i que alliberareu irrevocablement les vostres contribucions 
sota la llicència lt;a 
href=\https://creativecommons.org/licenses/by-sa/3.0/\gt;CC BY-SA 
3.0lt;/agt;./string
@@ -103,6 +107,7 @@
   string name=saved_pages_empty_messageLes pàgines desades són 
fantàstiques. Penseu que són talment com adreces d\'interès que podeu llegir 
fins i tot sense connexió./string
   string name=history_empty_titleNo hi ha pàgines recents aquí./string
   string name=history_empty_messageProbablement les heu eliminat totes. La 
propera vegada que aneu a una pàgina podeu tornar-hi des d\'aquí./string
+  string name=delete_selected_historyEsborra/string
   string 
name=wp_stylizedlt;biggt;Vlt;/biggt;IQUIPÈDIlt;biggt;Alt;/biggt;/string
   string name=wp_tag_lineL\'enciclopèdia lliure/string
   string name=skipOmet/string
@@ -230,9 +235,17 @@
   string name=page_similar_titlesPàgines similars/string
   string name=search_within_pagesCerca dins les pàgines…/string
   string name=search_no_resultsNo s\'han trobat resultats de «%s»./string
+  string name=search_did_you_meanVoleu dir \lt;span 
class=\notranslate\ traduir=\no\gt;%slt;/spangt;\?/string
   string name=search_results_titleResultats de cerca/string
   string name=search_error_retryTorna a provar/string
   string name=search_redirect_titleRedirecció de «%s»./string
+  string name=search_recent_headerCerques recents:/string
+  string name=menu_clear_all_recent_searchesEsborra cerques 
recents/string
+  string

[MediaWiki-commits] [Gerrit] Fix translations and add more tests for them - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173092

Change subject: Fix translations and add more tests for them
..

Fix translations and add more tests for them

Checking now if there are HTML tags iff there are any in en.
Better failure output.

Change-Id: I3664c56cb6282b3b60b312b1f27e7d26f87f8d01
(cherry picked from commit fdb420ade518b886818381e71d170acc1c76318b)
---
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
M wikipedia/res/values-br/strings.xml
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-ky/strings.xml
M wikipedia/res/values-ms/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-uz/strings.xml
7 files changed, 174 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/92/173092/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index 2f42067..4e794a3 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -11,6 +11,9 @@
 import org.wikipedia.page.PageActivity;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -25,7 +28,7 @@
 public class TranslationTests extends 
ActivityInstrumentationTestCase2PageActivity {
 public static final String TAG = TrTest;
 private PageActivity activity;
-private StringBuilder paramMismatches = new StringBuilder();
+private StringBuilder mismatches = new StringBuilder();
 
 public TranslationTests() {
 super(PageActivity.class);
@@ -42,6 +45,13 @@
 }
 
 public void testAllTranslations() throws Exception {
+setLocale(Locale.ROOT.toString());
+ListRes tagRes = new ResourceCollector(, 
lt;).collectParameterResources();
+ListRes noTagRes = new ResourceCollector(, 
lt;).not().collectParameterResources();
+ListRes stringParamRes = new ResourceCollector(%s, 
%1$s).collectParameterResources();
+ListRes decimalParamRes = new ResourceCollector(%d, 
%1$d).collectParameterResources();
+ListRes floatParamRes = new ResourceCollector(%f, 
%.2f).collectParameterResources();
+
 AssetManager assetManager = 
getInstrumentation().getTargetContext().getResources().getAssets();
 for (String lang : assetManager.getLocales()) {
 Log.i(TAG, locale= + (lang.equals() ? DEFAULT : lang));
@@ -49,21 +59,55 @@
 //checkAllStrings(); // might take too long
 
 // commented out during the transition from 1 param to 0
-//
checkOneStringWith0Parameter(R.string.saved_pages_search_empty_message);
-//
checkOneStringWith0Parameter(R.string.history_search_empty_message);
+//
checkTranslationHasNoParameter(R.string.saved_pages_search_empty_message);
+//
checkTranslationHasNoParameter(R.string.history_search_empty_message);
 
 if (!lang.startsWith(qq)) {
-checkOneStringWithParameter(R.string.last_updated_text);
-if (!lang.startsWith(ak)  !lang.startsWith(el)) {
-// taking forever to get those fixed :(
-
checkOneStringWithParameter(R.string.editing_error_spamblacklist);
+// tag (html) parameters
+for (Res res : tagRes) {
+if (res.id == R.string.wp_stylized
+ (lang.startsWith(iw) || lang.startsWith(he))) {
+// exceptions of the rule
+continue;
+}
+expectContains(res, , lt;);
 }
-checkOneStringWithParameter(R.string.page_protected_other);
-checkOneStringWithParameter(R.string.search_redirect_title);
-// TODO: build a list of all parameterized string resources 
from default strings dynamically first
+
+for (Res res : noTagRes) {
+expectNotContains(res, , lt;);
+}
+
+// string parameters
+for (Res res : stringParamRes) {
+if (res.id == R.string.editing_error_spamblacklist
+ (lang.startsWith(ak) || lang.startsWith(el))) {
+// taking forever to get those fixed :(
+continue;
+}
+checkTranslationHasParameter(res, [stringParam], null);
+}
+
+if (lang.startsWith(fa) || lang.startsWith(ar) || 
lang.equals(bn)
+|| lang.equals(mr) || lang.equals(my) || 
lang.equals(ps)) {
+// don't check the number params since those languages 
have

[MediaWiki-commits] [Gerrit] Fix issue where some disambig items were not picked up - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173120

Change subject: Fix issue where some disambig items were not picked up
..

Fix issue where some disambig items were not picked up

This was due to an incorrect query selector used.
[[en:Test]]'s disambig link is not directly under the hatnote div.

Bug: 73393
Change-Id: I1aa2c91298bb88ac62f44882fc53323fc216c8ac
---
M wikipedia/assets/bundle.js
M wikipedia/assets/preview.js
M www/js/actions.js
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/20/173120/1

diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index b1c9e0a..e0fe866 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -106,7 +106,7 @@
 
 function collectDisambig( sourceNode ) {
 var res = [];
-var links = sourceNode.querySelectorAll( 'div.hatnote  a' );
+var links = sourceNode.querySelectorAll( 'div.hatnote a' );
 var i = 0,
 len = links.length;
 for (; i  len; i++) {
diff --git a/wikipedia/assets/preview.js b/wikipedia/assets/preview.js
index 898b749..fd175a6 100644
--- a/wikipedia/assets/preview.js
+++ b/wikipedia/assets/preview.js
@@ -106,7 +106,7 @@
 
 function collectDisambig( sourceNode ) {
 var res = [];
-var links = sourceNode.querySelectorAll( 'div.hatnote  a' );
+var links = sourceNode.querySelectorAll( 'div.hatnote a' );
 var i = 0,
 len = links.length;
 for (; i  len; i++) {
diff --git a/www/js/actions.js b/www/js/actions.js
index dfcda0c..f8bc183 100644
--- a/www/js/actions.js
+++ b/www/js/actions.js
@@ -105,7 +105,7 @@
 
 function collectDisambig( sourceNode ) {
 var res = [];
-var links = sourceNode.querySelectorAll( 'div.hatnote  a' );
+var links = sourceNode.querySelectorAll( 'div.hatnote a' );
 var i = 0,
 len = links.length;
 for (; i  len; i++) {

-- 
To view, visit https://gerrit.wikimedia.org/r/173120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aa2c91298bb88ac62f44882fc53323fc216c8ac
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Scroll all the way up when first section in ToC clicked. - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has submitted this change and it was merged.

Change subject: Scroll all the way up when first section in ToC clicked.
..


Scroll all the way up when first section in ToC clicked.

Also properly update index.html and preview.html in the www folder to
remove zoomability, viz: https://gerrit.wikimedia.org/r/171850

Bug: 73327
Change-Id: Icd9c15244ca79683f3817c66ff430d7351c040f8
---
M wikipedia/assets/bundle.js
M wikipedia/assets/preview.html
M www/index.html
M www/js/sections.js
M www/preview.html
5 files changed, 21 insertions(+), 9 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index b1c9e0a..a79b2e7 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -554,9 +554,15 @@
 });
 
 function scrollToSection( anchor ) {
-var el = document.getElementById( anchor );
-var scrollY = el.offsetTop - 48;
-window.scrollTo( 0, scrollY );
+if (anchor === heading_0) {
+// if it's the first section, then scroll all the way to the top, 
since there could
+// be a lead image, native title components, etc.
+window.scrollTo( 0, 0 );
+} else {
+var el = document.getElementById( anchor );
+var scrollY = el.offsetTop - 48;
+window.scrollTo( 0, scrollY );
+}
 }
 
 /**
diff --git a/wikipedia/assets/preview.html b/wikipedia/assets/preview.html
index 064b0ec..2ab4da3 100644
--- a/wikipedia/assets/preview.html
+++ b/wikipedia/assets/preview.html
@@ -4,7 +4,7 @@
 base href=https://wikipedia.org; / !-- Force links to resolve with 
https as protocol, rather than file:// --
 script src=file:///android_asset/preview.js/script
 
-meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
+meta name=viewport content=width=device-width, user-scalable=no /
 /head
 body
 div id=content class=content/div
diff --git a/www/index.html b/www/index.html
index 3130185..5ca4005 100644
--- a/www/index.html
+++ b/www/index.html
@@ -4,7 +4,7 @@
 base href=https://wikipedia.org; / !-- Force links to resolve with 
https as protocol, rather than file:// --
 script src=file:///android_asset/bundle.js/script
 
-meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
+meta name=viewport content=width=device-width, user-scalable=no /
 /head
 body
 div id=content class=content/div
diff --git a/www/js/sections.js b/www/js/sections.js
index 57fc1a4..53b02f6 100644
--- a/www/js/sections.js
+++ b/www/js/sections.js
@@ -139,9 +139,15 @@
 });
 
 function scrollToSection( anchor ) {
-var el = document.getElementById( anchor );
-var scrollY = el.offsetTop - 48;
-window.scrollTo( 0, scrollY );
+if (anchor === heading_0) {
+// if it's the first section, then scroll all the way to the top, 
since there could
+// be a lead image, native title components, etc.
+window.scrollTo( 0, 0 );
+} else {
+var el = document.getElementById( anchor );
+var scrollY = el.offsetTop - 48;
+window.scrollTo( 0, scrollY );
+}
 }
 
 /**
diff --git a/www/preview.html b/www/preview.html
index 064b0ec..2ab4da3 100644
--- a/www/preview.html
+++ b/www/preview.html
@@ -4,7 +4,7 @@
 base href=https://wikipedia.org; / !-- Force links to resolve with 
https as protocol, rather than file:// --
 script src=file:///android_asset/preview.js/script
 
-meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
+meta name=viewport content=width=device-width, user-scalable=no /
 /head
 body
 div id=content class=content/div

-- 
To view, visit https://gerrit.wikimedia.org/r/173011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd9c15244ca79683f3817c66ff430d7351c040f8
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@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] Manual import of translations from TWN - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173234

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: I45759d1dc6f2e1346d95d2a83aea17526706342a
---
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-ce/strings.xml
M wikipedia/res/values-da/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-el/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fa/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-it/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-ka/strings.xml
M wikipedia/res/values-km/strings.xml
M wikipedia/res/values-ko/strings.xml
A wikipedia/res/values-kw/strings.xml
M wikipedia/res/values-ky/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-ms/strings.xml
M wikipedia/res/values-nb/strings.xml
M wikipedia/res/values-nl/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sk/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-vi/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
31 files changed, 205 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/34/173234/1

diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index a9925a3..860d281 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -240,7 +240,6 @@
   string name=search_error_retryTorna a provar/string
   string name=search_redirect_titleRedirecció de «%s»./string
   string name=search_recent_headerCerques recents:/string
-  string name=menu_clear_all_recent_searchesEsborra cerques 
recents/string
   string name=search_titles_buttonTítols/string
   string name=search_full_buttonDins d\'articles/string
   string name=toc_hintFeu lliscar el dit cap a l\'esquerra per a les 
seccions, o utilitzeu el botó de menú a la part superior dreta./string
diff --git a/wikipedia/res/values-ce/strings.xml 
b/wikipedia/res/values-ce/strings.xml
index dd68dad..4de2529 100644
--- a/wikipedia/res/values-ce/strings.xml
+++ b/wikipedia/res/values-ce/strings.xml
@@ -132,4 +132,6 @@
   string name=search_titles_buttonТитулаш/string
   string name=search_full_buttonЯззамашкахь/string
   string name=toc_know_itКхетий/string
+  string name=table_closeДӀачӀагӀа/string
+  string name=dialog_close_descriptionДӀачӀагӀа/string
 /resources
diff --git a/wikipedia/res/values-da/strings.xml 
b/wikipedia/res/values-da/strings.xml
index 0f09c6f..85a1fca 100644
--- a/wikipedia/res/values-da/strings.xml
+++ b/wikipedia/res/values-da/strings.xml
@@ -240,7 +240,6 @@
   string name=search_error_retryPrøv igen/string
   string name=search_redirect_titleOmdirigering fra \%s\./string
   string name=search_recent_headerSeneste søgninger:/string
-  string name=menu_clear_all_recent_searchesRyd seneste søgninger/string
   string name=search_titles_buttonTitler/string
   string name=search_full_buttonIndhold i artikler/string
   string name=toc_hintStryg til venstre for afsnit, eller brug menuknappen 
øverst til højre./string
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 41c0c25..47386b7 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -240,12 +240,14 @@
   string name=search_error_retryErneut versuchen/string
   string name=search_redirect_titleWeitergeleitet von „%s“./string
   string name=search_recent_headerLetzte Suchanfragen:/string
-  string name=menu_clear_all_recent_searchesLetzte Suchanfragen 
löschen/string
   string name=search_titles_buttonTitel/string
   string name=search_full_buttonInnerhalb Artikeln/string
   string name=toc_hintWische nach links für Abschnitte oder benutze rechts 
oben den Menü-Button./string
   string name=toc_know_itVerstanden/string
   string name=error_browser_not_foundWebseite konnte nicht geöffnet werden 
(keine Browser-App gefunden)./string
+  string name=table_infoboxSchnelle Fakten/string
+  string name=table_otherWeitere Informationen/string
+  string name=table_closeSchließen/string
   string name=app_store_descriptionOffizielle Wikipedia-App für Android. 
Wikipedia ist die freie Enzyklopädie mit mehr als 32 Millionen Artikeln in 280 
Sprachen und ist das umfangreichste und am meisten genutzte Nachschlagewerk, 
das von Menschen zusammengestellt wurde. Die App wurde neu geschrieben und ist 
besser als jemals zuvor.
 
 Funktionen:
@@ -260,4 +262,5 @@
 Der Code ist völlig quelloffen. Falls du Erfahrungen mit Java und dem 
Android-SDK

[MediaWiki-commits] [Gerrit] More TranslationTest improvements - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173235

Change subject: More TranslationTest improvements
..

More TranslationTest improvements

Make it more stable by not having to explicitly ignore
several locales for the numeric formats.

Also checking a list of possible parameter formats.

Change-Id: I5c85be3f712f66fae81b3934a3a168c15a8c2814
---
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
1 file changed, 77 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/35/173235/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index 6b276e4..f4dd535 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -26,7 +26,11 @@
  * TODO: check for missing translations
  */
 public class TranslationTests extends 
ActivityInstrumentationTestCase2PageActivity {
-public static final String TAG = TrTest;
+private static final String TAG = TrTest;
+
+/** Add more if needed, but then also add some tests. */
+private static final String[] POSSIBLE_PARAMS = new String[] {%s, %d, 
%.2f};
+
 private PageActivity activity;
 private StringBuilder mismatches = new StringBuilder();
 
@@ -48,9 +52,9 @@
 setLocale(Locale.ROOT.toString());
 ListRes tagRes = new ResourceCollector(, 
lt;).collectParameterResources();
 ListRes noTagRes = new ResourceCollector(, 
lt;).not().collectParameterResources();
-ListRes stringParamRes = new ResourceCollector(%s, 
%1$s).collectParameterResources();
-ListRes decimalParamRes = new ResourceCollector(%d, 
%1$d).collectParameterResources();
-ListRes floatParamRes = new ResourceCollector(%f, 
%.2f).collectParameterResources();
+ListRes stringParamRes = new 
ResourceCollector(%s).collectParameterResources();
+ListRes decimalParamRes = new 
ResourceCollector(%d).collectParameterResources();
+ListRes floatParamRes = new 
ResourceCollector(%.2f).collectParameterResources();
 
 AssetManager assetManager = 
getInstrumentation().getTargetContext().getResources().getAssets();
 for (String lang : assetManager.getLocales()) {
@@ -84,26 +88,19 @@
 // taking forever to get those fixed :(
 continue;
 }
-checkTranslationHasParameter(res, [stringParam], null);
-}
-
-if (lang.startsWith(fa) || lang.startsWith(ar) || 
lang.equals(bn)
-|| lang.equals(mr) || lang.equals(my) || 
lang.startsWith(ne) || lang.equals(ps)) {
-// don't check the number params since those languages 
have different string representations for numbers
-continue;
+checkTranslationHasParameter(res, %s, [stringParam], 
null);
 }
 
 // decimal parameters
 for (Res res : decimalParamRes) {
 final int param1 = 42;
-checkTranslationHasParameter(res, param1, null);
+checkTranslationHasParameter(res, %d, param1, null);
 }
 
-// float parameters
+// floating point parameters
 for (Res res : floatParamRes) {
 final float param1 = .27f;
-checkTranslationHasParameter(res, param1, 0,27);
-//// TODO: build a list of all parameterized string resources 
from default strings dynamically first
+checkTranslationHasParameter(res, %.2f, param1, 0,27);
 }
 }
 }
@@ -114,6 +111,7 @@
 
 public void setLocale(String lang) {
 myLocale = new Locale(lang);
+Locale.setDefault(myLocale);
 Resources res = getInstrumentation().getTargetContext().getResources();
 DisplayMetrics dm = res.getDisplayMetrics();
 Configuration conf = res.getConfiguration();
@@ -161,22 +159,22 @@
 }
 
 private void checkTranslationHasNoParameter(Res res) {
-final String param1 = [param1];
-String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, param1);
+final String val1 = [val1];
+String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, val1);
 //Log.i(TAG, myLocale + : + translatedString);
-if (translatedString.contains(param1)) {
-final String msg = myLocale + : + res.name +  =  + 
translatedString + ' contains  + param1;
+if (translatedString.contains(val1)) {
+final String msg = myLocale + : + res.name +  =  + 
translatedString + ' contains  +

[MediaWiki-commits] [Gerrit] Use menu_clear_all_recent_searches string in translations - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173236

Change subject: Use menu_clear_all_recent_searches string in translations
..

Use menu_clear_all_recent_searches string in translations

The English string stayed the same but the resource name was changed earlier 
today.
Using the same name for the translations in this case should be fine.
But I fuzzied them anyways.

Change-Id: I3be8b9f01369e3934828917f8707bc4a9f50d445
---
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-da/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-el/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fa/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-it/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-km/strings.xml
M wikipedia/res/values-ko/strings.xml
M wikipedia/res/values-ky/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-ms/strings.xml
M wikipedia/res/values-nb/strings.xml
M wikipedia/res/values-nl/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sk/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-vi/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
27 files changed, 27 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/36/173236/1

diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index a9925a3..46cd632 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -240,7 +240,7 @@
   string name=search_error_retryTorna a provar/string
   string name=search_redirect_titleRedirecció de «%s»./string
   string name=search_recent_headerCerques recents:/string
-  string name=menu_clear_all_recent_searchesEsborra cerques 
recents/string
+  string name=button_clear_all_recent_searches fuzzy=trueEsborra cerques 
recents/string
   string name=search_titles_buttonTítols/string
   string name=search_full_buttonDins d\'articles/string
   string name=toc_hintFeu lliscar el dit cap a l\'esquerra per a les 
seccions, o utilitzeu el botó de menú a la part superior dreta./string
diff --git a/wikipedia/res/values-da/strings.xml 
b/wikipedia/res/values-da/strings.xml
index 0f09c6f..11ca40f 100644
--- a/wikipedia/res/values-da/strings.xml
+++ b/wikipedia/res/values-da/strings.xml
@@ -240,7 +240,7 @@
   string name=search_error_retryPrøv igen/string
   string name=search_redirect_titleOmdirigering fra \%s\./string
   string name=search_recent_headerSeneste søgninger:/string
-  string name=menu_clear_all_recent_searchesRyd seneste søgninger/string
+  string name=button_clear_all_recent_searches fuzzy=trueRyd seneste 
søgninger/string
   string name=search_titles_buttonTitler/string
   string name=search_full_buttonIndhold i artikler/string
   string name=toc_hintStryg til venstre for afsnit, eller brug menuknappen 
øverst til højre./string
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 41c0c25..7cca8e0 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -240,7 +240,7 @@
   string name=search_error_retryErneut versuchen/string
   string name=search_redirect_titleWeitergeleitet von „%s“./string
   string name=search_recent_headerLetzte Suchanfragen:/string
-  string name=menu_clear_all_recent_searchesLetzte Suchanfragen 
löschen/string
+  string name=button_clear_all_recent_searches fuzzy=trueLetzte 
Suchanfragen löschen/string
   string name=search_titles_buttonTitel/string
   string name=search_full_buttonInnerhalb Artikeln/string
   string name=toc_hintWische nach links für Abschnitte oder benutze rechts 
oben den Menü-Button./string
diff --git a/wikipedia/res/values-el/strings.xml 
b/wikipedia/res/values-el/strings.xml
index debbe4e..d2d0424 100644
--- a/wikipedia/res/values-el/strings.xml
+++ b/wikipedia/res/values-el/strings.xml
@@ -235,7 +235,7 @@
   string name=search_error_retryΕπανάληψη/string
   string name=search_redirect_titleΑνακατεύθυνση από \%s\./string
   string name=search_recent_headerΠρόσφατες αναζητήσεις:/string
-  string name=menu_clear_all_recent_searchesΕκκαθάριση πρόσφατων 
αναζητήσεων/string
+  string name=button_clear_all_recent_searches fuzzy=trueΕκκαθάριση 
πρόσφατων αναζητήσεων/string
   string name=search_titles_buttonΤίτλοι:/string
   string name=search_full_buttonΕντός λημμάτων/string
   string name=toc_hintΣύρετε προς τα αριστερά για ενότητες ή 
χρησιμοποιήστε το κουμπί \μενού\ στην επάνω δεξιά γωνία./string
diff --git a/wikipedia/res/values-es/strings.xml

[MediaWiki-commits] [Gerrit] Removed unused menu file - change (apps...wikipedia)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173237

Change subject: Removed unused menu file
..

Removed unused menu file

Change-Id: Ib0875511da9dc8104b023a27bfb618b82cf8b62c
---
D wikipedia/res/menu/menu_search.xml
1 file changed, 0 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/37/173237/1

diff --git a/wikipedia/res/menu/menu_search.xml 
b/wikipedia/res/menu/menu_search.xml
deleted file mode 100644
index c97b490..000
--- a/wikipedia/res/menu/menu_search.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-
-menu xmlns:android=http://schemas.android.com/apk/res/android;
-xmlns:app=http://schemas.android.com/apk/res-auto;
-item android:id=@+id/menu_clear_all_recent_searches
-android:icon=@drawable/ic_delete
-android:title=@string/menu_clear_all_recent_searches
-app:showAsAction=ifRoom /
-
-/menu
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/173237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0875511da9dc8104b023a27bfb618b82cf8b62c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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)

2014-11-13 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173239

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: I81d67dc1edeafcb86ba7c1777a270d8fb019d7cd
---
M wikipedia/res/values-ce/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-ka/strings.xml
A wikipedia/res/values-kw/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-ro/strings.xml
9 files changed, 205 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/39/173239/1

diff --git a/wikipedia/res/values-ce/strings.xml 
b/wikipedia/res/values-ce/strings.xml
index dd68dad..4de2529 100644
--- a/wikipedia/res/values-ce/strings.xml
+++ b/wikipedia/res/values-ce/strings.xml
@@ -132,4 +132,6 @@
   string name=search_titles_buttonТитулаш/string
   string name=search_full_buttonЯззамашкахь/string
   string name=toc_know_itКхетий/string
+  string name=table_closeДӀачӀагӀа/string
+  string name=dialog_close_descriptionДӀачӀагӀа/string
 /resources
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 7cca8e0..25b7552 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -246,6 +246,9 @@
   string name=toc_hintWische nach links für Abschnitte oder benutze rechts 
oben den Menü-Button./string
   string name=toc_know_itVerstanden/string
   string name=error_browser_not_foundWebseite konnte nicht geöffnet werden 
(keine Browser-App gefunden)./string
+  string name=table_infoboxSchnelle Fakten/string
+  string name=table_otherWeitere Informationen/string
+  string name=table_closeSchließen/string
   string name=app_store_descriptionOffizielle Wikipedia-App für Android. 
Wikipedia ist die freie Enzyklopädie mit mehr als 32 Millionen Artikeln in 280 
Sprachen und ist das umfangreichste und am meisten genutzte Nachschlagewerk, 
das von Menschen zusammengestellt wurde. Die App wurde neu geschrieben und ist 
besser als jemals zuvor.
 
 Funktionen:
@@ -260,4 +263,5 @@
 Der Code ist völlig quelloffen. Falls du Erfahrungen mit Java und dem 
Android-SDK hast, dann unterstütze uns! 
https://github.com/wikimedia/apps-android-wikipedia/string
   string name=alpha_update_notification_titleNeue Alpha-Aktualisierung 
verfügbar/string
   string name=alpha_update_notification_textZum Herunterladen 
tippen/string
+  string name=dialog_close_descriptionSchließen/string
 /resources
diff --git a/wikipedia/res/values-fr/strings.xml 
b/wikipedia/res/values-fr/strings.xml
index 99547a9..96efb9f 100644
--- a/wikipedia/res/values-fr/strings.xml
+++ b/wikipedia/res/values-fr/strings.xml
@@ -246,6 +246,9 @@
   string name=toc_hintBalayer vers la gauche pour les sections, ou 
utiliser le bouton de menu en haut à droite./string
   string name=toc_know_itC’est bon !/string
   string name=error_browser_not_foundImpossible d’ouvrir la page web 
(aucune application de navigateur trouvée)./string
+  string name=table_infoboxFaits en bref/string
+  string name=table_otherPlus d’information/string
+  string name=table_closeFermer/string
   string name=app_store_descriptionApplication officielle Wikipédia pour 
Android. Wikipédia est l’encyclopédie libre contenant plus de 32 millions 
d’articles en 280 langues et est la référence la plus complète et la plus 
largement utilisée que les hommes aient jamais compilée. L’application a été 
réécrite de zéro et est meilleure que jamais.
 
 Fonctionnalités :
@@ -260,4 +263,5 @@
 Le code est entièrement ouvert. Si vous êtes expérimenté avec Java et le kit 
de développement Android, alors venez créer votre variante ! 
https://github.com/wikimedia/apps-android-wikipedia/string
   string name=alpha_update_notification_titleNouvelle mise à jour alpha 
disponible/string
   string name=alpha_update_notification_textTouchez pour 
télécharger/string
+  string name=dialog_close_descriptionFermer/string
 /resources
diff --git a/wikipedia/res/values-ka/strings.xml 
b/wikipedia/res/values-ka/strings.xml
index 7e15414..6c2eb27 100644
--- a/wikipedia/res/values-ka/strings.xml
+++ b/wikipedia/res/values-ka/strings.xml
@@ -2,13 +2,15 @@
 resources
   string name=app_nameვიკიპედია/string
   string name=app_name_betaვიკიპედია ბეტა/string
+  string name=app_name_alphaვიკიპედია ალფა/string
   string name=yesდიახ/string
   string name=noარა/string
   string name=acra_report_dialog_titleვიკიპედიის შეცდომა :(/string
   string name=search_hintძიება ვიკიპედიაზე/string
   string name=history_activity_titleისტორია/string
   string name=nav_item_historyისტორია/string
-  string name=error_network_error fuzzy=trueქსელს ვერ უკავშირდება 
:(/string
+  string name=error_network_errorქსელთან კავშირი არ არის :(/string
+  string

[MediaWiki-commits] [Gerrit] Update gitignore - change (labs...wikipedia-android-builds)

2014-11-14 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173441

Change subject: Update gitignore
..

Update gitignore

Change-Id: I1f95494d111b197fe582bd0633dca554b9e4b869
---
M .gitignore
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikipedia-android-builds 
refs/changes/41/173441/1

diff --git a/.gitignore b/.gitignore
index dc6fb23..aaef71a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-android-sdk*/
-apache-maven*/
-wikipedia/
-job/
-tmp/
+/public_html/runs/
+*.pyc
 *.log
 *.cnf
 .*

-- 
To view, visit https://gerrit.wikimedia.org/r/173441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f95494d111b197fe582bd0633dca554b9e4b869
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikipedia-android-builds
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update SDK download/update scripts for new location - change (labs...wikipedia-android-builds)

2014-11-14 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173440

Change subject: Update SDK download/update scripts for new location
..

Update SDK download/update scripts for new location

Also ran the update script to update the SDK for 5.0

Change-Id: I13485e9e4e27658ac28c08d60ddd4b75fc75fb1d
---
M bin/download-android-sdk.bash
M bin/update-android-sdk.bash
2 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikipedia-android-builds 
refs/changes/40/173440/1

diff --git a/bin/download-android-sdk.bash b/bin/download-android-sdk.bash
index 139450d..b395fe0 100644
--- a/bin/download-android-sdk.bash
+++ b/bin/download-android-sdk.bash
@@ -1,5 +1,4 @@
-SDK_HOME_PATH=$HOME
-SDK_PATH=$SDK_HOME_PATH/android-sdk-linux
+SDK_HOME_PATH=/srv/adk
  
 # Needs to be updated when new releases are made
 SDK_DOWNLOAD_URL=http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz;
diff --git a/bin/update-android-sdk.bash b/bin/update-android-sdk.bash
index 7281493..c28fba1 100644
--- a/bin/update-android-sdk.bash
+++ b/bin/update-android-sdk.bash
@@ -1,8 +1,8 @@
-SDK_HOME_PATH=$HOME
-SDK_PATH=$SDK_HOME_PATH/android-sdk-linux
-SDK_PACKAGES=tools,platform-tools,build-tools-20.0.0,android-19,extra-android-m2repository
+SDK_PATH=/srv/adk
+SDK_PACKAGES=tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
 export _JAVA_OPTIONS=-Xmx256m
-export 
ANDROID_SWT=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext
+export ANDROID_SWT=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext
  
 # Just install platform-tools, build-tools  Android-19
 # Filter names are from `android list sdk -e -a`

-- 
To view, visit https://gerrit.wikimedia.org/r/173440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13485e9e4e27658ac28c08d60ddd4b75fc75fb1d
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikipedia-android-builds
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix possible crash(es) on screen rotation in search fragment. - change (apps...wikipedia)

2014-11-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173531

Change subject: Fix possible crash(es) on screen rotation in search fragment.
..

Fix possible crash(es) on screen rotation in search fragment.

Change-Id: Ib7ed54949f2aa627e15cbd2987f4c3e5e96ff5f9
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/31/173531/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index f14bb3a..f93524f 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -373,7 +373,7 @@
 
 @Override
 public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-if (isSearchActive) {
+if (isSearchActive  isAdded()) {
 addSearchView(menu);
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/173531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7ed54949f2aa627e15cbd2987f4c3e5e96ff5f9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Full text search results in correct order - change (apps...wikipedia)

2014-11-15 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173638

Change subject: Full text search results in correct order
..

Full text search results in correct order

Also avoiding an extra request per full text search to get the thumbnail URLs.
This should make the thumbnails appear much faster.

Using similar request as iOS app.

Bug: 72781
Change-Id: Ic6742bd8ae796c1c0ee4879e22cae0063efd564b
---
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
4 files changed, 62 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/38/173638/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index 9d09734..363422e 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -3,18 +3,23 @@
 import org.wikipedia.ApiTask;
 import org.wikipedia.PageTitle;
 import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
 import org.mediawiki.api.json.Api;
 import org.mediawiki.api.json.ApiException;
 import org.mediawiki.api.json.ApiResult;
 import org.mediawiki.api.json.RequestBuilder;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 public class FullSearchArticlesTask extends 
ApiTaskFullSearchArticlesTask.FullSearchResults {
+private static final int MAX_RESULTS = 12;
 private static final String NUM_RESULTS_PER_QUERY = 12;
 
 private final Site site;
@@ -30,17 +35,29 @@
 
 @Override
 public RequestBuilder buildRequest(Api api) {
+final String offset = Integer.toString(continueOffset);
 return api.action(query)
-.param(prop, pageprops)
+.param(prop, pageprops|pageimages)
 .param(ppprop, wikibase_item) // only interested in 
wikibase_item
 .param(generator, search)
 .param(gsrsearch, searchTerm)
 .param(gsrnamespace, 0)
 .param(gsrwhat, text)
-.param(gsrinfo, totalhits|suggestion)
+.param(gsrinfo, )
 .param(gsrprop, redirecttitle)
-.param(gsroffset, Integer.toString(continueOffset))
-.param(gsrlimit, NUM_RESULTS_PER_QUERY);
+.param(gsroffset, offset)
+.param(gsrlimit, NUM_RESULTS_PER_QUERY)
+.param(list, search) // for correct order
+.param(srsearch, searchTerm)
+.param(srnamespace, 0)
+.param(srwhat, text)
+.param(srinfo, suggestion)
+.param(srprop, )
+.param(sroffset, offset)
+.param(srlimit, NUM_RESULTS_PER_QUERY)
+.param(piprop, thumbnail) // for thumbnail URLs
+.param(pithumbsize, 
Integer.toString(WikipediaApp.PREFERRED_THUMB_SIZE))
+.param(pilimit, NUM_RESULTS_PER_QUERY);
 }
 
 @Override
@@ -77,7 +94,19 @@
 return emptyResults();
 }
 
-ArrayListFullSearchResult resultList = new 
ArrayListFullSearchResult();
+/*
+So here's what we're doing here:
+We're requesting two sets of results with our API query. They both 
contain the same titles,
+but in different orders.  The results given by list=search give us 
the results in
+the correct order, but with no thumbnails or wikidata ID. The results 
given by generator=search
+give the results in the wrong order, but with thumbnails and wikidata 
IDs!
+So, all we have to do is use the first list, and correlate the titles 
with the second list to
+extract the thumbnails. Unfortunately, the search generator only gives 
us titles and not pageids.
+This is why we need a Map of titles to results.
+*/
+
+// build a map of full result objects
+MapString, FullSearchResult map = new HashMapString, 
FullSearchResult(MAX_RESULTS + 1, 1.0f);
 IteratorString keys = pages.keys();
 while (keys.hasNext()) {
 String key = keys.next();
@@ -89,7 +118,20 @@
 JSONObject pageProps = pageData.getJSONObject(pageprops);
 wikiBaseId = pageProps.optString(wikibase_item, null);
 }
-resultList.add(new FullSearchResult(pageTitle, wikiBaseId));
+String

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

2014-11-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173871

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: I56ced92ceda382e50de016e3fd22c7f5bc710064
---
M wikipedia/res/values-br/strings.xml
M wikipedia/res/values-el/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-ja/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-ms/strings.xml
M wikipedia/res/values-nb/strings.xml
M wikipedia/res/values-nl/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-vi/strings.xml
17 files changed, 75 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/71/173871/1

diff --git a/wikipedia/res/values-br/strings.xml 
b/wikipedia/res/values-br/strings.xml
index 87dbaf8..882df43 100644
--- a/wikipedia/res/values-br/strings.xml
+++ b/wikipedia/res/values-br/strings.xml
@@ -107,6 +107,7 @@
   string name=saved_pages_empty_messageMat-tre eo enrollañ pajennoù. 
Gallout a rit ober ganto evel sinedoù hag a c\'hallit lenn pa vezit 
ezlinenn./string
   string name=history_empty_titleN\'eus pajenn nevez ebet amañ./string
   string name=history_empty_messageLamet ho peus pep tra moarvat. Ar wech 
kentañ ma\'z eot war ur bajenn e c\'hallot distreiñ warni ac\'halese./string
+  string name=delete_selected_historyDiverkañ/string
   string 
name=wp_stylizedlt;biggt;Wlt;/biggt;IKIPEDIlt;biggt;Alt;/biggt;/string
   string name=wp_tag_lineAn Holloueziadur digor/string
   string name=skipLezel a-gostez/string
@@ -239,10 +240,16 @@
   string name=search_error_retryKlask en-dro/string
   string name=search_redirect_titleAdkaset war-zu \%s\/string
   string name=search_recent_headerEnklaskoù nevez :/string
+  string name=button_clear_all_recent_searchesdiverkañ an enklaskoù 
nevez/string
+  string name=clear_recent_searches_confirmHa sur eo ho peus c\'hoant da 
ziverkañ roll-istor  hoc\'h enklaskoù ?/string
   string name=search_titles_buttonTitloù/string
   string name=search_full_buttonEr pennadoù/string
   string name=toc_hintTorchañ war-zu an tu kleiz evit ar rannskridoù, pe 
implijout bouton al lañser e krec\'h a-zehoù./string
   string name=toc_know_itMat eo/string
+  string name=error_browser_not_foundNe c\'haller ket digeriñ ar bajenn 
web (n\'eus bet kavet arload  merdeer)/string
+  string name=table_infoboxGraet buan/string
+  string name=table_otherMuioc\'h a ditouroù/string
+  string name=table_closeSerriñ/string
   string name=app_store_descriptionArload ofisiel Wikepedia evit Android. 
Un holloueziadur eo Wikipedia. Ennañ ez eus ouzhpenn 32 vilion a bennadoù e 280 
yezh. An holloueziadur klokañ hag implijetañ a zo bet kempunet gant an dud evel 
n’eus ket bet morse.
 
 Arc\'hwelioù
@@ -263,4 +270,5 @@
 Digor penn-da-benn eo ar c\'hod. M\'ho peus skiant-prenet gant Java hag ar 
c\'hit diorren Android, deuit neuze da grouiñ hoc\'h adstumm : 
https://github.com/wikimedia/apps-android-wikipedia/string
   string name=alpha_update_notification_titleUn hizadenn alpha nevez a 
c\'haller kaout/string
   string name=alpha_update_notification_textPouezañ evit 
pellgargañ/string
+  string name=dialog_close_descriptionSerriñ/string
 /resources
diff --git a/wikipedia/res/values-el/strings.xml 
b/wikipedia/res/values-el/strings.xml
index d2d0424..ba7bf0f 100644
--- a/wikipedia/res/values-el/strings.xml
+++ b/wikipedia/res/values-el/strings.xml
@@ -235,7 +235,7 @@
   string name=search_error_retryΕπανάληψη/string
   string name=search_redirect_titleΑνακατεύθυνση από \%s\./string
   string name=search_recent_headerΠρόσφατες αναζητήσεις:/string
-  string name=button_clear_all_recent_searches fuzzy=trueΕκκαθάριση 
πρόσφατων αναζητήσεων/string
+  string name=button_clear_all_recent_searchesΕκκαθάριση πρόσφατων 
αναζητήσεων/string
   string name=search_titles_buttonΤίτλοι:/string
   string name=search_full_buttonΕντός λημμάτων/string
   string name=toc_hintΣύρετε προς τα αριστερά για ενότητες ή 
χρησιμοποιήστε το κουμπί \μενού\ στην επάνω δεξιά γωνία./string
diff --git a/wikipedia/res/values-es/strings.xml 
b/wikipedia/res/values-es/strings.xml
index b245ebc..0d1a068 100644
--- a/wikipedia/res/values-es/strings.xml
+++ b/wikipedia/res/values-es/strings.xml
@@ -240,12 +240,16 @@
   string name=search_error_retryReintentar/string
   string name=search_redirect_titleRedirección desde \%s\./string
   string name=search_recent_headerBúsquedas recientes:/string
-  string name=button_clear_all_recent_searches fuzzy=trueBorrar 
búsquedas recientes/string
+  string name=button_clear_all_recent_searchesBorrar búsquedas

[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)

2014-11-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173873

Change subject: Manual import of translations from TWN
..

Manual import of translations from TWN

Change-Id: Ie2b1a2f28054ce559e765d8ad05a6f8495bba0a7
---
M wikipedia/azb.lproj/Localizable.strings
M wikipedia/br.lproj/Localizable.strings
M wikipedia/ca.lproj/Localizable.strings
M wikipedia/ja.lproj/Localizable.strings
M wikipedia/ms.lproj/Localizable.strings
M wikipedia/nb.lproj/Localizable.strings
M wikipedia/nl.lproj/Localizable.strings
M wikipedia/pl.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
M wikipedia/ru.lproj/Localizable.strings
M wikipedia/sv.lproj/Localizable.strings
M wikipedia/vi.lproj/Localizable.strings
12 files changed, 39 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/73/173873/1

diff --git a/wikipedia/azb.lproj/Localizable.strings 
b/wikipedia/azb.lproj/Localizable.strings
index 4ef9f8d..85e7e3d 100644
--- a/wikipedia/azb.lproj/Localizable.strings
+++ b/wikipedia/azb.lproj/Localizable.strings
@@ -1,6 +1,7 @@
 // Messages for South Azerbaijani (تورکجه)
 // Exported from translatewiki.net
 // Author: Arjanizary
+// Author: Koroğlu
 
 article-languages-label = دیل سئچ;
 article-languages-cancel = پوْز;
@@ -15,16 +16,16 @@
 zero-interstitial-cancel = بوردا قال;
 account-creation-saving = ساخلانیلیر...;
 account-creation-login = اؤنجه‌دن حسابینیز وارمی؟ گیرینیز.;
-account-creation-username-placeholder-text = ایستیفاده‌چی آدی;
+account-creation-username-placeholder-text = ایشلدن آدی;
 account-creation-password-placeholder-text = رمز;
 login-user-blocked = ایستیفاده‌چی باغلانیب.;
-login-username-placeholder-text = ایستیفاده‌چی آدی;
+login-username-placeholder-text = ایشلدن آدی;
 login-password-placeholder-text = رمز;
 wikitext-upload-save = ساخلانیلیر...;
 wikitext-upload-save-sign-in = گیریش;
 wikitext-upload-save-anonymously = آدسیز ساخلا;
 open-link-cancel = پوْز;
-search-searching = آخداریلیر...;
+search-searching = آختاریلیر...;
 search-field-placeholder-text = ویکی‌پئدیادا آختار;
 search-loading-section-zero = مقاله‌نین ایلک بؤلومو یوکله‌نیر...;
 search-loading-section-remaining = مقاله‌نین قالانی یوکله‌نیر...;
diff --git a/wikipedia/br.lproj/Localizable.strings 
b/wikipedia/br.lproj/Localizable.strings
index c18eba4..d344f80 100644
--- a/wikipedia/br.lproj/Localizable.strings
+++ b/wikipedia/br.lproj/Localizable.strings
@@ -97,6 +97,7 @@
 main-menu-send-feedback = Kasit hoc'h evezhiadennoù diwar-benn an arload;
 main-menu-show-page-history = Istor ar c'hemmoù da $1;
 main-menu-credits = Kredoù;
+main-menu-about = Diwar-benn an arload Wikipedia;
 main-menu-zero-faq = FAG Wikipedia Zero;
 main-menu-privacy-policy = Reolennoù prevezded;
 main-menu-terms-of-use = Termenoù implijout;
@@ -144,6 +145,18 @@
 credits-gerrit-repo = Arload pennañ (Gerrit);
 credits-github-mirror = Arload melezour (GitHub);
 credits-external-libraries = Diavaez;
+about-title = Diwar-benn;
+about-wikipedia = Wikipedia;
+about-contributors = kenlabourerien;
+about-testers = prouaderioù;
+about-testers-details = AQ prouet gant $1;
+about-translators = troerien;
+about-translators-details = Troet eo bet an arload-mañ gant troerien a-youl 
vat e $1;
+about-libraries = levraouegoù implijet;
+about-repositories = Reizhiadoù daveiñ;
+about-send-feedback = Kas un ali diwar-benn an arload;
+about-product-of = Ur produ eus an $1;
+about-wikimedia-foundation = Diazezadur Wikimedia;
 share-menu-save-page = Enrollañ ar pennad;
 share-menu-page-saved = Pennad enrollet;
 share-menu-page-saved-access = Ali : evit monet d'ho pajennoù enrollet, 
bizskrivañ $1 amañ a-us pe pouezit pell war $2 amañ dindan.;
diff --git a/wikipedia/ca.lproj/Localizable.strings 
b/wikipedia/ca.lproj/Localizable.strings
index 63a1478..2b086f4 100644
--- a/wikipedia/ca.lproj/Localizable.strings
+++ b/wikipedia/ca.lproj/Localizable.strings
@@ -1,6 +1,7 @@
 // Messages for Catalan (català)
 // Exported from translatewiki.net
 // Author: Alvaro Vidal-Abarca
+// Author: Brion
 // Author: Fitoschido
 // Author: Gerardduenas
 // Author: SMP
diff --git a/wikipedia/ja.lproj/Localizable.strings 
b/wikipedia/ja.lproj/Localizable.strings
index b0e2a58..1b987bb 100644
--- a/wikipedia/ja.lproj/Localizable.strings
+++ b/wikipedia/ja.lproj/Localizable.strings
@@ -150,6 +150,8 @@
 about-title = このアプリについて;
 about-wikipedia = ウィキペディアについて;
 about-contributors = 貢献者;
+about-testers = テスター;
+about-testers-details = $1 によって品質保証テストされました;
 about-translators = 翻訳者;
 about-translators-details = このアプリは$1においてボランティア翻訳者により翻訳されました。;
 about-libraries = 使用ライブラリについて;
diff --git a/wikipedia/ms.lproj/Localizable.strings 
b/wikipedia/ms.lproj/Localizable.strings
index 24575e3..53adfe6 100644
--- a/wikipedia/ms.lproj/Localizable.strings
+++ b/wikipedia/ms.lproj/Localizable.strings
@@ -146,6 +146,8 @@
 about-title = Perihal;
 about-wikipedia = Wikipedia;

[MediaWiki-commits] [Gerrit] Fix possible NPE in Nearby - change (apps...wikipedia)

2014-11-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174005

Change subject: Fix possible NPE in Nearby
..

Fix possible NPE in Nearby

When coming back to app or rotating.

java.lang.NullPointerException
at 
org.wikipedia.nearby.NearbyFragment.onCreateOptionsMenu(NearbyFragment.java:496)

Change-Id: Ie1d5dcf488056036ab836e34d696d39afa2f21d1
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/05/174005/1

diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index a77e780..8be5418 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -493,7 +493,7 @@
 
 @Override
 public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-if (((PageActivity)getActivity()).isSearching()) {
+if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
 return;
 }
 inflater.inflate(R.menu.menu_nearby, menu);
@@ -506,7 +506,7 @@
 @Override
 public void onPrepareOptionsMenu(Menu menu) {
 super.onPrepareOptionsMenu(menu);
-if (((PageActivity)getActivity()).isSearching()) {
+if (!isAdded() || ((PageActivity)getActivity()).isSearching()) {
 return;
 }
 menu.findItem(R.id.menu_refresh_nearby).setEnabled(!refreshing);

-- 
To view, visit https://gerrit.wikimedia.org/r/174005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1d5dcf488056036ab836e34d696d39afa2f21d1
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use new continuation API for full text search - change (apps...wikipedia)

2014-11-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174010

Change subject: Use new continuation API for full text search
..

Use new continuation API for full text search

Mainly to future-proof, and to avoid the API sending us this
warning for every query we make:
  Formatting of continuation data will be changing soon.
  To continue using the current formatting, use the 'rawcontinue' parameter.
  To begin using the new format, pass an
  empty string for 'continue' in the initial query.

I found some hints for the new continuation API here:
http://www.mediawiki.org/wiki/API%3aQuery#Continuing_queries
Still, the documentation could have been better there if it had use actual
HTTP requests as examples.

Change-Id: I705f4db4855db4de4d062aa2ac808fcfe0cecb99
---
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
2 files changed, 46 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/10/174010/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index 28ffe7a..1aac1d3 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -24,9 +24,9 @@
 
 private final Site site;
 private final String searchTerm;
-private final int continueOffset;
+private final ContinueOffset continueOffset;
 
-public FullSearchArticlesTask(Api api, Site site, String searchTerm, int 
continueOffset) {
+public FullSearchArticlesTask(Api api, Site site, String searchTerm, 
ContinueOffset continueOffset) {
 super(LOW_CONCURRENCY, api);
 this.site = site;
 this.searchTerm = searchTerm;
@@ -35,8 +35,7 @@
 
 @Override
 public RequestBuilder buildRequest(Api api) {
-final String offset = Integer.toString(continueOffset);
-return api.action(query)
+final RequestBuilder req = api.action(query)
 .param(prop, pageprops|pageimages)
 .param(ppprop, wikibase_item) // only interested in 
wikibase_item
 .param(generator, search)
@@ -45,7 +44,6 @@
 .param(gsrwhat, text)
 .param(gsrinfo, )
 .param(gsrprop, redirecttitle)
-.param(gsroffset, offset)
 .param(gsrlimit, NUM_RESULTS_PER_QUERY)
 .param(list, search) // for correct order
 .param(srsearch, searchTerm)
@@ -53,11 +51,22 @@
 .param(srwhat, text)
 .param(srinfo, suggestion)
 .param(srprop, )
-.param(sroffset, offset)
 .param(srlimit, NUM_RESULTS_PER_QUERY)
 .param(piprop, thumbnail) // for thumbnail URLs
 .param(pithumbsize, 
Integer.toString(WikipediaApp.PREFERRED_THUMB_SIZE))
 .param(pilimit, NUM_RESULTS_PER_QUERY);
+if (continueOffset != null) {
+req.param(continue, continueOffset.cont);
+if (continueOffset.gsroffset  0) {
+req.param(sroffset, 
Integer.toString(continueOffset.sroffset));
+}
+if (continueOffset.gsroffset  0) {
+req.param(gsroffset, 
Integer.toString(continueOffset.gsroffset));
+}
+} else {
+req.param(continue, ); // add empty continue to avoid the API 
warning
+}
+return req;
 }
 
 @Override
@@ -74,9 +83,13 @@
 }
 }
 
-int newOffset = 0;
-if (data.has(query-continue)) {
-newOffset = 
data.getJSONObject(query-continue).getJSONObject(search).getInt(gsroffset);
+ContinueOffset nextContinueOffset = null;
+final JSONObject continueData = data.optJSONObject(continue);
+if (continueData != null) {
+String continueString = continueData.optString(continue, null);
+Integer sroffset = continueData.optInt(sroffset);
+Integer gsroffset = continueData.optInt(gsroffset);
+nextContinueOffset = new ContinueOffset(continueString, sroffset, 
gsroffset);
 }
 
 JSONObject queryResult = data.optJSONObject(query);
@@ -134,20 +147,20 @@
 
resultList.add(map.get(search.getJSONObject(i).getString(title)));
 }
 
-return new FullSearchResults(resultList, newOffset, suggestion);
+return new FullSearchResults(resultList, nextContinueOffset, 
suggestion);
 }
 
 private FullSearchResults emptyResults() {
-return new 
FullSearchResults(Collections.FullSearchResultemptyList(), 0, );
+return new 
FullSearchResults(Collections.FullSearchResultemptyList(),

[MediaWiki-commits] [Gerrit] Bring empty screen in nearby back - change (apps...wikipedia)

2014-11-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174026

Change subject: Bring empty screen in nearby back
..

Bring empty screen in nearby back

Instead of throwing an exception just return the empty list,
so the empty layout will be shown when there is no
query object in the JSON response.

 Also removed unused variable.

Change-Id: I8ea09f3b51dd543f96d5f0b128465dd11600b790
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
2 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/26/174026/1

diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
index 742e48d..c931614 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
@@ -25,7 +25,6 @@
 private static final String LIMIT = 50;
 /** requested thumbnail size in pixel */
 private static final String THUMBNAIL_WIDTH = 144;
-private final WikipediaApp app;
 private final Location location;
 
 public NearbyFetchTask(Context context, Site site, Location location) {
@@ -33,7 +32,6 @@
 SINGLE_THREAD,
 ((WikipediaApp) 
context.getApplicationContext()).getAPIForSite(site)
 );
-this.app = (WikipediaApp) context.getApplicationContext();
 this.location = location;
 }
 
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java 
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
index b3b5483..718a39f 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
@@ -27,11 +27,11 @@
 list = new ArrayListNearbyPage();
 JSONObject query = jsonObject.optJSONObject(query);
 if (query == null) {
-throw new JSONException(Received malformed response with no 
error.);
+return;
 }
+
 JSONObject pagesMap = query.optJSONObject(pages);
 Iterator iterator = pagesMap.keys();
-
 while (iterator.hasNext()) {
 NearbyPage newPage = new 
NearbyPage(pagesMap.getJSONObject((String) iterator.next()));
 list.add(newPage);

-- 
To view, visit https://gerrit.wikimedia.org/r/174026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ea09f3b51dd543f96d5f0b128465dd11600b790
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow caller to specify maxResults in FullSearchTask - change (apps...wikipedia)

2014-11-18 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174293

Change subject: Allow caller to specify maxResults in FullSearchTask
..

Allow caller to specify maxResults in FullSearchTask

Also fix the related tests.

Change-Id: Ic887b9acd041284c80c279f5cb5c7a05f11f3024
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
3 files changed, 20 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/93/174293/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index 5b7e999..f3322d1 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -14,7 +14,7 @@
  */
 public class FullSearchTaskTests extends 
ActivityUnitTestCaseTestDummyActivity {
 private static final int TASK_COMPLETION_TIMEOUT = 2;
-private static final int NUM_RESULTS_REQUESTED = 12;
+private static final int BATCH_SIZE = 12;
 private static final Site SITE = new Site(test.wikipedia.org);
 
 public FullSearchTaskTests() {
@@ -28,13 +28,13 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
test, 0) {
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
test, BATCH_SIZE, null) {
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
-assertEquals(results.getResults().size(), 
NUM_RESULTS_REQUESTED);
+assertEquals(results.getResults().size(), BATCH_SIZE);
 assertEquals(results.getSuggestion(), );
-assertEquals(results.getContinueOffset(), 
NUM_RESULTS_REQUESTED);
+assertNotNull(results.getContinueOffset());
 
 for (FullSearchResult result : results.getResults()) {
 if 
(result.getTitle().getPrefixedText().equals(Test)) {
@@ -56,7 +56,7 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
teest, 0) { // small typo should produce a suggestion
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
teest, BATCH_SIZE, null) { // small typo should produce a suggestion
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
@@ -76,13 +76,13 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
jkfsdfpefdsfwoirpoik, 0) { // toal gibberish, should not exist on testwiki
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
jkfsdfpefdsfwoirpoik, BATCH_SIZE, null) { // total gibberish, should not 
exist on testwiki
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
 assertEquals(results.getResults().size(), 0);
 assertEquals(results.getSuggestion(), );
-assertEquals(results.getContinueOffset(), 0);
+assertNull(results.getContinueOffset());
 completionLatch.countDown();
 }
 }.execute();
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
index 08d5bda..17c4d4c 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
@@ -19,22 +19,22 @@
 import java.util.Map;
 
 public class FullSearchArticlesTask extends 
ApiTaskFullSearchArticlesTask.FullSearchResults {
-private static final int MAX_RESULTS = 12;
-private static final String NUM_RESULTS_PER_QUERY = 
Integer.toString(MAX_RESULTS);
-
 private final Site site;
 private final String searchTerm;
+private final int maxResults;
 private final

[MediaWiki-commits] [Gerrit] Add SuggestionsTask - change (apps...wikipedia)

2014-11-18 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/174365

Change subject: Add SuggestionsTask
..

Add SuggestionsTask

and refactor the getter for wikidataDescriptions

Change-Id: I3a05e9d66519a8da4d7b677282fea15b0f96573b
---
A wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
A 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
A wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
A wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
5 files changed, 207 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/65/174365/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
new file mode 100644
index 000..d4ac13b
--- /dev/null
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -0,0 +1,52 @@
+package org.wikipedia.test;
+
+import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.page.SuggestionsTask;
+import org.wikipedia.search.FullSearchResult;
+import android.content.Intent;
+import android.test.ActivityUnitTestCase;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for getting suggestions for further reading.
+ */
+public class SuggestionsTaskTests extends 
ActivityUnitTestCaseTestDummyActivity {
+private static final int TASK_COMPLETION_TIMEOUT = 20;
+private static final int BATCH_SIZE = 3;
+private static final Site SITE = new Site(test.wikipedia.org);
+
+public SuggestionsTaskTests() {
+super(TestDummyActivity.class);
+}
+
+public void testFullTextSearchWithResults() throws Throwable {
+startActivity(new Intent(), null, null);
+final CountDownLatch completionLatch = new CountDownLatch(1);
+runTestOnUiThread(new Runnable() {
+@Override
+public void run() {
+final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
+new SuggestionsTask(app.getAPIForSite(SITE), SITE, test) {
+@Override
+public void onCatch(Throwable caught) {
+super.onCatch(caught);
+}
+
+@Override
+public void onFinish(FullSearchResults results) {
+assertNotNull(results);
+assertEquals(results.getResults().size(), BATCH_SIZE);
+
+for (FullSearchResult result : results.getResults()) {
+
assertFalse(result.getTitle().getPrefixedText().equals(Test));
+}
+completionLatch.countDown();
+}
+}.execute();
+}
+});
+assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
+}
+}
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
 
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
new file mode 100644
index 000..fdf8033
--- /dev/null
+++ 
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
@@ -0,0 +1,55 @@
+package org.wikipedia.test;
+
+import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.wikidata.WikidataDescriptionsTask;
+import org.wikipedia.wikidata.WikidataSite;
+import android.content.Intent;
+import android.test.ActivityUnitTestCase;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests retrieval of Wikidata descriptions. Talks to wikidata.org.
+ */
+public class WikidataDescriptionFeederTests extends 
ActivityUnitTestCaseTestDummyActivity {
+private static final int TASK_COMPLETION_TIMEOUT = 20;
+private static final Site SITE = new WikidataSite();
+
+public WikidataDescriptionFeederTests() {
+super(TestDummyActivity.class);
+}
+
+public void testOneID() throws Throwable {
+getWikidataDescriptions(new String[] {Q42});
+}
+
+public void testThreeIDs() throws Throwable {
+getWikidataDescriptions(new String[] {Q1, Q2, Q3});
+}
+
+public void getWikidataDescriptions(final String[] ids) throws Throwable {
+final ArrayListString idList = new 
ArrayListString(Arrays.asList(ids));
+startActivity(new Intent(), null, null);
+final CountDownLatch completionLatch = new CountDownLatch(1);
+runTestOnUiThread(new Runnable() {
+

[MediaWiki-commits] [Gerrit] Fix conversion parameter in an older translation - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180550

Change subject: Fix conversion parameter in an older translation
..

Fix conversion parameter in an older translation

This would have caused a crash.
Also added more (commented out) logging for TranslationTests.

Change-Id: I8975962486841d236ebab77264a6ac98e90a360c
(cherry picked from commit 8d72e2c8f1d0a4d5bfda0049fb5a380d3bbba39c)
---
M wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
M wikipedia/res/values-ka/strings.xml
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/50/180550/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
index dc9a5dc..a63c750 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/TranslationTests.java
@@ -170,8 +170,9 @@
 }
 
 public void checkTranslationHasParameter(Res res, String paramName, Object 
val1, String alternateFormat) {
+//Log.i(TAG, myLocale + : + res.name);
 String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, val1);
-//Log.i(TAG, myLocale + : + translatedString);
+//Log.d(TAG, translatedString);
 if (!translatedString.contains(String.format(paramName, val1))
  (alternateFormat == null || 
!translatedString.contains(alternateFormat))) {
 final String msg = myLocale + : + res.name +  =  + 
translatedString + ' doesn't contain  + val1;
diff --git a/wikipedia/res/values-ka/strings.xml 
b/wikipedia/res/values-ka/strings.xml
index 7128752..f3b4eda 100644
--- a/wikipedia/res/values-ka/strings.xml
+++ b/wikipedia/res/values-ka/strings.xml
@@ -221,5 +221,5 @@
   string name=gallery_menu_more_infoმეტი ინფორმაცია/string
   string name=menu_gallery_visit_pageგადადით ფაილის გვერდზე/string
   string name=gallery_error_draw_failedსურათის ჩასმა შეუძლებელია./string
-  string name=gallery_license_text fuzzy=trueლიცენზია: %/string
+  string name=gallery_license_text fuzzy=trueლიცენზია: %s/string
 /resources

-- 
To view, visit https://gerrit.wikimedia.org/r/180550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8975962486841d236ebab77264a6ac98e90a360c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Material design icon for share action - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180570

Change subject: Material design icon for share action
..

Material design icon for share action

Dark only since it's currently used only by gallery.

Change-Id: Id654eb7d419db7ed725fcc0a4137263f410e0ba5
---
A icon-svgs/24/ic_share_dark.svg
A wikipedia/res/drawable-hdpi/ic_share_dark.png
A wikipedia/res/drawable-ldpi/ic_share_dark.png
A wikipedia/res/drawable-ldrtl-hdpi/ic_share_dark.png
A wikipedia/res/drawable-ldrtl-ldpi/ic_share_dark.png
A wikipedia/res/drawable-ldrtl-mdpi/ic_share_dark.png
A wikipedia/res/drawable-ldrtl-xhdpi/ic_share_dark.png
A wikipedia/res/drawable-ldrtl-xxhdpi/ic_share_dark.png
A wikipedia/res/drawable-mdpi/ic_share_dark.png
A wikipedia/res/drawable-xhdpi/ic_share_dark.png
A wikipedia/res/drawable-xxhdpi/ic_share_dark.png
M wikipedia/res/menu/menu_gallery.xml
12 files changed, 56 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/70/180570/1

diff --git a/icon-svgs/24/ic_share_dark.svg b/icon-svgs/24/ic_share_dark.svg
new file mode 100644
index 000..024ff5b
--- /dev/null
+++ b/icon-svgs/24/ic_share_dark.svg
@@ -0,0 +1,55 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+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;
+   width=24
+   height=24
+   viewBox=0 0 24 24
+   id=svg3059
+   version=1.1
+   inkscape:version=0.48.5 r10040
+   sodipodi:docname=ic_share.svg
+  metadata
+ id=metadata3067
+rdf:RDF
+  cc:Work
+ rdf:about=
+dc:formatimage/svg+xml/dc:format
+dc:type
+   rdf:resource=http://purl.org/dc/dcmitype/StillImage; /
+  /cc:Work
+/rdf:RDF
+  /metadata
+  defs
+ id=defs3065 /
+  sodipodi:namedview
+ pagecolor=#ff
+ bordercolor=#66
+ borderopacity=1
+ objecttolerance=10
+ gridtolerance=10
+ guidetolerance=10
+ inkscape:pageopacity=0
+ inkscape:pageshadow=2
+ inkscape:window-width=640
+ inkscape:window-height=480
+ id=namedview3063
+ showgrid=false
+ inkscape:zoom=9.833
+ inkscape:cx=12
+ inkscape:cy=12
+ inkscape:window-x=0
+ inkscape:window-y=0
+ inkscape:window-maximized=0
+ inkscape:current-layer=svg3059 /
+  path
+ d=m 18,16.08 c -0.76,0 -1.44,0.3 -1.96,0.77 L 8.91,12.7 C 8.96,12.47 
9,12.24 9,12 9,11.76 8.96,11.53 8.91,11.3 L 15.96,7.19 C 16.5,7.69 17.21,8 18,8 
19.66,8 21,6.66 21,5 21,3.34 19.66,2 18,2 c -1.66,0 -3,1.34 -3,3 0,0.24 
0.04,0.47 0.09,0.7 L 8.04,9.81 C 7.5,9.31 6.79,9 6,9 4.34,9 3,10.34 3,12 c 
0,1.66 1.34,3 3,3 0.79,0 1.5,-0.31 2.04,-0.81 l 7.12,4.16 c -0.05,0.21 
-0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92 
0,-1.61 -1.31,-2.92 -2.92,-2.92 z
+ id=path3061
+ style=fill:#FF;fill-opacity:0.8
+ inkscape:connector-curvature=0 /
+/svg
diff --git a/wikipedia/res/drawable-hdpi/ic_share_dark.png 
b/wikipedia/res/drawable-hdpi/ic_share_dark.png
new file mode 100644
index 000..ae05125
--- /dev/null
+++ b/wikipedia/res/drawable-hdpi/ic_share_dark.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldpi/ic_share_dark.png 
b/wikipedia/res/drawable-ldpi/ic_share_dark.png
new file mode 100644
index 000..a4f0031
--- /dev/null
+++ b/wikipedia/res/drawable-ldpi/ic_share_dark.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_share_dark.png 
b/wikipedia/res/drawable-ldrtl-hdpi/ic_share_dark.png
new file mode 100644
index 000..e08f08a
--- /dev/null
+++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_share_dark.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_share_dark.png 
b/wikipedia/res/drawable-ldrtl-ldpi/ic_share_dark.png
new file mode 100644
index 000..d4469e1
--- /dev/null
+++ b/wikipedia/res/drawable-ldrtl-ldpi/ic_share_dark.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_share_dark.png 
b/wikipedia/res/drawable-ldrtl-mdpi/ic_share_dark.png
new file mode 100644
index 000..a8d6e09
--- /dev/null
+++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_share_dark.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_share_dark.png 
b/wikipedia/res/drawable-ldrtl-xhdpi/ic_share_dark.png
new file mode 100644
index 000..a6e0cc7
--- /dev/null
+++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_share_dark.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_share_dark.png 
b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_share_dark.png
new file mode 100644
index 000..3549497
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] Avoid StackOverflowError when initializing channel preference - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180652

Change subject: Avoid StackOverflowError when initializing channel preference
..

Avoid StackOverflowError when initializing channel preference

No recursion of getChannel() anymore.

Bug: T78833
Change-Id: Idd8fd49002bc24750b6a1fa0f8550350cd53ee29
---
M wikipedia/src/main/java/org/wikipedia/Utils.java
1 file changed, 6 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/52/180652/1

diff --git a/wikipedia/src/main/java/org/wikipedia/Utils.java 
b/wikipedia/src/main/java/org/wikipedia/Utils.java
index da00f1e..b93ebaf 100644
--- a/wikipedia/src/main/java/org/wikipedia/Utils.java
+++ b/wikipedia/src/main/java/org/wikipedia/Utils.java
@@ -676,10 +676,9 @@
 
 /**
  * Returns the distribution channel for the app from AndroidManifest.xml
- * @param ctx
  * @return The channel (the empty string if not defined)
  */
-public static String getChannelDescriptor(Context ctx) {
+private static String getChannelDescriptor(Context ctx) {
 try {
 ApplicationInfo a = 
ctx.getPackageManager().getApplicationInfo(ctx.getPackageName(), 
PackageManager.GET_META_DATA);
 String channel = a.metaData.getString(PrefKeys.getChannel());
@@ -692,27 +691,22 @@
 
 /**
  * Sets the distribution channel for the app into SharedPreferences
- * @param ctx
  */
-public static void setChannel(Context ctx) {
+private static void setChannel(Context ctx, String channel) {
 SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(ctx);
-String channel = getChannelDescriptor(ctx);
 prefs.edit().putString(PrefKeys.getChannel(), channel).apply();
 }
 
 /**
  * Gets the distribution channel for the app from SharedPreferences
- * @param ctx
  */
 public static String getChannel(Context ctx) {
 SharedPreferences prefs = 
PreferenceManager.getDefaultSharedPreferences(ctx);
 String channel = prefs.getString(PrefKeys.getChannel(), null);
-if (channel != null) {
-return channel;
-} else {
-setChannel(ctx);
-return getChannel(ctx);
+if (channel == null) {
+channel = getChannelDescriptor(ctx);
+setChannel(ctx, channel);
 }
+return channel;
 }
-
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/180652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd8fd49002bc24750b6a1fa0f8550350cd53ee29
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update Gradle plugin to 1.0.0 - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180722

Change subject: Update Gradle plugin to 1.0.0
..

Update Gradle plugin to 1.0.0

Change-Id: I043abccd6d7c04e28ef0031cab4afbd50a801776
---
M build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/22/180722/1

diff --git a/build.gradle b/build.gradle
index a4fa3fa..c9b3b44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@
 jcenter()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:1.0.0-rc4'
+classpath 'com.android.tools.build:gradle:1.0.0'
 
 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files

-- 
To view, visit https://gerrit.wikimedia.org/r/180722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I043abccd6d7c04e28ef0031cab4afbd50a801776
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update README for Android Studio 1.0.0 - change (apps...wikipedia)

2014-12-17 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180723

Change subject: Update README for Android Studio 1.0.0
..

Update README for Android Studio 1.0.0

Change-Id: I6678f620564c569944675344806c8326e417af12
---
M README.mediawiki
1 file changed, 44 insertions(+), 141 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/23/180723/1

diff --git a/README.mediawiki b/README.mediawiki
index e6c3210..ff5bbeb 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -4,165 +4,57 @@
 
 These instructions should help you download the Wikipedia for Android source 
code and get the latest version running in an emulator or on a real Android 
device. Some of the steps assume you are using bash but should be easily 
translatable for other shells as well. We've written theses instructions 
initially for OS X but most should also work on Linux and Windows. But anyway, 
here we go for those who enjoy a fun side project for a good cause...
 
-=== Git ===
-
-We assume you already have Git installed. If you've never used Git, you will 
need to search the web on how to add git to the system from Apple Xcode, and 
then study on how to use git (look for material on https://mediawiki.org for 
git convention as practiced by MediaWiki programmers).
-
-In the parent directory of your programming projects, run the following 
commands:
- git clone https://git.wikimedia.org/git/apps/android/wikipedia.git
-
-Assuming the git clone operation worked, you will have a new folder 
representing the freshly cloned repository, wikipedia.
-
-It is recommended to rename the folder for the wikipedia repository to 
ensure you know which OS it's for (there's an iOS app by the name of 
wikipedia, too, so it's good to have different folder names at the root of 
the repos).
- mv wikipedia/ android-wikipedia/
-
 === Install Java SDK ===
 
 The Java SDK 7 or higher (aka. JDK) is needed to build Android apps. To test:
  javac -version
 
-=== Install Android SDK ===
+=== Install Android Studio and Android SDK ===
 
-It's probably best to install the Android SDK separately from Android Studio 
-- instead of the bundle.
-
- On a Mac you can use brew 
-Install brew if you don't already have it. Instructions are at http://brew.sh.
-
-Install Android SDK
- brew update
- brew doctor
- brew install android
-
- Other Platforms 
-Download the SDK Tools from http://developer.android.com/sdk/index.html#Other
-
- All Platforms 
-Update your ~/.bash_profile file to set the $ANDROID_HOME variable to point to 
the 'sdk' folder contained in the compressed file you just extracted and to 
update your system path to point at some binaries.
-
- export ANDROID_HOME=/usr/local/opt/android-studio-sdk
- export PATH=$ANDROID_HOME/tools:$PATH
-
-Source your your ~/.bash_profile
-
- source ~/.bash_profile
-
-Now, and any time you open a new Terminal, the $ANDROID_HOME variable will be 
set automatically and you'll be able to run command line tools pertinent to 
Android software development, such as the tool aptly named android.
-
-Install the Android SDK components needed for the Wikipedia Android app:
- android update sdk -u --filter 
tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository
-
-After you accept the licenses, this will download and install the necessary 
SDK components for you to build the app.
-
-You can find more components via:
- android list sdk -e -a
-
-Alternatively, you can use the GUI:
- android 
-
-This will load a GUI tool called Android SDK Manager for managing the 
Android-related packages necessary for Android programming.
-
-You may want to install some more packages from there.
-
-=== Optional: Install Android Emulator ===
-
-It's usually best to run the app on real devices, but sometimes it's useful to 
use an emulator when a certain physical device is not available, like a 
different form factor (7, 10 tablet, ...).
-
-If planning to use Android emulators, consider adding the System Image 
packages of various API levels in in the Android SDK Manager.
-Example:
-* ARM EABI v7a System Image (API 21)
-
-You'll probably also want to install the HAXM installer package from the 
Extras category at the bottom.
-* Intel X86 Emulator Accelerator (HAXM installer)
-
-Once you're satisfied that everything has been downloaded and installed, feel 
free to close the Android SDK Manager.
-
-If you've downloaded the Intel HAXM installer you're not done yet. You also 
need to run the installer. (Sometimes it's also useful to run it later again).
-You can find the dmg in 
$ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager.
-Select a good memory limit. It depends on your machine. Some got it set to 
2048 MB.
-
-
-To set up actual emulators you'd want to run the following command in Terminal 
(or from Android Studio):
-
- android avd 
-
-This will launch the Android

[MediaWiki-commits] [Gerrit] Go to first suggestion on search submit - change (apps...wikipedia)

2014-12-18 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180848

Change subject: Go to first suggestion on search submit
..

Go to first suggestion on search submit

Bug: T78749
Change-Id: I5477a6d7fee3339febea6646ce27c4b9a88da9eb
---
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
3 files changed, 27 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/48/180848/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
index 1a8eaf7..249e103 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
@@ -13,6 +13,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Adapter;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -233,6 +234,15 @@
 }.execute();
 }
 
+public PageTitle getFirstSuggestion() {
+Adapter adapter = searchResultsList.getAdapter();
+if (adapter.getCount()  0) {
+return (PageTitle) adapter.getItem(0);
+} else {
+return null;
+}
+}
+
 private final class SearchResultAdapter extends BaseAdapter {
 private ListPageTitle results;
 private final LayoutInflater inflater;
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e6d2fb7..db4e4a4 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -425,10 +425,16 @@
 private final SearchView.OnQueryTextListener searchQueryListener = new 
SearchView.OnQueryTextListener() {
 @Override
 public boolean onQueryTextSubmit(String queryText) {
-if (isValidQuery(queryText)) {
-navigateToTitle(queryText);
+PageTitle firstSuggestion = null;
+if (getActivePanel() == PANEL_TITLE_SEARCH) {
+firstSuggestion = titleSearchFragment.getFirstSuggestion();
+} else if (getActivePanel() == PANEL_FULL_SEARCH) {
+firstSuggestion = fullSearchFragment.getFirstSuggestion();
 }
-closeSearch();
+if (firstSuggestion != null) {
+navigateToTitle(firstSuggestion);
+closeSearch();
+}
 return true;
 }
 
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
index 7fb5242..988211d 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
@@ -203,6 +203,14 @@
 searchHandler.sendMessageDelayed(searchMessage, DELAY_MILLIS);
 }
 
+public PageTitle getFirstSuggestion() {
+if (adapter.getCount()  0) {
+return (PageTitle) adapter.getItem(0);
+} else {
+return null;
+}
+}
+
 private final class SearchResultAdapter extends BaseAdapter {
 private ListPageTitle results;
 private final LayoutInflater inflater;

-- 
To view, visit https://gerrit.wikimedia.org/r/180848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5477a6d7fee3339febea6646ce27c4b9a88da9eb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 Android string translations from TWN - change (apps...wikipedia)

2014-12-19 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/181176

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: I4055c53ace87e2687be6705359f8f0bfaa56b426
---
M wikipedia/res/values-bn/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-gl/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-ko/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-nl/strings.xml
M wikipedia/res/values-pt-rBR/strings.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sk/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-zh/strings.xml
15 files changed, 188 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/76/181176/1

diff --git a/wikipedia/res/values-bn/strings.xml 
b/wikipedia/res/values-bn/strings.xml
index 2934f46..18fd792 100644
--- a/wikipedia/res/values-bn/strings.xml
+++ b/wikipedia/res/values-bn/strings.xml
@@ -223,8 +223,8 @@
   string name=abusefilter_title_disallowআপনি এই সম্পাদনা সংরক্ষণ করতে 
পারবেন না। দয়া করে ফিরে যান ও এটি পরিবর্তন করুন।/string
   string name=abusefilter_text_warnএকটি স্বয়ংক্রিয় ফিল্টার এই সম্পাদনা 
সম্ভাব্য অ-গঠনমূলক হিসাবে চিহ্নিত করেছে। এতে নিম্নলিখিতগুলি এক বা একাধিক বার 
থাকতে পারে:lt;br /gt;lt;br /gt;· নিবন্ধ খালি করা বা স্প্যামিং করাlt;br 
/gt;· অপ্রাসঙ্গিক বাহ্যিক লিঙ্ক বা ছবিlt;br /gt;· অক্ষরের 
পুনরাবৃত্তি/string
   string name=abusefilter_text_disallowএকটি স্বয়ংক্রিয় ফিল্টার এই 
সম্পাদনা সম্ভাব্য অ-গঠনমূলক বা ধ্বংসপ্রবণতার প্রচেষ্টা হিসাবে চিহ্নিত 
করেছে।lt;br /gt;lt;br /gt;উইকিপিডিয়া একটি বিশ্বকোষ এবং শুধুমাত্র নিরপেক্ষ, 
উল্লেখযোগ্য বিষয়বস্তু এখানে অন্তর্ভুক্ত হবে।/string
-  string name=dialog_page_issuesপাতার ইস্যু/string
-  string name=button_page_issuesপাতার ইস্যু/string
+  string name=dialog_page_issuesপাতার সমস্যা/string
+  string name=button_page_issuesপাতার সমস্যা/string
   string name=menu_themechooserফন্ট ও থিম/string
   string name=text_size_selectফন্টের আকার/string
   string name=color_theme_selectথিম/string
diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 01022e9..47dafc8 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -276,4 +276,9 @@
   string name=gallery_license_textLizenz – %s/string
   string name=gallery_credit_textUrheber – %s/string
   string name=gallery_image_infoBildinformation/string
+  string name=gallery_menu_shareTeilen/string
+  string name=gallery_share_errorBild konnte nicht geteilt werden: 
%s/string
+  string name=gallery_menu_saveIn Gerät speichern/string
+  string name=gallery_save_errorBild konnte nicht gespeichert werden: 
%s/string
+  string name=gallery_save_successBild erfolgreich gespeichert./string
 /resources
diff --git a/wikipedia/res/values-fr/strings.xml 
b/wikipedia/res/values-fr/strings.xml
index b6df9f6..f274bd5 100644
--- a/wikipedia/res/values-fr/strings.xml
+++ b/wikipedia/res/values-fr/strings.xml
@@ -273,6 +273,12 @@
   string name=menu_gallery_visit_pageAller à la page du fichier/string
   string name=gallery_error_draw_failedImpossible de dessiner 
l’image./string
   string name=license_titleTexte de la licence pour la bibliothèque 
%s/string
-  string name=gallery_license_text fuzzy=trueLicence : %s/string
-  string name=gallery_credit_text fuzzy=trueRemerciements : %s/string
+  string name=gallery_license_textLicence — %s/string
+  string name=gallery_credit_textAuteur — %s/string
+  string name=gallery_image_infoInformation sur l’image/string
+  string name=gallery_menu_sharePartager/string
+  string name=gallery_share_errorImpossible de partager l’image : 
%s/string
+  string name=gallery_menu_saveEnregistrer sur l’appareil/string
+  string name=gallery_save_errorImpossible d’enregistrer l’image : 
%s/string
+  string name=gallery_save_successImage bien enregistrée./string
 /resources
diff --git a/wikipedia/res/values-gl/strings.xml 
b/wikipedia/res/values-gl/strings.xml
index 3d5e0e6..b5e46e1 100644
--- a/wikipedia/res/values-gl/strings.xml
+++ b/wikipedia/res/values-gl/strings.xml
@@ -44,11 +44,17 @@
   string name=nav_item_nearbyPreto/string
   string name=menu_update_nearbyActualizar preto/string
   string name=nearby_empty_titleNon hai páxinas achegadas aquí!/string
+  string name=nearby_empty_messageCando se mova a unha nova localización 
probe a actualizar esta páxina para aprender máis sobre o que o rodea./string
   string name=nearby_distance_in_meters%d m/string
   string name=nearby_distance_in_kilometers%.2f km/string
   string name=nearby_distance_in_feet%d pés/string
   string name=nearby_distance_in_miles%.2f millas/string
   string name=nearby_no_networkNon

[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)

2014-12-19 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/181203

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: I9a1d7c35cc8b0cf696ee62d2f914e430d7487ec6
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/03/181203/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index d86b798..c2227ea 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -9,7 +9,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 10
 targetSdkVersion 21
-versionCode 90
+versionCode 91
 testApplicationId org.wikipedia.test
 }
 signingConfigs {

-- 
To view, visit https://gerrit.wikimedia.org/r/181203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a1d7c35cc8b0cf696ee62d2f914e430d7487ec6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Share a fact - change (apps...wikipedia)

2014-12-19 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/181223

Change subject: Share a fact
..

Share a fact

- Refactored the GalleryActivity's image sharing code to be reusable.
- Reused it for Tweet a fact
- Currently it uses the lead image as the image to be share,
   plus the mainly static teaser text.

Change-Id: Ib78821dcb772c9b5811f1c8f2bbdefb77a826844
(cherry picked from commit 5f9e08b69572108e9669a55032903f8cbe052ea4)
---
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
A wikipedia/src/main/java/org/wikipedia/util/ShareUtils.java
7 files changed, 124 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/23/181223/1

diff --git a/wikipedia/res/values-qq/strings.xml 
b/wikipedia/res/values-qq/strings.xml
index 14b98d4..4bdedcf 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -379,4 +379,5 @@
   string name=gallery_menu_saveLabel for menu item to save the current 
image to the Media collection on the local device./string
   string name=gallery_save_errorError message shown when there was a 
problem with saving the image to the local device. The \%s\ symbol is 
replaced with the actual error message from the system./string
   string name=gallery_save_successToast message shown when the current 
image was saved successfully to the local device./string
+  string name=snippet_share_introIntro text included as part of the shared 
text snippet, aka Tweet-a-fact./string
 /resources
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 1aa19ca..0a89938 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -289,4 +289,5 @@
 string name=gallery_menu_saveSave to device/string
 string name=gallery_save_errorCould not save image: %s/string
 string name=gallery_save_successImage saved successfully./string
+string name=snippet_share_introInteresting fact on @Wikipedia about 
%1$s: %2$s/string
 /resources
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index f3d824f..00a5daa 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -21,6 +21,7 @@
 import org.wikipedia.settings.PrefKeys;
 import org.wikipedia.staticdata.MainPageNameData;
 import org.wikipedia.theme.ThemeChooserDialog;
+import org.wikipedia.util.ShareUtils;
 import org.wikipedia.zero.ZeroMessage;
 
 import com.squareup.otto.Bus;
@@ -33,6 +34,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.BadParcelableException;
 import android.os.Build;
@@ -55,6 +57,7 @@
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class PageActivity extends ThemedActionBarActivity {
 public static final String ACTION_PAGE_FOR_TITLE = 
org.wikipedia.page_for_title;
@@ -748,12 +751,36 @@
 @Override
 public boolean onMenuItemClick(MenuItem item) {
 
-// TODO: implement sharing of image with quote!
+shareSnippet();
 
 if (webViewActionMode != null) {
 webViewActionMode.finish();
 }
 return true;
+}
+
+private void shareSnippet() {
+// TODO: create sharable image with selected text
+// currently only using lead image
+
+PageTitle title = getCurPageFragment().getTitle();
+String text = getString(R.string.snippet_share_intro,
+title.getDisplayText(),
+title.getCanonicalUri());
+
+Bitmap leadImageBitmap = 
getCurPageFragment().getLeadImageBitmap();
+
+if (leadImageBitmap != null) {
+ShareUtils.shareImage(PageActivity.this, 
leadImageBitmap, */*,
+title.getDisplayText(), text);
+} else {
+// TODO: remove if check once we build our own image
+// For now, as we're using the lead image we may not 
always have one,
+// esp. on the main page.
+

[MediaWiki-commits] [Gerrit] Manual import of Android string translations from TWN - change (apps...wikipedia)

2014-12-29 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/182086

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: I2fabfd50368be646c1a371a559504de150aa93b5
---
M wikipedia/res/values-nb/strings.xml
M wikipedia/res/values-nl/strings.xml
M wikipedia/res/values-qq/strings.xml
3 files changed, 21 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/86/182086/1

diff --git a/wikipedia/res/values-nb/strings.xml 
b/wikipedia/res/values-nb/strings.xml
index 3fec1e0..508b79f 100644
--- a/wikipedia/res/values-nb/strings.xml
+++ b/wikipedia/res/values-nb/strings.xml
@@ -11,7 +11,7 @@
   string name=search_hintSøk i Wikipedia/string
   string name=history_activity_titleLogg/string
   string name=nav_item_historyLogg/string
-  string name=error_network_errorIngen nettverksforbindelse :(/string
+  string name=error_network_errorDet er ingen nettverksforbindelse 
:(/string
   string name=search_network_errorNettverksfeil. Trykk for å prøve 
igjen./string
   string name=page_error_retryPrøv igjen/string
   string name=menu_clear_all_historyTøm logg/string
@@ -36,7 +36,7 @@
   string name=toast_saved_page_missing_imagesKunne ikke lagre alle 
bilder/string
   string name=toast_save_page_failedLagring av siden feilet :(/string
   string name=toast_refresh_saved_pageGjenoppfrisker lagret side…/string
-  string name=delete_selected_saved_pagesSlett/string
+  string name=delete_selected_saved_pagesFjern/string
   string name=toast_saved_page_deletedSiden(e) ble fjernet/string
   string name=saved_pages_search_list_hintSøk/string
   string name=saved_pages_search_empty_messageFant ingen sider som matchet 
spørringen din./string
@@ -80,7 +80,7 @@
   string name=search_no_results_foundIngen resultater ble funnet/string
   string name=edit_section_captcha_messageFor å beskytte mot automatisk 
spam, vær vennlig å skrive inn ordene som vises under/string
   string name=edit_section_captcha_hintGjenta ordene ovenfor/string
-  string name=title_captchaFyll inn captcha/string
+  string name=title_captchaFyll inn CAPTCHA/string
   string name=edit_section_abusefilter_back_textGjør endringer i min 
redigering/string
   string name=edit_section_captcha_reloadTrykk på CAPTCHA for å laste inn 
på nytt/string
   string name=edit_saved_page_refreshDenne lagrede siden kan være 
utdatert, og må gjenoppfriskes for å kunne redigeres. Vil du gjenoppfriske 
siden?/string
@@ -105,9 +105,9 @@
   string name=toast_logout_completeLogget ut/string
   string name=saved_pages_empty_titleIngen lagrede sider her!/string
   string name=saved_pages_empty_messageLagrede sider er veldig praktisk. 
Tenk på dem som bokmerker som du også kan lese når du er offline./string
-  string name=history_empty_titleIngen besøkte sider./string
-  string name=history_empty_messageDu har kanskje tømt loggen. Neste gang 
du besøker en side kan du finne den igjen her etterpå./string
-  string name=delete_selected_historySlett/string
+  string name=history_empty_titleIngen besøkte sider her!/string
+  string name=history_empty_messageDu har antakelig fjernet alle sammen. 
Neste gang du besøker en side kan du etterpå finne den igjen her./string
+  string name=delete_selected_historyFjern/string
   string 
name=wp_stylizedlt;biggt;Wlt;/biggt;IKIPEDIlt;biggt;Alt;/biggt;/string
   string name=wp_tag_lineDen frie encyklopedi/string
   string name=skipHopp over/string
@@ -129,7 +129,7 @@
   string name=create_account_noname_errorBrukernavnet du oppga er ugyldig. 
Vennligst oppgi et annet brukernavn./string
   string name=create_account_invalid_email_errorEpost-adressen du oppga er 
ugyldig./string
   string name=create_account_password_too_short_errorPassordet du oppga er 
for kort./string
-  string name=create_account_blocked_anon_errorDu kan ikke opprette en 
konto fordi IP-en din er blokkert./string
+  string name=create_account_blocked_anon_errorDu kan ikke opprette en 
konto fordi IP-adressen din er blokkert./string
   string name=create_account_blocked_errorDu kan ikke opprette en konto 
fordi kontoen din er blokkert./string
   string name=create_account_password_name_match_errorBrukernavnet og 
passordet kan ikke være like./string
   string name=create_account_generic_errorKunne ikke opprette 
konto/string
@@ -147,7 +147,7 @@
   string name=zero_interstitial_titleForlater Wikipedia Zero/string
   string name=zero_interstitial_leave_appDatakostnader kan påløpe. 
Fortsette til eksternt nettsted?/string
   string name=zero_interstitial_continueForlat appen/string
-  string name=zero_interstitial_cancelForbli her/string
+  string name=zero_interstitial_cancelBli her/string
   string name=zero_learn_moreDatakostnader påløper ikke for denne 
Wikipedia-appen./string
   string name=zero_learn_more_learn_moreLær mer/string
   string

[MediaWiki-commits] [Gerrit] Manual import of iOS string translations from TWN - change (apps...wikipedia)

2014-12-29 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/182087

Change subject: Manual import of iOS string translations from TWN
..

Manual import of iOS string translations from TWN

Change-Id: I8d7def9fea5dae6797202b9f2fee8f5fcc381fb1
---
M wikipedia/nl.lproj/Localizable.strings
M wikipedia/ru.lproj/Localizable.strings
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/87/182087/1

diff --git a/wikipedia/nl.lproj/Localizable.strings 
b/wikipedia/nl.lproj/Localizable.strings
index 09f5f0d..333aa71 100644
--- a/wikipedia/nl.lproj/Localizable.strings
+++ b/wikipedia/nl.lproj/Localizable.strings
@@ -85,6 +85,10 @@
 search-within-articles = In paginatekst;
 search-did-you-mean = Bedoelde u $1?;
 search-recent-title = Recente zoekopdrachten;
+search-recent-clear-confirmation-heading = Alle recente zoekopdrachten 
verwijderen?;
+search-recent-clear-confirmation-sub-heading = Deze handeling kan niet 
ongedaan worden gemaakt!;
+search-recent-clear-cancel = Annuleren;
+search-recent-clear-delete-all = Alles verwijderen;
 main-menu-title = Meer;
 main-menu-language-title = Zoeken in Wikipedia in het $1;
 main-menu-language-toggle-show = Talen bekijken;
diff --git a/wikipedia/ru.lproj/Localizable.strings 
b/wikipedia/ru.lproj/Localizable.strings
index 394c38a..b8b7c6d 100644
--- a/wikipedia/ru.lproj/Localizable.strings
+++ b/wikipedia/ru.lproj/Localizable.strings
@@ -199,7 +199,7 @@
 abuse-filter-warning-heading = Эта правка выглядит деструктивной. Вы 
уверены, что хотите сохранить её?;
 abuse-filter-warning-subheading = Ваша правка может содержать одно или 
несколько из следующих действий:;
 abuse-filter-warning-caps = Печать ЗАГЛАВНЫМИ БУКВАМИ;
-abuse-filter-warning-blanking = Заготовка статьи или спам;
+abuse-filter-warning-blanking = Пустая статья или спам;
 abuse-filter-warning-irrelevant = Нерелевантные внешние ссылки или 
изображения;
 abuse-filter-warning-repeat = Повторяющиеся символы;
 abuse-filter-disallow-heading = Вы не можете сохранить эту правку. 
Пожалуйста, вернитесь назад и измените её.;

-- 
To view, visit https://gerrit.wikimedia.org/r/182087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d7def9fea5dae6797202b9f2fee8f5fcc381fb1
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix string parameter format error - change (apps...wikipedia)

2014-12-29 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/182098

Change subject: Fix string parameter format error
..

Fix string parameter format error

Would have caused a crash in the lb locale.

Change-Id: I770a204a452569e90213c2a4be359d1b95720d06
---
M wikipedia/res/values-lb/strings.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/98/182098/1

diff --git a/wikipedia/res/values-lb/strings.xml 
b/wikipedia/res/values-lb/strings.xml
index 2e52d25..9252240 100644
--- a/wikipedia/res/values-lb/strings.xml
+++ b/wikipedia/res/values-lb/strings.xml
@@ -253,6 +253,6 @@
   string name=gallery_image_infoInformatioun iwwert d\'Bild/string
   string name=gallery_menu_shareDeelen/string
   string name=gallery_menu_saveUm Apparat späicheren/string
-  string name=gallery_save_errorBild konnt net gespspäichert ginn: 
%$/string
+  string name=gallery_save_errorBild konnt net gespspäichert ginn: 
%s/string
   string name=gallery_save_successBild gespäichert./string
 /resources

-- 
To view, visit https://gerrit.wikimedia.org/r/182098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I770a204a452569e90213c2a4be359d1b95720d06
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove unused string - change (apps...wikipedia)

2014-12-29 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/182100

Change subject: Remove unused string
..

Remove unused string

Was confusing translators.
https://translatewiki.net/wiki/Thread:Support/About_Wikimedia:Wikipedia-android-strings-edit_section_abusefilter_back_text/en

Bug: T69981
Change-Id: Ibc34465e9128d5258d4fc28cb02c60e1771357a2
---
M wikipedia/res/values/strings.xml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/00/182100/1

diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 1aa19ca..608fca5 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -90,7 +90,6 @@
 string name=edit_section_captcha_messageTo help protect against 
automated spam, please enter the words that appear below/string
 string name=edit_section_captcha_hintRepeat words from above/string
 string name=title_captchaEnter CAPTCHA/string
-string name=edit_section_abusefilter_back_textMake changes to my 
edit/string
 string name=edit_section_captcha_reloadTap CAPTCHA to reload/string
 string name=edit_saved_page_refreshThis saved page may be out of date, 
and must be refreshed for editing to be enabled. Would you like to refresh the 
page?/string
 string name=nav_item_loginLog in/string

-- 
To view, visit https://gerrit.wikimedia.org/r/182100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc34465e9128d5258d4fc28cb02c60e1771357a2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Wikidata descriptions retrieved via new PageTerms API - change (apps...wikipedia)

2014-12-04 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177740

Change subject: Wikidata descriptions retrieved via new PageTerms API
..

Wikidata descriptions retrieved via new PageTerms API

This patch affects retrieving descriptions for
- Full text search items
- Lead image
- Disambig items

Change-Id: I6b308f57de805b6d1193cf6b55e5d74307f1aaa0
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
A wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
M 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionsTaskTests.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/PageProperties.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
A wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataIdsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataSite.java
21 files changed, 215 insertions(+), 360 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/40/177740/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index f3322d1..ad7b104 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -16,11 +16,13 @@
 private static final int TASK_COMPLETION_TIMEOUT = 2;
 private static final int BATCH_SIZE = 12;
 private static final Site SITE = new Site(test.wikipedia.org);
+private static final Site EN_SITE = new Site(en.wikipedia.org);
 
 public FullSearchTaskTests() {
 super(TestDummyActivity.class);
 }
 
+/** Have to use enwiki since I don't think there are any Wikidata 
descriptions for testwiki. */
 public void testFullTextSearchWithResults() throws Throwable {
 startActivity(new Intent(), null, null);
 final CountDownLatch completionLatch = new CountDownLatch(1);
@@ -28,7 +30,7 @@
 @Override
 public void run() {
 final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
test, BATCH_SIZE, null) {
+new FullSearchArticlesTask(app.getAPIForSite(EN_SITE), 
EN_SITE, test, BATCH_SIZE, null) {
 @Override
 public void onFinish(FullSearchResults results) {
 assertNotNull(results);
@@ -38,7 +40,7 @@
 
 for (FullSearchResult result : results.getResults()) {
 if 
(result.getTitle().getPrefixedText().equals(Test)) {
-assertEquals(result.getWikiBaseId(), Q377);
+assertEquals(result.getDescription(), 
Wikipedia disambiguation page);
 }
 }
 completionLatch.countDown();
@@ -49,25 +51,27 @@
 assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
 }
 
-public void testFullTextSearchWithSuggestion() throws Throwable {
-startActivity(new Intent(), null, null);
-final CountDownLatch completionLatch = new CountDownLatch(1);
-runTestOnUiThread(new Runnable() {
-@Override
-public void run() {
-final WikipediaApp app = (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE, 
teest, BATCH_SIZE, null) { // small typo should produce a suggestion
-@Override
-public void onFinish(FullSearchResults results) {
-assertNotNull(results);
-

[MediaWiki-commits] [Gerrit] More error report content - change (apps...wikipedia)

2014-12-04 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177744

Change subject: More error report content
..

More error report content

Change-Id: I52a3572f8cb4605797115473325b5e529577c9c9
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/44/177744/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index a3192a9..f869563 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,5 +1,6 @@
 package org.wikipedia.page;
 
+import org.acra.ACRA;
 import org.wikipedia.NavDrawerFragment;
 import org.wikipedia.PageTitle;
 import org.wikipedia.R;
@@ -434,6 +435,9 @@
 }
 
 public void displayNewPage(final PageTitle title, final HistoryEntry 
entry) {
+ACRA.getErrorReporter().putCustomData(api, 
title.getSite().getApiDomain());
+ACRA.getErrorReporter().putCustomData(title, title.toString());
+
 if (drawerLayout.isDrawerOpen(Gravity.START)) {
 drawerLayout.closeDrawer(Gravity.START);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/177744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52a3572f8cb4605797115473325b5e529577c9c9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Title search gets descriptions, too - change (apps...wikipedia)

2014-12-04 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177752

Change subject: Title search gets descriptions, too
..

Title search gets descriptions, too

Now that we can easily get descriptions from our own API,
why not have them for both search types.

Using common data type for both full text and title search: PageTitle
Also using same layout for both fragments.

This will enable us to refactor things even more.
The two tasks and the two fragments have a lot of common code.

Change-Id: Ied3ca27a36e0ff26f7c8f5404289e8ecee062336
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
M 
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D wikipedia/res/layout/item_full_search_result.xml
M wikipedia/res/layout/item_search_result.xml
M wikipedia/src/main/java/org/wikipedia/PageTitle.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
D wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
15 files changed, 141 insertions(+), 149 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/52/177752/1

diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index ad7b104..8fc2854 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -1,9 +1,10 @@
 package org.wikipedia.test;
 
+import org.wikipedia.PageTitle;
 import org.wikipedia.Site;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.search.FullSearchArticlesTask;
-import org.wikipedia.search.FullSearchResult;
+
 import android.content.Intent;
 import android.test.ActivityUnitTestCase;
 import java.util.concurrent.CountDownLatch;
@@ -38,8 +39,8 @@
 assertEquals(results.getSuggestion(), );
 assertNotNull(results.getContinueOffset());
 
-for (FullSearchResult result : results.getResults()) {
-if 
(result.getTitle().getPrefixedText().equals(Test)) {
+for (PageTitle result : results.getResults()) {
+if (result.getPrefixedText().equals(Test)) {
 assertEquals(result.getDescription(), 
Wikipedia disambiguation page);
 }
 }
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java 
b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
index d4ac13b..b143bfd 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -1,9 +1,10 @@
 package org.wikipedia.test;
 
+import org.wikipedia.PageTitle;
 import org.wikipedia.Site;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.page.SuggestionsTask;
-import org.wikipedia.search.FullSearchResult;
+
 import android.content.Intent;
 import android.test.ActivityUnitTestCase;
 import java.util.concurrent.CountDownLatch;
@@ -39,8 +40,8 @@
 assertNotNull(results);
 assertEquals(results.getResults().size(), BATCH_SIZE);
 
-for (FullSearchResult result : results.getResults()) {
-
assertFalse(result.getTitle().getPrefixedText().equals(Test));
+for (PageTitle result : results.getResults()) {
+
assertFalse(result.getPrefixedText().equals(Test));
 }
 completionLatch.countDown();
 }
diff --git 
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
 
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
index c557c4a..4acc2b2 100644
--- 
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
+++ 
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
@@ -3,11 +3,11 @@
 import org.wikipedia.PageTitle;
 import org.wikipedia.Site;
 import org.wikipedia.WikipediaApp;
-import org.wikipedia.search.FullSearchResult;
 import

[MediaWiki-commits] [Gerrit] No Read more section on main page - change (apps...wikipedia)

2014-12-05 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177936

Change subject: No Read more section on main page
..

No Read more section on main page

Plus a cleanup of an unused import.

Change-Id: I2254b0015624ff5dc71943ba40c34bf2b6fea109
---
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M 
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
2 files changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/36/177936/1

diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index 50eebed..be09ea0 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -38,8 +38,8 @@
 private final CommunicationBridge bridge;
 private final DisableableDrawerLayout slidingPane;
 private final TextView headerView;
-private ToCInteractionFunnel funnel;
-private ActionBarActivity parentActivity;
+private final ToCInteractionFunnel funnel;
+private final ActionBarActivity parentActivity;
 
 /**
  * Flag to track if the drawer is closing because a link was clicked.
@@ -225,9 +225,11 @@
 sections.add(s);
 }
 }
-// add a fake section at the end to represent the read more 
contents at the bottom:
-sections.add(new Section(READ_MORE_SECTION_ID, 0,
-parentActivity.getString(R.string.read_more_section), , 
));
+if (!page.getPageProperties().isMainPage()) {
+// add a fake section at the end to represent the read more 
contents at the bottom:
+sections.add(new Section(READ_MORE_SECTION_ID, 0,
+parentActivity.getString(R.string.read_more_section), 
, ));
+}
 }
 
 @Override
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
 
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 2ab97a7..0a34360 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -1,7 +1,6 @@
 package org.wikipedia.page.bottomcontent;
 
 import android.text.Html;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

-- 
To view, visit https://gerrit.wikimedia.org/r/177936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2254b0015624ff5dc71943ba40c34bf2b6fea109
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Replace deprecated constructor and minor cleanup - change (search/highlighter)

2014-12-06 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177999

Change subject: Replace deprecated constructor and minor cleanup
..

Replace deprecated constructor and minor cleanup

The deprecated constructor was in
AbstractDocsAndPositionsHitEnumTestBase.englishStemmingAnalyzer().

The rest was some minor cleanup.
I've avoided the X... classes since those a copies from upstream.

Change-Id: I07f2d3efc03a564c944241a14dcea72f708bf614
---
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/FieldWrapper.java
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/AutomatonHitEnum.java
M 
experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java
M 
experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java
M 
experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/hit/AbstractDocsAndPositionsHitEnumTestBase.java
9 files changed, 43 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/99/177999/1

diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
index 0774458..d01a766 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
@@ -7,7 +7,7 @@
 public interface HitEnum extends Segment {
 /**
  * Move the enum to the next hit.
- * 
+ *
  * @return is there a next hit (true) or was the last one the final hit
  * (false)
  */
@@ -47,7 +47,7 @@
  * of precision is worth the comparison efficiency.
  */
 int source();
-
+
 public static enum LessThans implements LessThanHitEnum {
 /**
  * Sorts ascending by position.
@@ -66,6 +66,6 @@
 }
 return lhs.endOffset()  rhs.endOffset();
 }
-};
+}
 }
 }
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
index dbe2dbc..8f6d42d 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
@@ -143,7 +143,7 @@
 }
 return 0;
 }
-};
+}
 }
 
 private class ProtoSnippetQueue extends PriorityQueueProtoSnippet {
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
index e699883..4791da4 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
@@ -12,16 +12,16 @@
 abstract class AbstractMultiSourceExtracterT implements SourceExtracterT {
 interface BuilderT, S extends BuilderT, S {
 /**
- * Add a segmenter.
+ * Add an extracter.
  *
- * @param segmenter the segmenter to delegate to
- * @param length the length of the source underlying the segmenter
+ * @param extracter the extracter to delegate to
+ * @param length the length of the source underlying the extracter
  * @return this for chaining
  */
 S add(SourceExtracterT extracter, int length);
 
 /**
- * Build the segmenter.
+ * Build the extracter.
  */
 SourceExtracterT build();
 }
@@ -37,7 +37,7 @@
 /**
  *

[MediaWiki-commits] [Gerrit] Getting ready for next development cycle - change (apps...java-mwapi)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178214

Change subject: Getting ready for next development cycle
..

Getting ready for next development cycle

Change-Id: If5072296ec67c5705d9497cabf3a2fe6321955d4
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/14/178214/1

diff --git a/pom.xml b/pom.xml
index ec8b860..b415949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 groupIdorg.mediawiki.api/groupId
 artifactIdjson/artifactId
 packagingjar/packaging
-version1.3.0/version
+version1.3.1-SNAPSHOT/version
 namejapi/name
 urlhttp://maven.apache.org/url
 

-- 
To view, visit https://gerrit.wikimedia.org/r/178214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5072296ec67c5705d9497cabf3a2fe6321955d4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 1.3.0 - change (apps...java-mwapi)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178213

Change subject: Bump version to 1.3.0
..

Bump version to 1.3.0

Change-Id: If1aabebbc30c16e821bb299960d7632c5058351d
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi 
refs/changes/13/178213/1

diff --git a/pom.xml b/pom.xml
index 44a1188..ec8b860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 groupIdorg.mediawiki.api/groupId
 artifactIdjson/artifactId
 packagingjar/packaging
-version1.3-SNAPSHOT/version
+version1.3.0/version
 namejapi/name
 urlhttp://maven.apache.org/url
 

-- 
To view, visit https://gerrit.wikimedia.org/r/178213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1aabebbc30c16e821bb299960d7632c5058351d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/java-mwapi
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use stable version of mwapi dependency - change (apps...wikipedia)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178215

Change subject: Use stable version of mwapi dependency
..

Use stable version of mwapi dependency

Same code as before but enables us to have more
reproducible release builds.

Change-Id: I648593f6bf85b7cd3e29ed7c41e356500f7287e8
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/15/178215/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index f4e71b3..a5b75f5 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -94,7 +94,7 @@
 // use http://gradleplease.appspot.com/ or http://search.maven.org/.
 // Debug with ./gradlew -q wikipedia:dependencies --configuration compile
 
-compile('org.mediawiki.api:json:1.3-SNAPSHOT') {
+compile('org.mediawiki.api:json:1.3.0') {
 exclude group: 'org.json', module: 'json'
 }
 compile 'com.squareup.okhttp:okhttp-urlconnection:2.1.0'

-- 
To view, visit https://gerrit.wikimedia.org/r/178215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I648593f6bf85b7cd3e29ed7c41e356500f7287e8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 iOS string translations from TWN - change (apps...wikipedia)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178234

Change subject: Manual import of iOS string translations from TWN
..

Manual import of iOS string translations from TWN

Change-Id: I945481a03719b294eb15f1f39b1fcc2b44c33b94
---
M wikipedia/br.lproj/Localizable.strings
M wikipedia/es.lproj/Localizable.strings
M wikipedia/fa.lproj/Localizable.strings
M wikipedia/fi.lproj/Localizable.strings
A wikipedia/ka.lproj/Localizable.strings
A wikipedia/lt.lproj/Localizable.strings
M wikipedia/lt.lproj/Main_iPhone.strings
M wikipedia/pt-br.lproj/Localizable.strings
M wikipedia/tr.lproj/Localizable.strings
M wikipedia/zh-hant.lproj/Localizable.strings
10 files changed, 329 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/34/178234/1

diff --git a/wikipedia/br.lproj/Localizable.strings 
b/wikipedia/br.lproj/Localizable.strings
index e411b91..f448f53 100644
--- a/wikipedia/br.lproj/Localizable.strings
+++ b/wikipedia/br.lproj/Localizable.strings
@@ -82,6 +82,11 @@
 search-titles = Titloù;
 search-within-articles = Er pennadoù;
 search-did-you-mean = N'ho poa ket soñjet kentoc'h e : $1;
+search-recent-title = Enklaskoù nevez;
+search-recent-clear-confirmation-heading = Lemel an holl enklaskoù nevez;
+search-recent-clear-confirmation-sub-heading = Ne c'hall ket an ober-mañ 
bezañ nullet !;
+search-recent-clear-cancel = Nullañ;
+search-recent-clear-delete-all = Lemel pep tra;
 main-menu-title = Muioc'h;
 main-menu-language-title = Furchal $1 Wikipedia;
 main-menu-language-toggle-show = Diskouez ar yezhoù;
diff --git a/wikipedia/es.lproj/Localizable.strings 
b/wikipedia/es.lproj/Localizable.strings
index 468f283..5f052f2 100644
--- a/wikipedia/es.lproj/Localizable.strings
+++ b/wikipedia/es.lproj/Localizable.strings
@@ -87,7 +87,7 @@
 search-did-you-mean = ¿Quisiste decir $1?;
 search-recent-title = Búsquedas recientes;
 search-recent-clear-confirmation-heading = ¿Borrar todas las búsquedas 
recientes?;
-search-recent-clear-confirmation-sub-heading = ¡Esta acción no se puede 
deshacer!;
+search-recent-clear-confirmation-sub-heading = Esta acción no se puede 
deshacer.;
 search-recent-clear-cancel = Cancelar;
 search-recent-clear-delete-all = Borrar todas;
 main-menu-title = Más;
diff --git a/wikipedia/fa.lproj/Localizable.strings 
b/wikipedia/fa.lproj/Localizable.strings
index 3d1c66a..ddedcd4 100644
--- a/wikipedia/fa.lproj/Localizable.strings
+++ b/wikipedia/fa.lproj/Localizable.strings
@@ -82,6 +82,14 @@
 search-loading-section-remaining = در حال بارگیری بقیه مقاله...;
 search-loading-article-loaded = مقاله بارگیری شده است.;
 search-cancel = لغو;
+search-titles = عنوان‌ها;
+search-within-articles = در مقالات;
+search-did-you-mean = منظورتان «$1» بود؟;
+search-recent-title = جستجوهای اخیر;
+search-recent-clear-confirmation-heading = حذف همهٔ آخرین جستجوها؟;
+search-recent-clear-confirmation-sub-heading = این عمل نمی‌تواند برگردانده 
شود!;
+search-recent-clear-cancel = لغو;
+search-recent-clear-delete-all = حذف همه;
 main-menu-title = بیشتر;
 main-menu-language-title = جستجوی  $1  زبان ویکی;
 main-menu-language-toggle-show = نمایش زبان‌ها;
@@ -151,6 +159,8 @@
 about-title = درباره;
 about-wikipedia = ویکی‌پدیا;
 about-contributors = مشارکت‌کنندگان;
+about-testers = آزمایشگر;
+about-testers-details = QA توسط $1 آزموده شد;
 about-translators = مترجم‌ها;
 about-translators-details = این برنامه توسط مترجمان داوطلب در $1 ترجمه 
شده‌است;
 about-libraries = کتابخانه‌های استفاده‌شده;
diff --git a/wikipedia/fi.lproj/Localizable.strings 
b/wikipedia/fi.lproj/Localizable.strings
index 12344d3..1a63fd7 100644
--- a/wikipedia/fi.lproj/Localizable.strings
+++ b/wikipedia/fi.lproj/Localizable.strings
@@ -4,6 +4,7 @@
 // Author: Jack Phoenix
 // Author: Nike
 // Author: Stryn
+// Author: SuperPete
 
 article-languages-label = Valitse kieli;
 article-languages-cancel = Peruuta;
@@ -34,6 +35,7 @@
 zero-warn-when-leaving = Varoita poistuttaessa Wikipedia Zerosta;
 zero-settings-devmode = Zeron kehitystila;
 account-creation-captcha-required = CAPTCHA-varmistus vaaditaan.;
+account-creation-captcha-obtaining = Haetaan uutta CAPTCHA-kuvaa.;
 account-creation-logging-in = Kirjaudutaan...;
 account-creation-passwords-mismatched = Salasanat eivät täsmää.;
 account-creation-saving = Tallennetaan...;
@@ -57,6 +59,7 @@
 wikitext-download-success = Sisältö ladattu.;
 wikitext-preview-changes = Haetaan esikatselua tekemistäsi muutoksista...;
 wikitext-preview-changes-none = Ei esikatseltavia muutoksia.;
+wikitext-upload-result-unknown = wikitextin lähetystä ei voida varmistaa.;
 wikitext-upload-captcha-error = Virhe CAPTCHA-varmistuksessa.;
 wikitext-upload-captcha-needed = Vaaditaan CAPTCHA-varmistus.;
 wikitext-upload-save = Tallennetaan...;
@@ -77,6 +80,14 @@
 search-loading-section-remaining = Ladataan artikkelin loppuosaa...;
 search-loading-article-loaded = Artikkeli ladattu.;

[MediaWiki-commits] [Gerrit] Manual import of Android string translations from TWN - change (apps...wikipedia)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178235

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: Ifcee79d2972da6051bf93e77a7fc3334ec3ff1e0
---
M wikipedia/res/values-ar/strings.xml
M wikipedia/res/values-br/strings.xml
M wikipedia/res/values-ca/strings.xml
M wikipedia/res/values-ce/strings.xml
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-es/strings.xml
M wikipedia/res/values-fa/strings.xml
M wikipedia/res/values-fi/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-ka/strings.xml
M wikipedia/res/values-ko/strings.xml
M wikipedia/res/values-kw/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-lt/strings.xml
M wikipedia/res/values-mk/strings.xml
M wikipedia/res/values-ms/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-pt-rBR/strings.xml
M wikipedia/res/values-pt/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-ru/strings.xml
M wikipedia/res/values-sk/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-ta/strings.xml
M wikipedia/res/values-tr/strings.xml
M wikipedia/res/values-zh-rTW/strings.xml
M wikipedia/res/values-zh/strings.xml
27 files changed, 246 insertions(+), 50 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/35/178235/1

diff --git a/wikipedia/res/values-ar/strings.xml 
b/wikipedia/res/values-ar/strings.xml
index 8f41e8e..d015890 100644
--- a/wikipedia/res/values-ar/strings.xml
+++ b/wikipedia/res/values-ar/strings.xml
@@ -54,6 +54,7 @@
   string name=dialog_message_edit_failedالتعديل فشل!/string
   string name=dialog_message_edit_failed_retryأعد المحاولة/string
   string name=dialog_message_edit_failed_cancelإلغاء/string
+  string name=dialog_message_leaving_editلم يتم حفظ التغييرات التي قمت بها 
حتى الان. هل أنت متأكد أنك تريد أن تترك هذه الصفحة؟/string
   string name=menu_show_tocقائمة المحتويات/string
   string name=search_no_results_foundلا توجد نتائج/string
   string name=edit_section_captcha_messageللمساعدة على الحماية ضد البريد 
المزعج الآلي، الرجاء إدخال الكلمات التي تظهر أدناه/string
diff --git a/wikipedia/res/values-br/strings.xml 
b/wikipedia/res/values-br/strings.xml
index 882df43..54a5d12 100644
--- a/wikipedia/res/values-br/strings.xml
+++ b/wikipedia/res/values-br/strings.xml
@@ -76,6 +76,9 @@
   string name=dialog_message_edit_failedC\'hwitet ar c\'hemm !/string
   string name=dialog_message_edit_failed_retryKlask en-dro/string
   string name=dialog_message_edit_failed_cancelNullañ/string
+  string name=dialog_message_leaving_edit fuzzy=true\N\'eo ket bet 
enrollet ho kemmoù c\'hoazh. Ha sur eo ho peus c\'hoant da guitaat ar 
bajenn-mañ ?\/string
+  string name=dialog_message_leaving_edit_leaveMont kuit/string
+  string name=dialog_message_leaving_edit_stayChom/string
   string name=menu_show_tocTaolenn/string
   string name=search_no_results_foundN\'eus bet kavet disoc\'h 
ebet/string
   string name=edit_section_captcha_messageEvit reiñ sikour d\'ar gwareziñ 
a-enep ar posteloù strobus emgefre, bizskrivit ar gerioù a zeu war wel amañ 
dindan/string
diff --git a/wikipedia/res/values-ca/strings.xml 
b/wikipedia/res/values-ca/strings.xml
index 536549c..1bf378b 100644
--- a/wikipedia/res/values-ca/strings.xml
+++ b/wikipedia/res/values-ca/strings.xml
@@ -76,7 +76,7 @@
   string name=dialog_message_edit_failedL\'edició no s\'ha desat!/string
   string name=dialog_message_edit_failed_retryReintenta/string
   string name=dialog_message_edit_failed_cancelCancel·la/string
-  string name=dialog_message_leaving_edit«Els canvis no s\'han desat 
encara. Esteu segur que voleu sortir d\'aquesta pàgina?»/string
+  string name=dialog_message_leaving_edit fuzzy=true«Els canvis no 
s\'han desat encara. Esteu segur que voleu sortir d\'aquesta pàgina?»/string
   string name=dialog_message_leaving_edit_leaveSurt/string
   string name=dialog_message_leaving_edit_stayRoman/string
   string name=menu_show_tocTaula de continguts/string
diff --git a/wikipedia/res/values-ce/strings.xml 
b/wikipedia/res/values-ce/strings.xml
index 6c22e73..601d979 100644
--- a/wikipedia/res/values-ce/strings.xml
+++ b/wikipedia/res/values-ce/strings.xml
@@ -33,7 +33,7 @@
   string name=preference_title_language fuzzy=trueМотт/string
   string name=preference_summary_languageЧулацаман мотт/string
   string name=preference_languages_filter_hintЛаха/string
-  string name=langlinks_filter_hintЛаха/string
+  string name=langlinks_filter_hintЛахар/string
   string name=menu_other_languages fuzzy=trueКхин меттанаш/string
   string name=langlinks_error_retryЮхагӀорта/string
   string name=langlinks_no_matchХьан дехарца меттанаш цакарий/string
@@ -128,7 +128,7 @@
   string name=color_theme_darkБодане/string
   string name=page_similar_titlesТера агӀонаш/string

[MediaWiki-commits] [Gerrit] Avoid NPE calling updateProgressBar - change (apps...wikipedia)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178270

Change subject: Avoid NPE calling updateProgressBar
..

Avoid NPE calling updateProgressBar

plus in some more callbacks.

Got this myself with recent alpha bits:
java.lang.NullPointerException: Attempt to invoke virtual method 'void 
org.wikipedia.page.PageActivity.updateProgressBar(boolean, boolean, int)' on a 
null object reference
at 
org.wikipedia.page.PageViewFragmentInternal.performActionForState(PageViewFragmentInternal.java:520)
at 
org.wikipedia.page.PageViewFragmentInternal.access$1100(PageViewFragmentInternal.java:76)
at 
org.wikipedia.page.PageViewFragmentInternal$5$1.run(PageViewFragmentInternal.java:405)
at org.wikipedia.ViewAnimations$2.onAnimationEnd(ViewAnimations.java:127)
at 
com.nineoldandroids.view.ViewPropertyAnimatorICS$1.onAnimationEnd(ViewPropertyAnimatorICS.java:90)
at 
android.view.ViewPropertyAnimator$AnimatorEventListener.onAnimationEnd(ViewPropertyAnimator.java:1116)
at android.animation.ValueAnimator.endAnimation(ValueAnimator.java:1089)
at 
android.animation.ValueAnimator$AnimationHandler.doAnimationFrame(ValueAnimator.java:666)
at android.animation.ValueAnimator$AnimationHandler.run(ValueAnimator.java:682)
at android.view.Choreographer$CallbackRecord.run(Choreographer.java:767)
at android.view.Choreographer.doCallbacks(Choreographer.java:580)
at android.view.Choreographer.doFrame(Choreographer.java:549)
at 
android.view.Choreographer$FrameDisplayEventReceiver.run(Choreographer.java:753)
at android.os.Handler.handleCallback(Handler.java:739)
at android.os.Handler.dispatchMessage(Handler.java:95)
at android.os.Looper.loop(Looper.java:135)
at android.app.ActivityThread.main(ActivityThread.java:5221)
at java.lang.reflect.Method.invoke(Native Method)
at java.lang.reflect.Method.invoke(Method.java:372)
at 
com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:899)
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:694)

Change-Id: Ia22b82c9e0698ca42e3f67f07f0c6467d9f552a7
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/70/178270/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 522c86b..50dc6a6 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -515,6 +515,9 @@
 }
 
 private void performActionForState(int forState) {
+if (!isAdded()) {
+return;
+}
 switch (forState) {
 case STATE_NO_FETCH:
 getActivity().updateProgressBar(true, true, 0);
@@ -538,6 +541,9 @@
 leadImagesHandler.beginLayout(new 
LeadImagesHandler.OnLeadImageLayoutListener() {
 @Override
 public void onLayoutComplete() {
+if (!isAdded()) {
+return;
+}
 // when the lead image layout is complete, load the 
lead section and
 // the other sections into the webview.
 displayLeadSection();
@@ -943,6 +949,9 @@
 leadImagesHandler.beginLayout(new 
LeadImagesHandler.OnLeadImageLayoutListener() {
 @Override
 public void onLayoutComplete() {
+if (!isAdded()) {
+return;
+}
 // when the lead image is laid out, load the lead 
section and the rest
 // of the sections into the webview.
 displayLeadSection();

-- 
To view, visit https://gerrit.wikimedia.org/r/178270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia22b82c9e0698ca42e3f67f07f0c6467d9f552a7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove Android Maven Plugin from credits - change (apps...wikipedia)

2014-12-08 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178349

Change subject: Remove Android Maven Plugin from credits
..

Remove Android Maven Plugin from credits

since we don't use Maven to build the final product anymore.
We've switched to Gradle a while ago.

Change-Id: I37dbcdaa934b3088c3787af080ad5cb619e0965d
---
M wikipedia/res/values/credits.xml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/49/178349/1

diff --git a/wikipedia/res/values/credits.xml b/wikipedia/res/values/credits.xml
index 9831e3d..c2c324a 100644
--- a/wikipedia/res/values/credits.xml
+++ b/wikipedia/res/values/credits.xml
@@ -1,8 +1,7 @@
 ?xml version=1.0 encoding=utf-8?
 resources
 string name=contributors_listAdam Baso, Amir E. Aharoni, Anirudh S, 
Bernd Sitzmann, Brion Vibber, Dan Garry, Dmitry Brant, Kenan Wang, Maryana 
Pinchuk, Max Semenik, Moiz Syed, Monte Hurd, Mun May Tee, Nicole Borrelli, 
Niklas Laxström, Thomas PT, Tomasz Finc, Vibha Bamba, Yuvi Panda/string
-string name=libraries_lista 
href=https://code.google.com/p/maven-android-plugin/;Android Maven Plugin/a,
-a href=https://github.com/keyboardsurfer/Crouton;Crouton/a,
+string name=libraries_lista 
href=https://github.com/keyboardsurfer/Crouton;Crouton/a,
 a 
href=https://github.com/ragunathjawahar/android-saripaar;Saripaar/a,
 a href=https://square.github.io/otto/;Otto/a,
 a href=http://acra.ch;ACRA/a,

-- 
To view, visit https://gerrit.wikimedia.org/r/178349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37dbcdaa934b3088c3787af080ad5cb619e0965d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@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 Android string translations from TWN - change (apps...wikipedia)

2014-12-09 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178544

Change subject: Manual import of Android string translations from TWN
..

Manual import of Android string translations from TWN

Change-Id: I3fb01f201dca21e4220492bb84a098e5ebfc5765
---
M wikipedia/res/values-de/strings.xml
M wikipedia/res/values-fr/strings.xml
M wikipedia/res/values-he/strings.xml
M wikipedia/res/values-ka/strings.xml
M wikipedia/res/values-lb/strings.xml
M wikipedia/res/values-pl/strings.xml
M wikipedia/res/values-ro/strings.xml
M wikipedia/res/values-sv/strings.xml
M wikipedia/res/values-tr/strings.xml
9 files changed, 43 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/44/178544/1

diff --git a/wikipedia/res/values-de/strings.xml 
b/wikipedia/res/values-de/strings.xml
index 520c2a6..065202d 100644
--- a/wikipedia/res/values-de/strings.xml
+++ b/wikipedia/res/values-de/strings.xml
@@ -268,4 +268,7 @@
   string name=alpha_update_notification_titleNeue Alpha-Aktualisierung 
verfügbar/string
   string name=alpha_update_notification_textZum Herunterladen 
tippen/string
   string name=dialog_close_descriptionSchließen/string
+  string name=preference_title_show_imagesBilder anzeigen/string
+  string name=preference_summary_show_imagesAktiviere oder deaktiviere das 
Laden von Bildern in Seiten. Entmarkiere diese Einstellung, falls deine 
Internetverbindung langsam oder dein Datenvolumen beschränkt ist./string
+  string name=read_more_sectionMehr lesen/string
 /resources
diff --git a/wikipedia/res/values-fr/strings.xml 
b/wikipedia/res/values-fr/strings.xml
index 1eed90e..0fb4b0b 100644
--- a/wikipedia/res/values-fr/strings.xml
+++ b/wikipedia/res/values-fr/strings.xml
@@ -76,7 +76,7 @@
   string name=dialog_message_edit_failedÉchec de l’enregistrement 
!/string
   string name=dialog_message_edit_failed_retryRéessayer/string
   string name=dialog_message_edit_failed_cancelAnnuler/string
-  string name=dialog_message_leaving_edit fuzzy=true« Vos modifications 
n’ont pas encore été enregistrées. Êtes-vous sûr de vouloir quitter cette page 
? »/string
+  string name=dialog_message_leaving_editVos modifications n’ont pas 
encore été enregistrées. Êtes-vous sûr de vouloir quitter cette page ?/string
   string name=dialog_message_leaving_edit_leaveQuitter/string
   string name=dialog_message_leaving_edit_stayRester/string
   string name=menu_show_tocSommaire/string
@@ -268,4 +268,7 @@
   string name=alpha_update_notification_titleNouvelle mise à jour alpha 
disponible/string
   string name=alpha_update_notification_textTouchez pour 
télécharger/string
   string name=dialog_close_descriptionFermer/string
+  string name=preference_title_show_imagesVoir les images/string
+  string name=preference_summary_show_imagesActiver ou désactiver le 
chargement des images dans les pages. Décochez ce paramètre si votre connexion 
à internet est lente, ou si votre volume de données est limité./string
+  string name=read_more_sectionEn savoir plus/string
 /resources
diff --git a/wikipedia/res/values-he/strings.xml 
b/wikipedia/res/values-he/strings.xml
index 4255d76..c39f0c7 100644
--- a/wikipedia/res/values-he/strings.xml
+++ b/wikipedia/res/values-he/strings.xml
@@ -267,4 +267,7 @@
   string name=alpha_update_notification_titleזמין עדכון אלפא חדש./string
   string name=alpha_update_notification_textנא להקיש להורדה/string
   string name=dialog_close_descriptionסגירה/string
+  string name=preference_title_show_imagesלהציג תמונות/string
+  string name=preference_summary_show_imagesהפעלה או כיבוי של טעינת תמונות 
בדפים. אפשר לכבות את ההגדרה הזאת אם חיבור האינטרנט שלך אטי או אם ספק התקשורת 
מגביל את צריכת הנתונים בקו שלך./string
+  string name=read_more_sectionמידע נוסף/string
 /resources
diff --git a/wikipedia/res/values-ka/strings.xml 
b/wikipedia/res/values-ka/strings.xml
index 1c7fcc0..9feefb3 100644
--- a/wikipedia/res/values-ka/strings.xml
+++ b/wikipedia/res/values-ka/strings.xml
@@ -71,6 +71,7 @@
   string name=dialog_message_leaving_edit_stayდარჩენა/string
   string name=menu_show_tocსარჩევი/string
   string name=search_no_results_foundშედეგები ვერ მოიძებნა/string
+  string name=edit_section_captcha_hintგაიმეორეთ ზემოთ მოცემული 
სიტყვები/string
   string name=title_captchaშეიყვანეთ CAPTCHA/string
   string name=edit_section_abusefilter_back_textშეიტანეთ ცვლილებები ჩემს 
რედაქტირებაში/string
   string name=nav_item_loginშესვლა/string
@@ -92,6 +93,7 @@
   string name=preference_summary_notloggedinარ ხართ შესული./string
   string name=toast_logout_completeგამოსული./string
   string name=saved_pages_empty_titleშენახული გვერდები არ არის!/string
+  string name=history_empty_titleბოლო გვერდები ვერ მოიძებნა!/string
   string name=delete_selected_historyწაშლა/string
   string 
name=wp_stylizedlt;biggt;ვlt;/biggt;იკიპედიlt;biggt;აlt;/biggt;/string
   string name=wp_tag_lineთავისუფალი ენციკლოპედია/string

[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)

2014-12-09 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178548

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: I94f410425324fb0adcc088e51ff097270f01b541
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/48/178548/1

diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index a5b75f5..fea7846 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -9,7 +9,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 10
 targetSdkVersion 21
-versionCode 88
+versionCode 89
 testApplicationId org.wikipedia.test
 }
 signingConfigs {

-- 
To view, visit https://gerrit.wikimedia.org/r/178548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f410425324fb0adcc088e51ff097270f01b541
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update README - change (apps...wikipedia)

2014-12-09 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178669

Change subject: Update README
..

Update README

Need JDK 7 now.  Tried to be less Mac specific.
Update Android Studio info to 1.0.0
Removed info about Maven and IntelliJ.
Rearranged some chapters and added more info on how to contribute.

Change-Id: Ib0200a84cb2be923d14fa1bc4da8f018fb1349ac
---
M README.mediawiki
1 file changed, 99 insertions(+), 131 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/69/178669/1

diff --git a/README.mediawiki b/README.mediawiki
index e895d99..260bebc 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -1,26 +1,43 @@
 See also https://git.wikimedia.org/summary/apps%2Fandroid%2Fjava-mwapi.git
 
-== Steps to Get Up and Developing on a Mac ==
+== Steps to Set Up a Development Environment ==
 
-These instructions should help a Mac owner download the Wikipedia for Android 
source code and get the latest version running in an emulator or on a real 
Android device. If you don't know anything about how to navigate around a 
UNIX/Linux/Mac filesystem and edit files with a program like pico, emacs, or 
vim, these instructions probably won't make any sense. And as noted below, you 
probably need to understand git in order to ever contribute source code updates 
to the new app. And regarding source code, you will need to probably be pretty 
good at Java or iOS programming, but more ideally the Android-flavored Java 
used in Android development to really get down to work or play quickly. If you 
use another shell than bash (e.g. zsh) then you'll probably know enough to 
adjust accordingly. But anyway, here we go for those who enjoy a fun side 
project for a good cause...
+These instructions should help you download the Wikipedia for Android source 
code and get the latest version running in an emulator or on a real Android 
device. Some of the steps assume you are using bash but should be easily 
translatable for other shells as well. We've written theses instructions 
initially for OS X but most should also work on Linux and Windows. But anyway, 
here we go for those who enjoy a fun side project for a good cause...
+
+=== Git ===
+
+We assume you already have Git installed. If you've never used Git, you will 
need to search the web on how to add git to the system from Apple Xcode, and 
then study on how to use git (look for material on https://mediawiki.org for 
git convention as practiced by MediaWiki programmers).
+
+In the parent directory of your programming projects, run the following 
commands:
+ git clone https://git.wikimedia.org/git/apps/android/wikipedia.git
+
+Assuming the git clone operation worked, you will have a new folder 
representing the freshly cloned repository, wikipedia.
+
+It is recommended to rename the folder for the wikipedia repository to 
ensure you know which OS it's for (there's an iOS app by the name of 
wikipedia, too, so it's good to have different folder names at the root of 
the repos).
+ mv wikipedia/ android-wikipedia/
 
 === Install Java SDK ===
 
-The Java SDK (aka. JDK) is needed to build Android apps. If in the Terminal 
you can type the command java -version and you don't have a $JAVA_HOME 
environment variable, Maven will probably Just Work on Mac, so you don't 
necessarily need to add and export JAVA_HOME in ~/.bash_profile like the 
instructions suggest. If, on the other hand you don't have Java, download and 
install the latest version of the Java SDK in the 1.6 series (or if 
unsupported, maybe 1.7, ...) and ensure you can get java -version to work.
+The Java SDK 7 or higher (aka. JDK) is needed to build Android apps. To test:
+ javac -version
 
 === Install Android SDK ===
 
-1. Install brew if you don't already have it
+It's probably best to install the Android SDK separately from Android Studio 
-- instead of the bundle.
 
-See: http://brew.sh/
+ On a Mac you can use brew 
+Install brew if you don't already have it. Instructions are at http://brew.sh.
 
-2. Install Android SDK
-
+Install Android SDK
  brew update
  brew doctor
  brew install android
 
-3. On a Mac, you'll want to update your ~/.bash_profile file to set the 
$ANDROID_HOME variable to point to the 'sdk' folder contained in the compressed 
file you just extracted and to update your system path to point at some 
binaries.
+ Other Platforms 
+Download the SDK Tools from http://developer.android.com/sdk/index.html#Other
+
+ All Platforms 
+Update your ~/.bash_profile file to set the $ANDROID_HOME variable to point to 
the 'sdk' folder contained in the compressed file you just extracted and to 
update your system path to point at some binaries.
 
  export ANDROID_HOME=/usr/local/opt/android-studio-sdk
  export PATH=$ANDROID_HOME/tools:$PATH
@@ -31,7 +48,7 @@
 
 Now, and any time you open a new Terminal, the $ANDROID_HOME variable will be 
set

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1036 matches

Mail list logo