From 60d14294403aa4797bc1d6763445224bfff8e796 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Sep 2016 14:37:48 -0300 Subject: added 'like' instant action on Notifications for Comments, now along with the Reply button --- .../org/wordpress/android/GCMMessageService.java | 26 ++++++++++++++ .../android/ui/comments/CommentDetailFragment.java | 26 ++++++++++++-- .../wordpress/android/ui/main/WPMainActivity.java | 7 +++- .../notifications/NotificationsDetailActivity.java | 5 ++- .../notifications/NotificationsListFragment.java | 40 ++++++++++++++++++---- WordPress/src/main/res/values/strings.xml | 1 + 6 files changed, 95 insertions(+), 10 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index 288ad522f..594d29c59 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -207,6 +207,12 @@ public class GCMMessageService extends GcmListenerService { private void addActionsForCommentNotification(NotificationCompat.Builder builder, String noteId) { // Add some actions if this is a comment notification + addCommentReplyActionForCommentNotification(builder, noteId); + addCommentLikeActionForCommentNotification(builder, noteId); + } + + private void addCommentReplyActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { + // adding comment reply action Intent commentReplyIntent = new Intent(this, WPMainActivity.class); commentReplyIntent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true); commentReplyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK @@ -224,6 +230,26 @@ public class GCMMessageService extends GcmListenerService { commentReplyPendingIntent); } + private void addCommentLikeActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { + // adding comment like action + Intent commentLikeIntent = new Intent(this, WPMainActivity.class); + commentLikeIntent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true); + commentLikeIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_CLEAR_TASK); + commentLikeIntent.setAction("android.intent.action.MAIN"); + commentLikeIntent.addCategory("android.intent.category.LAUNCHER"); + commentLikeIntent.addCategory("comment-like"); + commentLikeIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, true); + if (noteId != null) { + commentLikeIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId); + } + PendingIntent commentLikePendingIntent = PendingIntent.getActivity(this, 0, commentLikeIntent, + PendingIntent.FLAG_CANCEL_CURRENT); + builder.addAction(R.drawable.ic_action_like, getText(R.string.like), + commentLikePendingIntent); + + } + private Bitmap getLargeIconBitmap(String iconUrl, boolean shouldCircularizeIcon){ Bitmap largeIconBitmap = null; if (iconUrl != null) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index 15ffa897d..b61fe2f12 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -117,6 +117,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm private boolean mIsUsersBlog = false; private boolean mShouldFocusReplyField; + private boolean mShouldLikeInstantly; /* * Used to request a comment from a note using its site and comment ids, rather than build @@ -162,6 +163,16 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm return fragment; } + /* + * used when called from a comment notification 'like' action + */ + public static CommentDetailFragment newInstanceForInstantLike(final String noteId) { + CommentDetailFragment fragment = newInstance(noteId); + //here tell the fragment to trigger the Like action when ready + fragment.setLikeCommentWhenReady(); + return fragment; + } + /* * used when called from notifications to load a comment that doesn't already exist in the note */ @@ -325,7 +336,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm mBtnLikeComment.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - likeComment(); + likeComment(false); } }); @@ -344,6 +355,11 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm setNoteWithNoteId(mRestoredNoteId); mRestoredNoteId = null; } + + if (mShouldLikeInstantly) { + mShouldLikeInstantly = false; + likeComment(true); + } } private void setupSuggestionServiceAndAdapter() { @@ -1062,9 +1078,15 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm getFragmentManager().invalidateOptionsMenu(); } + private void setLikeCommentWhenReady() { + mShouldLikeInstantly = true; + } + // Like or unlike a comment via the REST API - private void likeComment() { + private void likeComment(boolean forceLike) { if (mNote == null) return; + if (!isAdded()) return; + if (forceLike && mBtnLikeComment.isActivated()) return; toggleLikeButton(!mBtnLikeComment.isActivated()); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index 0e41c200f..0f7471b99 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -270,7 +270,12 @@ public class WPMainActivity extends AppCompatActivity implements Bucket.Listener String noteId = getIntent().getStringExtra(NotificationsListFragment.NOTE_ID_EXTRA); if (!TextUtils.isEmpty(noteId)) { GCMMessageService.bumpPushNotificationsTappedAnalytics(noteId); - NotificationsListFragment.openNote(this, noteId, shouldShowKeyboard); + boolean doLikeNote = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, false); + if (doLikeNote) { + NotificationsListFragment.openNoteForLike(this, noteId); + } else { + NotificationsListFragment.openNoteForReply(this, noteId, shouldShowKeyboard); + } } } else { // mark all tapped here diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java index 4326e0ae6..65314b64f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java @@ -138,7 +138,10 @@ public class NotificationsDetailActivity extends AppCompatActivity implements Fragment fragment; if (note.isCommentType()) { // show comment detail for comment notifications - fragment = CommentDetailFragment.newInstance(note.getId()); + boolean isInstantLike = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, false); + fragment = isInstantLike ? + CommentDetailFragment.newInstanceForInstantLike(note.getId()) : + CommentDetailFragment.newInstance(note.getId()); } else if (note.isAutomattcherType()) { // show reader post detail for automattchers about posts - note that comment // automattchers are handled by note.isCommentType() above diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java index 716b52389..08e4eaab6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java @@ -40,6 +40,7 @@ public class NotificationsListFragment extends Fragment WPMainActivity.OnScrollToTopListener, RadioGroup.OnCheckedChangeListener { public static final String NOTE_ID_EXTRA = "noteId"; public static final String NOTE_INSTANT_REPLY_EXTRA = "instantReply"; + public static final String NOTE_INSTANT_LIKE_EXTRA = "instantLike"; public static final String NOTE_MODERATE_ID_EXTRA = "moderateNoteId"; public static final String NOTE_MODERATE_STATUS_EXTRA = "moderateNoteStatus"; @@ -175,16 +176,26 @@ public class NotificationsListFragment extends Fragment // open the latest version of this note just in case it has changed - this can // happen if the note was tapped from the list fragment after it was updated // by another fragment (such as NotificationCommentLikeFragment) - openNote(getActivity(), noteId, false); + openNoteForReply(getActivity(), noteId, false); } }; /** * Open a note fragment based on the type of note */ - public static void openNote(Activity activity, - String noteId, - boolean shouldShowKeyboard) { + private static Intent getOpenNoteIntent(Activity activity, + String noteId) { + Intent detailIntent = new Intent(activity, NotificationsDetailActivity.class); + detailIntent.putExtra(NOTE_ID_EXTRA, noteId); + return detailIntent; + } + + /** + * Open a note fragment based on the type of note + */ + public static void openNoteForReply(Activity activity, + String noteId, + boolean shouldShowKeyboard) { if (noteId == null || activity == null) { return; } @@ -193,12 +204,29 @@ public class NotificationsListFragment extends Fragment return; } - Intent detailIntent = new Intent(activity, NotificationsDetailActivity.class); - detailIntent.putExtra(NOTE_ID_EXTRA, noteId); + Intent detailIntent = getOpenNoteIntent(activity, noteId); detailIntent.putExtra(NOTE_INSTANT_REPLY_EXTRA, shouldShowKeyboard); activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL); } + /** + * Open a note fragment based on the type of note, signaling to issue a like action immediately + */ + public static void openNoteForLike(Activity activity, + String noteId) { + if (noteId == null || activity == null) { + return; + } + + if (activity.isFinishing()) { + return; + } + + Intent detailIntent = getOpenNoteIntent(activity, noteId); + detailIntent.putExtra(NOTE_INSTANT_LIKE_EXTRA, true); + activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL); + } + private void setNoteIsHidden(String noteId, boolean isHidden) { if (mNotesAdapter == null) return; diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index d7f45389c..5586aeddb 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -324,6 +324,7 @@ Reply Trash + Like Author name -- cgit v1.2.3 From a5b16c1179008f937d205230726d180a3523332d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Sep 2016 15:33:20 -0300 Subject: now clearing notification when you click Reply or Like on it - as it didn't make sense to keep it open anyway, because the attached Note would be mark read and synced with Simperium --- .../main/java/org/wordpress/android/GCMMessageService.java | 11 +++-------- .../java/org/wordpress/android/ui/main/WPMainActivity.java | 2 +- .../android/ui/notifications/NotificationsDetailActivity.java | 4 +++- .../android/ui/notifications/NotificationsListFragment.java | 3 --- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index 594d29c59..98158b7f7 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -468,7 +468,7 @@ public class GCMMessageService extends GcmListenerService { return; } - removeNotificationWithNoteIdFromSystemBar(this, data); + removeNotificationWithNoteIdFromSystemBar(this, data.getString(PUSH_ARG_NOTE_ID, "")); //now that we cleared the specific notif, we can check and make any visual updates if (sActiveNotificationsMap.size() > 0) { rebuildAndUpdateNotificationsOnSystemBar(data); @@ -596,13 +596,8 @@ public class GCMMessageService extends GcmListenerService { } // Removes a specific notification from the system bar - public static synchronized void removeNotificationWithNoteIdFromSystemBar(Context context, Bundle data) { - if (context == null || data == null || !hasNotifications()) { - return; - } - - String noteID = data.getString(PUSH_ARG_NOTE_ID, ""); - if (TextUtils.isEmpty(noteID)) { + public static synchronized void removeNotificationWithNoteIdFromSystemBar(Context context, String noteID) { + if (context == null || TextUtils.isEmpty(noteID) || !hasNotifications()) { return; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index 0f7471b99..ec275da5e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -282,7 +282,7 @@ public class WPMainActivity extends AppCompatActivity implements Bucket.Listener GCMMessageService.bumpPushNotificationsTappedAllAnalytics(); } - GCMMessageService.clearNotifications(); + GCMMessageService.removeAllNotifications(this); } @Override diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java index 65314b64f..af816804e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java @@ -90,6 +90,9 @@ public class NotificationsDetailActivity extends AppCompatActivity implements return; } } + + GCMMessageService.removeNotificationWithNoteIdFromSystemBar(this, noteId);//clearNotifications(); + } else if (savedInstanceState.containsKey(ARG_TITLE) && getSupportActionBar() != null) { getSupportActionBar().setTitle(StringUtils.notNullStr(savedInstanceState.getString(ARG_TITLE))); } @@ -99,7 +102,6 @@ public class NotificationsDetailActivity extends AppCompatActivity implements getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); } - GCMMessageService.clearNotifications(); } @Override diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java index 08e4eaab6..ab34a790e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java @@ -180,9 +180,6 @@ public class NotificationsListFragment extends Fragment } }; - /** - * Open a note fragment based on the type of note - */ private static Intent getOpenNoteIntent(Activity activity, String noteId) { Intent detailIntent = new Intent(activity, NotificationsDetailActivity.class); -- cgit v1.2.3 From d719583c1f095056687cd021de9d8ab75862319d Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Thu, 1 Sep 2016 17:01:16 -0300 Subject: added action 'Approve' for Comment Notifications --- .../org/wordpress/android/GCMMessageService.java | 38 ++++++++++----- .../android/ui/comments/CommentDetailFragment.java | 54 ++++++++++++++++------ .../wordpress/android/ui/main/WPMainActivity.java | 9 +++- .../notifications/NotificationsDetailActivity.java | 7 ++- .../notifications/NotificationsListFragment.java | 19 ++++++++ WordPress/src/main/res/values/strings.xml | 2 + 6 files changed, 98 insertions(+), 31 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index 98158b7f7..c0e5e3531 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -209,16 +209,12 @@ public class GCMMessageService extends GcmListenerService { // Add some actions if this is a comment notification addCommentReplyActionForCommentNotification(builder, noteId); addCommentLikeActionForCommentNotification(builder, noteId); + addCommentApproveActionForCommentNotification(builder, noteId); } private void addCommentReplyActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { // adding comment reply action - Intent commentReplyIntent = new Intent(this, WPMainActivity.class); - commentReplyIntent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true); - commentReplyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_CLEAR_TASK); - commentReplyIntent.setAction("android.intent.action.MAIN"); - commentReplyIntent.addCategory("android.intent.category.LAUNCHER"); + Intent commentReplyIntent = getCommentActionIntent(); commentReplyIntent.addCategory("comment-reply"); commentReplyIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, true); if (noteId != null) { @@ -232,12 +228,7 @@ public class GCMMessageService extends GcmListenerService { private void addCommentLikeActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { // adding comment like action - Intent commentLikeIntent = new Intent(this, WPMainActivity.class); - commentLikeIntent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true); - commentLikeIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_CLEAR_TASK); - commentLikeIntent.setAction("android.intent.action.MAIN"); - commentLikeIntent.addCategory("android.intent.category.LAUNCHER"); + Intent commentLikeIntent = getCommentActionIntent(); commentLikeIntent.addCategory("comment-like"); commentLikeIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, true); if (noteId != null) { @@ -247,7 +238,30 @@ public class GCMMessageService extends GcmListenerService { PendingIntent.FLAG_CANCEL_CURRENT); builder.addAction(R.drawable.ic_action_like, getText(R.string.like), commentLikePendingIntent); + } + private void addCommentApproveActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { + // adding comment approve action + Intent commentApproveIntent = getCommentActionIntent(); + commentApproveIntent.addCategory("comment-moderate"); + commentApproveIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, true); + if (noteId != null) { + commentApproveIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId); + } + PendingIntent commentApprovePendingIntent = PendingIntent.getActivity(this, 0, commentApproveIntent, + PendingIntent.FLAG_CANCEL_CURRENT); + builder.addAction(R.drawable.ic_action_approve, getText(R.string.approve), + commentApprovePendingIntent); + } + + private Intent getCommentActionIntent(){ + Intent intent = new Intent(this, WPMainActivity.class); + intent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_CLEAR_TASK); + intent.setAction("android.intent.action.MAIN"); + intent.addCategory("android.intent.category.LAUNCHER"); + return intent; } private Bitmap getLargeIconBitmap(String iconUrl, boolean shouldCircularizeIcon){ diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index b61fe2f12..4c4688a59 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -76,7 +76,6 @@ import org.wordpress.android.widgets.WPNetworkImageView; import java.util.EnumSet; import java.util.List; -import java.util.Locale; import de.greenrobot.event.EventBus; @@ -118,6 +117,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm private boolean mIsUsersBlog = false; private boolean mShouldFocusReplyField; private boolean mShouldLikeInstantly; + private boolean mShouldApproveInstantly; /* * Used to request a comment from a note using its site and comment ids, rather than build @@ -173,6 +173,16 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm return fragment; } + /* + * used when called from a comment notification 'approve' action + */ + public static CommentDetailFragment newInstanceForInstantApprove(final String noteId) { + CommentDetailFragment fragment = newInstance(noteId); + //here tell the fragment to trigger the Like action when ready + fragment.setApproveCommentWhenReady(); + return fragment; + } + /* * used when called from notifications to load a comment that doesn't already exist in the note */ @@ -359,7 +369,11 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm if (mShouldLikeInstantly) { mShouldLikeInstantly = false; likeComment(true); + } else if (mShouldApproveInstantly) { + mShouldApproveInstantly = false; + performModerateAction(); } + } private void setupSuggestionServiceAndAdapter() { @@ -802,7 +816,9 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm public void onActionResult(CommentActionResult result) { if (!isAdded()) return; - if (!result.isSuccess()) { + if (result.isSuccess()) { + ToastUtils.showToast(getActivity(), R.string.comment_moderated_approved, ToastUtils.Duration.SHORT); + } else { mComment.setStatus(CommentStatus.toString(oldStatus)); updateStatusViews(); ToastUtils.showToast(getActivity(), R.string.error_moderate_comment); @@ -941,19 +957,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm mBtnModerateComment.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!hasComment() || !isAdded() || !NetworkUtils.checkConnection(getActivity())) { - return; - } - - CommentStatus newStatus = CommentStatus.APPROVED; - if (mComment.getStatusEnum() == CommentStatus.APPROVED) { - newStatus = CommentStatus.UNAPPROVED; - } - - mComment.setStatus(newStatus.toString()); - setModerateButtonForStatus(newStatus); - AniUtils.startAnimation(mBtnModerateIcon, R.anim.notifications_button_scale); - moderateComment(newStatus); + performModerateAction(); } }); mBtnModerateComment.setVisibility(View.VISIBLE); @@ -989,6 +993,22 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm mLayoutButtons.setVisibility(View.VISIBLE); } + private void performModerateAction(){ + if (!hasComment() || !isAdded() || !NetworkUtils.checkConnection(getActivity())) { + return; + } + + CommentStatus newStatus = CommentStatus.APPROVED; + if (mComment.getStatusEnum() == CommentStatus.APPROVED) { + newStatus = CommentStatus.UNAPPROVED; + } + + mComment.setStatus(newStatus.toString()); + setModerateButtonForStatus(newStatus); + AniUtils.startAnimation(mBtnModerateIcon, R.anim.notifications_button_scale); + moderateComment(newStatus); + } + private void setModerateButtonForStatus(CommentStatus status) { if (status == CommentStatus.APPROVED) { mBtnModerateIcon.setImageResource(R.drawable.ic_action_approve_active); @@ -1082,6 +1102,10 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm mShouldLikeInstantly = true; } + private void setApproveCommentWhenReady() { + mShouldApproveInstantly = true; + } + // Like or unlike a comment via the REST API private void likeComment(boolean forceLike) { if (mNote == null) return; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java index ec275da5e..a29e624f1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java @@ -265,7 +265,6 @@ public class WPMainActivity extends AppCompatActivity implements Bucket.Listener mViewPager.setCurrentItem(WPMainTabAdapter.TAB_NOTIFS); - boolean shouldShowKeyboard = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, false); if (GCMMessageService.getNotificationsCount() == 1) { String noteId = getIntent().getStringExtra(NotificationsListFragment.NOTE_ID_EXTRA); if (!TextUtils.isEmpty(noteId)) { @@ -274,7 +273,13 @@ public class WPMainActivity extends AppCompatActivity implements Bucket.Listener if (doLikeNote) { NotificationsListFragment.openNoteForLike(this, noteId); } else { - NotificationsListFragment.openNoteForReply(this, noteId, shouldShowKeyboard); + boolean doApproveNote = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, false); + if (doApproveNote) { + NotificationsListFragment.openNoteForApprove(this, noteId); + } else { + boolean shouldShowKeyboard = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, false); + NotificationsListFragment.openNoteForReply(this, noteId, shouldShowKeyboard); + } } } } else { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java index af816804e..408194613 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java @@ -141,9 +141,12 @@ public class NotificationsDetailActivity extends AppCompatActivity implements if (note.isCommentType()) { // show comment detail for comment notifications boolean isInstantLike = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, false); + boolean isInstantApprove = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, false); fragment = isInstantLike ? - CommentDetailFragment.newInstanceForInstantLike(note.getId()) : - CommentDetailFragment.newInstance(note.getId()); + CommentDetailFragment.newInstanceForInstantLike(note.getId()) : + isInstantApprove ? + CommentDetailFragment.newInstanceForInstantApprove(note.getId()) : + CommentDetailFragment.newInstance(note.getId()); } else if (note.isAutomattcherType()) { // show reader post detail for automattchers about posts - note that comment // automattchers are handled by note.isCommentType() above diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java index ab34a790e..8ad48256c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java @@ -41,6 +41,7 @@ public class NotificationsListFragment extends Fragment public static final String NOTE_ID_EXTRA = "noteId"; public static final String NOTE_INSTANT_REPLY_EXTRA = "instantReply"; public static final String NOTE_INSTANT_LIKE_EXTRA = "instantLike"; + public static final String NOTE_INSTANT_APPROVE_EXTRA = "instantApprove"; public static final String NOTE_MODERATE_ID_EXTRA = "moderateNoteId"; public static final String NOTE_MODERATE_STATUS_EXTRA = "moderateNoteStatus"; @@ -224,6 +225,24 @@ public class NotificationsListFragment extends Fragment activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL); } + /** + * Open a note fragment based on the type of note, signaling to issue a moderate:approve action immediately + */ + public static void openNoteForApprove(Activity activity, + String noteId) { + if (noteId == null || activity == null) { + return; + } + + if (activity.isFinishing()) { + return; + } + + Intent detailIntent = getOpenNoteIntent(activity, noteId); + detailIntent.putExtra(NOTE_INSTANT_APPROVE_EXTRA, true); + activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL); + } + private void setNoteIsHidden(String noteId, boolean isHidden) { if (mNotesAdapter == null) return; diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 5586aeddb..4a59ea49e 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -325,6 +325,8 @@ Reply Trash Like + Approve + Comment approved! Author name -- cgit v1.2.3 From 3942f896a3341dbf0d51676a6afd466137e38282 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Fri, 2 Sep 2016 20:31:02 -0300 Subject: added context-aware quick actions (reply/like or reply/approve) to Comment push notifications --- .../org/wordpress/android/GCMMessageService.java | 42 ++++++++++++++++++++-- .../java/org/wordpress/android/models/Note.java | 31 ++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index c0e5e3531..3f2284aac 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -16,12 +16,15 @@ import android.support.v4.util.ArrayMap; import android.text.TextUtils; import com.google.android.gms.gcm.GcmListenerService; +import com.simperium.client.BucketObjectMissingException; import org.apache.commons.lang.StringEscapeUtils; import org.wordpress.android.analytics.AnalyticsTracker; import org.wordpress.android.analytics.AnalyticsTracker.Stat; import org.wordpress.android.analytics.AnalyticsTrackerMixpanel; import org.wordpress.android.models.AccountHelper; +import org.wordpress.android.models.CommentStatus; +import org.wordpress.android.models.Note; import org.wordpress.android.ui.main.WPMainActivity; import org.wordpress.android.ui.notifications.NotificationDismissBroadcastReceiver; import org.wordpress.android.ui.notifications.NotificationEvents; @@ -37,6 +40,7 @@ import org.wordpress.android.util.StringUtils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -207,9 +211,41 @@ public class GCMMessageService extends GcmListenerService { private void addActionsForCommentNotification(NotificationCompat.Builder builder, String noteId) { // Add some actions if this is a comment notification - addCommentReplyActionForCommentNotification(builder, noteId); - addCommentLikeActionForCommentNotification(builder, noteId); - addCommentApproveActionForCommentNotification(builder, noteId); + + boolean bActionsSet = false; + + if (SimperiumUtils.getNotesBucket() != null) { + try { + Note note = SimperiumUtils.getNotesBucket().get(noteId); + if (note != null) { + //if note can be replied to, we'll always add this action first + if (note.canReply()) { + addCommentReplyActionForCommentNotification(builder, noteId); + } + + // if the comment is lacking approval, offer moderation actions + if (note.getCommentStatus().equals(CommentStatus.UNAPPROVED)) { + if (note.canModerate()) { + addCommentApproveActionForCommentNotification(builder, noteId); + } + } else { + //else offer REPLY / LIKE actions + if (note.canLike()) { + addCommentLikeActionForCommentNotification(builder, noteId); + } + } + } + bActionsSet = true; + } catch (BucketObjectMissingException e) { + e.printStackTrace(); + } + } + + // if we could not set the actions, set the default ones REPLY / LIKE + if (!bActionsSet) { + addCommentReplyActionForCommentNotification(builder, noteId); + addCommentLikeActionForCommentNotification(builder, noteId); + } } private void addCommentReplyActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { diff --git a/WordPress/src/main/java/org/wordpress/android/models/Note.java b/WordPress/src/main/java/org/wordpress/android/models/Note.java index f74e39273..f983dc891 100644 --- a/WordPress/src/main/java/org/wordpress/android/models/Note.java +++ b/WordPress/src/main/java/org/wordpress/android/models/Note.java @@ -148,6 +148,37 @@ public class Note extends Syncable { return isLikeType() || isCommentLikeType() || isFollowType() || isReblogType(); } + /* + * does user have permission to moderate/reply/spam this comment? + */ + public boolean canModerate() { + EnumSet enabledActions = getEnabledActions(); + return enabledActions != null && (enabledActions.contains(EnabledActions.ACTION_APPROVE) || enabledActions.contains(EnabledActions.ACTION_UNAPPROVE)); + } + + public boolean canMarkAsSpam() { + EnumSet enabledActions = getEnabledActions(); + return (enabledActions != null && enabledActions.contains(EnabledActions.ACTION_SPAM)); + } + + public boolean canReply() { + EnumSet enabledActions = getEnabledActions(); + return (enabledActions != null && enabledActions.contains(EnabledActions.ACTION_REPLY)); + } + + public boolean canTrash() { + return canModerate(); + } + + public boolean canEdit(int localBlogId) { + return (localBlogId > 0 && canModerate()); + } + + public boolean canLike() { + EnumSet enabledActions = getEnabledActions(); + return (enabledActions != null && enabledActions.contains(EnabledActions.ACTION_LIKE)); + } + private String getLocalStatus() { return StringUtils.notNullStr(mLocalStatus); } -- cgit v1.2.3 From 678a6202126af34960dfd325520781e377906809 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Tue, 6 Sep 2016 13:15:07 -0300 Subject: deleted unused import --- WordPress/src/main/java/org/wordpress/android/GCMMessageService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index 3f2284aac..a816e224a 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -40,7 +40,6 @@ import org.wordpress.android.util.StringUtils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -- cgit v1.2.3 From 81722ab8bbee9bcf6bce2a3ffaef489829864929 Mon Sep 17 00:00:00 2001 From: Nawab Date: Mon, 12 Sep 2016 01:12:28 +0530 Subject: Fixed issue #4327 : Apostrophe displayed incorrectly when replying from a notification --- .../android/ui/comments/CommentDetailFragment.java | 84 ++++++++++------------ 1 file changed, 38 insertions(+), 46 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index 15ffa897d..86a70e37d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -28,6 +28,7 @@ import com.android.volley.VolleyError; import com.simperium.client.BucketObjectMissingException; import com.wordpress.rest.RestRequest; +import org.apache.commons.lang.StringEscapeUtils; import org.json.JSONObject; import org.wordpress.android.Constants; import org.wordpress.android.R; @@ -76,7 +77,6 @@ import org.wordpress.android.widgets.WPNetworkImageView; import java.util.EnumSet; import java.util.List; -import java.util.Locale; import de.greenrobot.event.EventBus; @@ -85,58 +85,44 @@ import de.greenrobot.event.EventBus; * prior to this there were separate comment detail screens for each list */ public class CommentDetailFragment extends Fragment implements NotificationFragment { + private static final String KEY_LOCAL_BLOG_ID = "local_blog_id"; + private static final String KEY_COMMENT_ID = "comment_id"; + private static final String KEY_NOTE_ID = "note_id"; private int mLocalBlogId; private int mRemoteBlogId; - private Comment mComment; private Note mNote; - private SuggestionAdapter mSuggestionAdapter; private SuggestionServiceConnectionManager mSuggestionServiceConnectionManager; - private TextView mTxtStatus; private TextView mTxtContent; private View mSubmitReplyBtn; private SuggestionAutoCompleteText mEditReply; private ViewGroup mLayoutReply; private ViewGroup mLayoutButtons; - private View mBtnLikeComment; private ImageView mBtnLikeIcon; private TextView mBtnLikeTextView; - private View mBtnModerateComment; private ImageView mBtnModerateIcon; private TextView mBtnModerateTextView; - private TextView mBtnSpamComment; private TextView mBtnTrashComment; - private String mRestoredReplyText; private String mRestoredNoteId; - private boolean mIsUsersBlog = false; private boolean mShouldFocusReplyField; - /* * Used to request a comment from a note using its site and comment ids, rather than build * the comment with the content in the note. See showComment() */ private boolean mShouldRequestCommentFromNote = false; - private boolean mIsSubmittingReply = false; - private NotificationsDetailListFragment mNotificationsDetailListFragment; - private OnCommentChangeListener mOnCommentChangeListener; private OnPostClickListener mOnPostClickListener; private OnCommentActionListener mOnCommentActionListener; private OnNoteCommentActionListener mOnNoteCommentActionListener; - - private static final String KEY_LOCAL_BLOG_ID = "local_blog_id"; - private static final String KEY_COMMENT_ID = "comment_id"; - private static final String KEY_NOTE_ID = "note_id"; - /* * these determine which actions (moderation, replying, marking as spam) to enable * for this comment - all actions are enabled when opened from the comment list, only @@ -219,11 +205,11 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm mLayoutButtons = (ViewGroup) inflater.inflate(R.layout.comment_action_footer, null, false); mBtnLikeComment = mLayoutButtons.findViewById(R.id.btn_like); - mBtnLikeIcon = (ImageView)mLayoutButtons.findViewById(R.id.btn_like_icon); - mBtnLikeTextView = (TextView)mLayoutButtons.findViewById(R.id.btn_like_text); + mBtnLikeIcon = (ImageView) mLayoutButtons.findViewById(R.id.btn_like_icon); + mBtnLikeTextView = (TextView) mLayoutButtons.findViewById(R.id.btn_like_text); mBtnModerateComment = mLayoutButtons.findViewById(R.id.btn_moderate); - mBtnModerateIcon = (ImageView)mLayoutButtons.findViewById(R.id.btn_moderate_icon); - mBtnModerateTextView = (TextView)mLayoutButtons.findViewById(R.id.btn_moderate_text); + mBtnModerateIcon = (ImageView) mLayoutButtons.findViewById(R.id.btn_moderate_icon); + mBtnModerateTextView = (TextView) mLayoutButtons.findViewById(R.id.btn_moderate_text); mBtnSpamComment = (TextView) mLayoutButtons.findViewById(R.id.text_btn_spam); mBtnTrashComment = (TextView) mLayoutButtons.findViewById(R.id.image_trash_comment); @@ -503,6 +489,10 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm return mRemoteBlogId; } + private void setRemoteBlogId(int remoteBlogId) { + mRemoteBlogId = remoteBlogId; + } + /* * reload the current comment from the local database */ @@ -702,25 +692,25 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm if (!postExists) { AppLog.d(T.COMMENTS, "comment detail > retrieving post"); ReaderPostActions.requestPost(blogId, postId, new ReaderActions.OnRequestListener() { - @Override - public void onSuccess() { - if (!isAdded()) return; - - // update title if it wasn't set above - if (!hasTitle) { - String postTitle = ReaderPostTable.getPostTitle(blogId, postId); - if (!TextUtils.isEmpty(postTitle)) { - setPostTitle(txtPostTitle, postTitle, true); - } else { - txtPostTitle.setText(R.string.untitled); - } - } - } + @Override + public void onSuccess() { + if (!isAdded()) return; - @Override - public void onFailure(int statusCode) { + // update title if it wasn't set above + if (!hasTitle) { + String postTitle = ReaderPostTable.getPostTitle(blogId, postId); + if (!TextUtils.isEmpty(postTitle)) { + setPostTitle(txtPostTitle, postTitle, true); + } else { + txtPostTitle.setText(R.string.untitled); } - }); + } + } + + @Override + public void onFailure(int statusCode) { + } + }); } txtPostTitle.setOnClickListener(new View.OnClickListener() { @@ -838,7 +828,8 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm } } else { String errorMessage = TextUtils.isEmpty(result.getMessage()) ? getString(R.string.reply_failed) : result.getMessage(); - ToastUtils.showToast(getActivity(), errorMessage, ToastUtils.Duration.LONG); + String strUnEscapeHTML = StringEscapeUtils.unescapeHtml(errorMessage); + ToastUtils.showToast(getActivity(), strUnEscapeHTML, ToastUtils.Duration.LONG); // refocus editor on failure and show soft keyboard EditTextUtils.showSoftInput(mEditReply); } @@ -991,18 +982,23 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm private boolean canModerate() { return mEnabledActions != null && (mEnabledActions.contains(EnabledActions.ACTION_APPROVE) || mEnabledActions.contains(EnabledActions.ACTION_UNAPPROVE)); } + private boolean canMarkAsSpam() { return (mEnabledActions != null && mEnabledActions.contains(EnabledActions.ACTION_SPAM)); } + private boolean canReply() { return (mEnabledActions != null && mEnabledActions.contains(EnabledActions.ACTION_REPLY)); } + private boolean canTrash() { return canModerate(); } + private boolean canEdit() { return (mLocalBlogId > 0 && canModerate()); } + private boolean canLike() { return (!mShouldRequestCommentFromNote && mEnabledActions != null && mEnabledActions.contains(EnabledActions.ACTION_LIKE)); } @@ -1071,7 +1067,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm ReaderAnim.animateLikeButton(mBtnLikeIcon, mBtnLikeComment.isActivated()); // Bump analytics - AnalyticsTracker.track(mBtnLikeComment.isActivated() ? Stat.NOTIFICATION_LIKED : Stat.NOTIFICATION_UNLIKED); + AnalyticsTracker.track(mBtnLikeComment.isActivated() ? Stat.NOTIFICATION_LIKED : Stat.NOTIFICATION_UNLIKED); boolean commentWasUnapproved = false; if (mNotificationsDetailListFragment != null && mComment != null) { @@ -1092,7 +1088,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm new RestRequest.Listener() { @Override public void onResponse(JSONObject response) { - if (response != null && !response.optBoolean("success")) { + if (response != null && !response.optBoolean("success")) { if (!isAdded()) return; // Failed, so switch the button state back @@ -1187,8 +1183,4 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm final String path = String.format("/sites/%s/comments/%s", remoteBlogId, commentId); WordPress.getRestClientUtils().get(path, restListener, restErrListener); } - - private void setRemoteBlogId(int remoteBlogId) { - mRemoteBlogId = remoteBlogId; - } } -- cgit v1.2.3 From 8b47dfdb212e4d1aa183b3249e48e30771953e45 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 12 Sep 2016 10:31:28 +0200 Subject: alpha-21 / 300 version bump --- WordPress/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e17debe23..a098a4388 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -34,8 +34,8 @@ android { defaultConfig { applicationId "org.wordpress.android" - versionName "alpha-20" - versionCode 297 + versionName "alpha-21" + versionCode 300 minSdkVersion 16 targetSdkVersion 24 -- cgit v1.2.3 From aafff95cde19f52f6018a15047723da92bf59695 Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 13 Sep 2016 01:16:09 +0530 Subject: Fixed #4510 : Confusing styling on the Role selection dropdown - Added Drawable to roles textview - Reformatted code --- .../src/main/res/layout/people_invite_fragment.xml | 65 +++++++++++----------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 88428f66c..8e6c60e16 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -1,15 +1,14 @@ - + android:scrollbarStyle="outsideInset"> + android:textSize="@dimen/text_sz_large" /> @@ -38,39 +37,39 @@ android:id="@+id/usernames" android:layout_width="match_parent" android:layout_height="wrap_content" + android:animateLayoutChanges="true" android:background="@drawable/invites_border" - android:paddingLeft="2dp" - android:paddingRight="2dp" android:paddingBottom="@dimen/margin_large" - android:animateLayoutChanges="true" > + android:paddingLeft="2dp" + android:paddingRight="2dp"> + tools:text="sdfwefef" /> + android:textStyle="italic" /> + tools:text="@string/role" /> + tools:text="@string/role" /> @@ -112,15 +115,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_medium" + android:text="@string/invite_message_title" android:textColor="@color/grey_dark" - android:textSize="@dimen/text_sz_large" - android:text="@string/invite_message_title"/> + android:textSize="@dimen/text_sz_large" /> + android:maxLength="@integer/invite_message_char_limit" + android:minLines="4" /> + android:textSize="@dimen/text_sz_small" /> + android:textStyle="italic" /> -- cgit v1.2.3 From 7df39e79d1dc9ebdf2c46a49b8d1f5a8effdbc35 Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 13 Sep 2016 01:28:21 +0530 Subject: Fixed #4510 : Confusing styling on the Role selection dropdown - Added border to role text view --- WordPress/src/main/res/layout/people_invite_fragment.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 8e6c60e16..84441280f 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -99,11 +99,15 @@ android:layout_height="wrap_content" android:layout_marginLeft="1dp" android:layout_marginTop="5dp" + android:background="@drawable/invites_border" android:drawableRight="@drawable/arrow" android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" + android:paddingBottom="@dimen/margin_medium" + android:paddingLeft="@dimen/margin_medium" android:paddingRight="@dimen/margin_medium" + android:paddingTop="@dimen/margin_medium" android:textColor="@color/grey" android:textSize="@dimen/text_sz_medium" tools:text="@string/role" /> -- cgit v1.2.3 From 83180c8167cc80b787f23c0b7ce77e83cb319ed6 Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 13 Sep 2016 01:55:31 +0530 Subject: - Added Info Image for FAQ --- .../src/main/res/layout/people_invite_fragment.xml | 32 ++++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 84441280f..b07bb5264 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -83,15 +83,29 @@ android:background="?android:selectableItemBackground" android:orientation="vertical"> - + + + + + + Date: Tue, 13 Sep 2016 03:17:04 +0530 Subject: -Added role faq button action -Added linear layout orientation for role textview -Added faq url to strings.xml --- .../android/ui/people/PeopleInviteFragment.java | 36 ++++++++++++++-------- .../src/main/res/layout/people_invite_fragment.xml | 3 +- WordPress/src/main/res/values/strings.xml | 1 + 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index ad39945c2..874f05485 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -2,6 +2,8 @@ package org.wordpress.android.ui.people; import android.app.Fragment; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; @@ -17,6 +19,7 @@ import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.TextView; import org.wordpress.android.R; @@ -30,6 +33,7 @@ import org.wordpress.android.util.NetworkUtils; import org.wordpress.android.util.StringUtils; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.widgets.MultiUsernameEditText; +import org.wordpress.passcodelock.AppLockManager; import java.util.ArrayList; import java.util.Collection; @@ -50,15 +54,13 @@ public class PeopleInviteFragment extends Fragment implements private static final int MAX_NUMBER_OF_INVITEES = 10; private static final String[] USERNAME_DELIMITERS = {" ", ","}; - + private final Map mUsernameButtons = new LinkedHashMap<>(); + private final HashMap mUsernameResults = new HashMap<>(); + private final Map mUsernameErrorViews = new Hashtable<>(); private ViewGroup mUsernamesContainer; private MultiUsernameEditText mUsernameEditText; private TextView mRoleTextView; private EditText mCustomMessageEditText; - - private final Map mUsernameButtons = new LinkedHashMap<>(); - private final HashMap mUsernameResults = new HashMap<>(); - private final Map mUsernameErrorViews = new Hashtable<>(); private Role mRole; private String mCustomMessage = ""; private boolean mInviteOperationInProgress = false; @@ -194,7 +196,7 @@ public class PeopleInviteFragment extends Fragment implements populateUsernameButtons(usernames); } - View roleContainer = view.findViewById(R.id.role_container); + View roleContainer = view.findViewById(R.id.role); roleContainer.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -202,9 +204,18 @@ public class PeopleInviteFragment extends Fragment implements } }); mRoleTextView = (TextView) view.findViewById(R.id.role); - setRole(role); + ImageView imgInfo = (ImageView) view.findViewById(R.id.imgInfo); + imgInfo.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Uri uri = Uri.parse(getString(R.string.role_info_url)); + AppLockManager.getInstance().setExtendedTimeout(); + startActivity(new Intent(Intent.ACTION_VIEW, uri)); + } + }); + final int MAX_CHARS = getResources().getInteger(R.integer.invite_message_char_limit); final TextView remainingCharsTextView = (TextView) view.findViewById(R.id.message_remaining); @@ -345,6 +356,7 @@ public class PeopleInviteFragment extends Fragment implements /** * Deletes the last entered username. + * * @return true if the username was deleted */ private boolean removeLastEnteredUsername() { @@ -402,7 +414,7 @@ public class PeopleInviteFragment extends Fragment implements return; } - if(!isUserInInvitees(username)){ + if (!isUserInInvitees(username)) { //user is removed from invitees before validation return; } @@ -435,10 +447,6 @@ public class PeopleInviteFragment extends Fragment implements } } - public interface ValidationEndListener { - void onValidationEnd(); - } - private void styleButton(String username, String validationResultMessage) { if (!isAdded()) { return; @@ -630,4 +638,8 @@ public class PeopleInviteFragment extends Fragment implements Blog blog = WordPress.wpDB.getBlogForDotComBlogId(dotComBlogId); return blog != null && blog.isPrivate(); } + + public interface ValidationEndListener { + void onValidationEnd(); + } } diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index b07bb5264..90b9c1a71 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -85,7 +85,8 @@ + android:layout_height="wrap_content" + android:orientation="horizontal"> Some media uploads have failed. You can\'t save or publish your post in this state. Would you like to remove all failed media? Remove failed uploads + http://en.support.wordpress.com/user-roles/ -- cgit v1.2.3 From a76c836b251f2f63e376065bb6de3fdeacc529fc Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 13 Sep 2016 15:23:34 +0300 Subject: Align invites error messages to the API ones --- WordPress/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 4c8d02bf8..9215eb725 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -1413,9 +1413,9 @@ Usernames or Emails Invite @string/invite - No user was found for username \'%s\' - There\'s already a member with username \'%s\' - The email address \'%s\' is invalid + %s: User not found + %s: Already a member + %s: Invalid email Custom Message 0 characters remaining 1 character remaining -- cgit v1.2.3 From 2ed5b5969191d20aa72bf27b083ec50b848e4da1 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 13 Sep 2016 15:28:53 +0300 Subject: Support invites API errors: blocked, following --- .../org/wordpress/android/ui/people/PeopleInviteFragment.java | 4 ++++ .../java/org/wordpress/android/ui/people/utils/PeopleUtils.java | 8 ++++++++ WordPress/src/main/res/values/strings.xml | 2 ++ 3 files changed, 14 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index ad39945c2..ccbb4d8f5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -461,6 +461,10 @@ public class PeopleInviteFragment extends Fragment implements return getString(R.string.invite_username_not_found, username); case ALREADY_MEMBER: return getString(R.string.invite_already_a_member, username); + case ALREADY_FOLLOWING: + return getString(R.string.invite_already_following, username); + case BLOCKED_INVITES: + return getString(R.string.invite_user_blocked_invites, username); case INVALID_EMAIL: return getString(R.string.invite_invalid_email, username); case USER_FOUND: diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java index 16463981f..3a75303d5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java @@ -376,6 +376,12 @@ public class PeopleUtils { case "invalid_input_has_role": callback.onUsernameValidation(username, ValidationResult.ALREADY_MEMBER); continue; + case "invalid_input_following": + callback.onUsernameValidation(username, ValidationResult.ALREADY_FOLLOWING); + continue; + case "invalid_user_blocked_invites": + callback.onUsernameValidation(username, ValidationResult.BLOCKED_INVITES); + continue; } callback.onError(); @@ -434,6 +440,8 @@ public class PeopleUtils { enum ValidationResult { USER_NOT_FOUND, ALREADY_MEMBER, + ALREADY_FOLLOWING, + BLOCKED_INVITES, INVALID_EMAIL, USER_FOUND } diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 9215eb725..dada1a0bb 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -1415,6 +1415,8 @@ @string/invite %s: User not found %s: Already a member + %s: Already following + %s: User blocked invites %s: Invalid email Custom Message 0 characters remaining -- cgit v1.2.3 From edd7185c51e2cd60a5e8e6f53fd8e6b0d0f1f978 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Thu, 15 Sep 2016 07:11:50 -0700 Subject: alpha-21 / 303 version bump --- WordPress/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index a098a4388..9776ae7a6 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -35,7 +35,7 @@ android { defaultConfig { applicationId "org.wordpress.android" versionName "alpha-21" - versionCode 300 + versionCode 303 minSdkVersion 16 targetSdkVersion 24 -- cgit v1.2.3 From 160db9a81c04fbc47198e65db7888bedd5ca04c8 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Mon, 19 Sep 2016 11:13:33 -0700 Subject: Updating gradle version to 2.2 for Android Studio 2.2 --- WordPress/build.gradle | 2 +- libs/analytics/WordPressAnalytics/build.gradle | 2 +- libs/editor/WordPressEditor/build.gradle | 2 +- libs/editor/example/build.gradle | 2 +- libs/networking/WordPressNetworking/build.gradle | 2 +- libs/utils/WordPressUtils/build.gradle | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9776ae7a6..e0b8f6368 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' classpath 'io.fabric.tools:gradle:1.+' } } diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle index e7949266f..bbce61996 100644 --- a/libs/analytics/WordPressAnalytics/build.gradle +++ b/libs/analytics/WordPressAnalytics/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 17e88bb72..90b31e5a1 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle index 091d578a1..d45489a35 100644 --- a/libs/editor/example/build.gradle +++ b/libs/editor/example/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle index 038e9362b..c0e937773 100644 --- a/libs/networking/WordPressNetworking/build.gradle +++ b/libs/networking/WordPressNetworking/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' } } diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index 316210576..20bea76f2 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' classpath 'com.novoda:bintray-release:0.3.4' } } -- cgit v1.2.3 From eb82bcf87b2561706ab040b16f69ddfa857d0fa2 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Mon, 19 Sep 2016 11:23:11 -0700 Subject: Updating support library to 24.2.1 --- WordPress/build.gradle | 16 ++++++++-------- libs/editor/WordPressEditor/build.gradle | 6 +++--- libs/utils/WordPressUtils/build.gradle | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e0b8f6368..720f9ef46 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -84,16 +84,16 @@ dependencies { compile 'com.google.code.gson:gson:2.6.+' compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' - compile 'com.android.support:support-compat:24.2.0' - compile 'com.android.support:support-core-ui:24.2.0' - compile 'com.android.support:support-fragment:24.2.0' + compile 'com.android.support:support-compat:24.2.1' + compile 'com.android.support:support-core-ui:24.2.1' + compile 'com.android.support:support-fragment:24.2.1' compile 'com.android.support:multidex:1.0.1' - compile 'com.android.support:appcompat-v7:24.2.0' - compile 'com.android.support:cardview-v7:24.2.0' - compile 'com.android.support:recyclerview-v7:24.2.0' - compile 'com.android.support:design:24.2.0' - compile 'com.android.support:percent:24.2.0' + compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:cardview-v7:24.2.1' + compile 'com.android.support:recyclerview-v7:24.2.1' + compile 'com.android.support:design:24.2.1' + compile 'com.android.support:percent:24.2.1' compile 'com.google.android.gms:play-services-gcm:9.0.2' compile 'com.google.android.gms:play-services-auth:9.0.2' diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 90b31e5a1..ccfb60927 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -45,9 +45,9 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:24.1.1' - compile 'com.android.support:support-v4:24.1.1' - compile 'com.android.support:design:24.1.1' + compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:support-v4:24.2.1' + compile 'com.android.support:design:24.2.1' compile 'org.wordpress:utils:1.11.0' } diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index 20bea76f2..96191a5d0 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -20,7 +20,7 @@ dependencies { exclude group: 'commons-logging' } compile 'com.mcxiaoke.volley:library:1.0.18' - compile 'com.android.support:support-v13:24.1.1' + compile 'com.android.support:support-v13:24.2.1' } android { -- cgit v1.2.3 From 69807c1d0947eb830f777ea3b4c246e9213604d5 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Mon, 19 Sep 2016 11:42:01 -0700 Subject: Adding _nested to ids so that there are no duplicates --- WordPress/src/main/res/xml/site_settings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml index 3bc42741e..b017142eb 100644 --- a/WordPress/src/main/res/xml/site_settings.xml +++ b/WordPress/src/main/res/xml/site_settings.xml @@ -149,19 +149,19 @@ android:title="@string/site_settings_discussion_new_posts_header"> -- cgit v1.2.3 From eeb7b0bac0237d8e151bf62cc47131adc8182e2a Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Mon, 19 Sep 2016 15:22:02 -0700 Subject: Updating to gradle 3.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 53319 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d3b83982b..3baa851b2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29ddea19f..728b41b91 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 16 16:49:36 CEST 2016 +#Mon Sep 19 15:20:48 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip -- cgit v1.2.3 From 8f872df6d4e602e6b78b2e13b9329addd26a0ef1 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 22 Sep 2016 11:03:44 -0700 Subject: Updating gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 728b41b91..76f244240 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 19 15:20:48 PDT 2016 +#Thu Sep 22 11:02:09 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip -- cgit v1.2.3 From f1f869399d09fcdf02d15a7b0aabb1f3caf378c9 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 22 Sep 2016 12:53:42 -0700 Subject: Correcting type of formatted string --- WordPress/src/main/res/values-bg/strings.xml | 2 +- WordPress/src/main/res/values-cs/strings.xml | 2 +- WordPress/src/main/res/values-de/strings.xml | 2 +- WordPress/src/main/res/values-en-rAU/strings.xml | 2 +- WordPress/src/main/res/values-en-rCA/strings.xml | 2 +- WordPress/src/main/res/values-en-rGB/strings.xml | 2 +- WordPress/src/main/res/values-es/strings.xml | 2 +- WordPress/src/main/res/values-fr/strings.xml | 2 +- WordPress/src/main/res/values-he/strings.xml | 2 +- WordPress/src/main/res/values-id/strings.xml | 2 +- WordPress/src/main/res/values-ja/strings.xml | 2 +- WordPress/src/main/res/values-ko/strings.xml | 2 +- WordPress/src/main/res/values-nl/strings.xml | 2 +- WordPress/src/main/res/values-pl/strings.xml | 2 +- WordPress/src/main/res/values-pt-rBR/strings.xml | 2 +- WordPress/src/main/res/values-ro/strings.xml | 2 +- WordPress/src/main/res/values-ru/strings.xml | 2 +- WordPress/src/main/res/values-sq/strings.xml | 2 +- WordPress/src/main/res/values-sv/strings.xml | 2 +- WordPress/src/main/res/values-tr/strings.xml | 2 +- WordPress/src/main/res/values-zh-rCN/strings.xml | 2 +- WordPress/src/main/res/values-zh-rHK/strings.xml | 2 +- WordPress/src/main/res/values-zh-rTW/strings.xml | 2 +- WordPress/src/main/res/values/strings.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/WordPress/src/main/res/values-bg/strings.xml b/WordPress/src/main/res/values-bg/strings.xml index 6ee6660f3..19a3e653c 100644 --- a/WordPress/src/main/res/values-bg/strings.xml +++ b/WordPress/src/main/res/values-bg/strings.xml @@ -10,7 +10,7 @@ Без Ляво Дясно - Избрано %1$s + Избрано %1$d Неуспешно извикване на потребителите Управление на плана ви\nWordPress.com/plans Все още нямате потребители. diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml index d5804142b..8c5b2aa63 100644 --- a/WordPress/src/main/res/values-cs/strings.xml +++ b/WordPress/src/main/res/values-cs/strings.xml @@ -10,7 +10,7 @@ Žádné Doleva Doprava - Vyberte %1$s + Vyberte %1$d Nelze načíst uživatele webu Spravuj svůj plán na\nWordPress.com/plans Nemáte ještě nějaké otázky. diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml index e6fe09a7f..a6768667a 100644 --- a/WordPress/src/main/res/values-de/strings.xml +++ b/WordPress/src/main/res/values-de/strings.xml @@ -10,7 +10,7 @@ Keine Links Rechts - Ausgewählt %1$s + Ausgewählt %1$d Website-Benutzer konnten nicht abgerufen werden Verwalte deinen Tarif auf\nWordPress.com/plans Du hast noch keine Besucher. diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml index ae9f7969f..5e0cfb1f8 100644 --- a/WordPress/src/main/res/values-en-rAU/strings.xml +++ b/WordPress/src/main/res/values-en-rAU/strings.xml @@ -10,7 +10,7 @@ None Left Right - Selected %1$s + Selected %1$d Couldn\'t retrieve site users Manage your plan at\nWordPress.com/plans You don\'t have any viewers yet. diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml index 972777722..42995f2e2 100644 --- a/WordPress/src/main/res/values-en-rCA/strings.xml +++ b/WordPress/src/main/res/values-en-rCA/strings.xml @@ -10,7 +10,7 @@ None Left Right - Selected %1$s + Selected %1$d Couldn\'t retrieve site users Manage your plan at\nWordPress.com/plans You don\'t have any viewers yet. diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml index 428b6af15..09648653b 100644 --- a/WordPress/src/main/res/values-en-rGB/strings.xml +++ b/WordPress/src/main/res/values-en-rGB/strings.xml @@ -10,7 +10,7 @@ None Left Right - Selected %1$s + Selected %1$d Couldn\'t retrieve site users Manage your plan at\nWordPress.com/plans You don\'t have any viewers yet. diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml index 9696f6d45..60a4407ce 100644 --- a/WordPress/src/main/res/values-es/strings.xml +++ b/WordPress/src/main/res/values-es/strings.xml @@ -10,7 +10,7 @@ Ninguna Izquierda Derecha - Elegido %1$s + Elegido %1$d No se pudieron recuperar los usuarios del sitio Gestiona tu plan en\nWordPress.com/plans Seguidor diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml index 7ea5126a1..bb0bdb6eb 100644 --- a/WordPress/src/main/res/values-fr/strings.xml +++ b/WordPress/src/main/res/values-fr/strings.xml @@ -10,7 +10,7 @@ Aucun Gauche Droit - Sélectionné %1$s + Sélectionné %1$d Impossible de récupérer les utilisateurs du site Gérez votre plan sur\nWordPress.com/plans Vous n\'avez pas encore de lecteur. diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml index b4bff0b69..89aa2e3f0 100644 --- a/WordPress/src/main/res/values-he/strings.xml +++ b/WordPress/src/main/res/values-he/strings.xml @@ -7,7 +7,7 @@ עוקב צופה אין חיבור, הפרופיל לא נשמר - %1$s נבחרו + %1$d נבחרו ניהול התוכנית שלך בכתובת\nWordPress.com/plans עוקב אין לך צופים עדיין. diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml index cc26d2e69..b35517cd3 100644 --- a/WordPress/src/main/res/values-id/strings.xml +++ b/WordPress/src/main/res/values-id/strings.xml @@ -10,7 +10,7 @@ Tak ada Kiri Kanan - Memilih %1$s + Memilih %1$d Gagal menampilkan pengguna situs Kelola paket Anda di \nWordPress.com/plans Anda belum memiliki satupun pengunjung. diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml index 5956e5f59..212e1f8b6 100644 --- a/WordPress/src/main/res/values-ja/strings.xml +++ b/WordPress/src/main/res/values-ja/strings.xml @@ -10,7 +10,7 @@ なし 左 右 - %1$s が選択されています + %1$d が選択されています サイトのユーザーを取得できませんでした プランの管理は次で行います\nWordPress.com/plans フォロワー diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml index 39e74a58b..217096d76 100644 --- a/WordPress/src/main/res/values-ko/strings.xml +++ b/WordPress/src/main/res/values-ko/strings.xml @@ -10,7 +10,7 @@ 없음 왼쪽 오른쪽 - %1$s 선택 + %1$d 선택 사이트 사용자를 가져올 수 없습니다. 요금제 관리:\n워드프레스닷컴/요금제 아직 방문자가 없습니다. diff --git a/WordPress/src/main/res/values-nl/strings.xml b/WordPress/src/main/res/values-nl/strings.xml index 15c955fa6..b9d83da3f 100644 --- a/WordPress/src/main/res/values-nl/strings.xml +++ b/WordPress/src/main/res/values-nl/strings.xml @@ -1,7 +1,7 @@ Lezer - Geselecteerde %1$s + Geselecteerde %1$d Site-gebruikers ophalen mislukt Beheer je abonnement op\nWordPress.com/plans Je hebt nog geen volgers. diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml index a798b3532..4385d53f4 100644 --- a/WordPress/src/main/res/values-pl/strings.xml +++ b/WordPress/src/main/res/values-pl/strings.xml @@ -10,7 +10,7 @@ Wyrównaj do prawej Wyrównaj do lewej Brak wyrównania - Wybrano %1$s + Wybrano %1$d Nie można pobrać użytkowników witryny Zarządzaj swoim planem na\nWorPress.com/plans Witryna nie ma jeszcze oglądających diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml index 992a9540f..44a917608 100644 --- a/WordPress/src/main/res/values-pt-rBR/strings.xml +++ b/WordPress/src/main/res/values-pt-rBR/strings.xml @@ -10,7 +10,7 @@ Esquerda Direita Nenhum - Selecionado %1$s + Selecionado %1$d Não foi possível recuperar os usuários do site Gerenciar o seu plano em\nWordPress.com/plans Seguidor diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml index 9fa8cf004..518a451c9 100644 --- a/WordPress/src/main/res/values-ro/strings.xml +++ b/WordPress/src/main/res/values-ro/strings.xml @@ -10,7 +10,7 @@ Niciuna Stânga Dreapta - Selectate %1$s + Selectate %1$d N-am putut aduce utilizatorii sitului Administrează-ți planul la\nWordPress.com/plans Nu ai încă niciun vizitator. diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml index 4c048392f..ed0e72022 100644 --- a/WordPress/src/main/res/values-ru/strings.xml +++ b/WordPress/src/main/res/values-ru/strings.xml @@ -10,7 +10,7 @@ Нет Слева Справа - Выбрано %1$s + Выбрано %1$d Не удалось получить список пользователей сайта Управление тарифными планами:\nwordpress.com/plans У вас пока нет обозревателей. diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml index 5a3e0d02e..79e61c4f4 100644 --- a/WordPress/src/main/res/values-sq/strings.xml +++ b/WordPress/src/main/res/values-sq/strings.xml @@ -10,7 +10,7 @@ Pa drejtim Majtas Djathtas - U përzgjodh %1$s + U përzgjodh %1$d S&#8217;u morën dot përdorues të sajtit Administroni planin tuaj te\nWordPress.com/plans Po sillen përdoruesit… diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml index 9bac79d29..656ae5110 100644 --- a/WordPress/src/main/res/values-sv/strings.xml +++ b/WordPress/src/main/res/values-sv/strings.xml @@ -10,7 +10,7 @@ Ingen Vänster Höger - Vald %1$s + Vald %1$d Kunde inte hämta webbplatsens användare Uppgradera ditt paket på\nWordPress.com/plans Du har inga läsare än. diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml index c068b51be..41eb65188 100644 --- a/WordPress/src/main/res/values-tr/strings.xml +++ b/WordPress/src/main/res/values-tr/strings.xml @@ -10,7 +10,7 @@ Hiçbiri Sol Sağ - %1$s seçildi + %1$d seçildi Site kullanıcıları getirilemedi Planınızı yönetin:\nWordPress.com/plans Henüz hiç izleyiciniz yok. diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml index eb0db30af..70e112f0f 100644 --- a/WordPress/src/main/res/values-zh-rCN/strings.xml +++ b/WordPress/src/main/res/values-zh-rCN/strings.xml @@ -10,7 +10,7 @@ 无 左 右 - 已选择 %1$s + 已选择 %1$d 无法检索站点用户 在 WordPress.com/plans 上\n管理您的套餐 您目前没有任何查看者。 diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml index a160c0bf3..b778f24b6 100644 --- a/WordPress/src/main/res/values-zh-rHK/strings.xml +++ b/WordPress/src/main/res/values-zh-rHK/strings.xml @@ -10,7 +10,7 @@ 無 左 右 - 已選取 %1$s + 已選取 %1$d 如果移除這位瀏覽者，對方將無法造訪此網站。\n\n仍要移除這位瀏覽者嗎？ 移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？ 自 %1$s 開始 diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml index 3cbf4858e..f60d726d7 100644 --- a/WordPress/src/main/res/values-zh-rTW/strings.xml +++ b/WordPress/src/main/res/values-zh-rTW/strings.xml @@ -10,7 +10,7 @@ 無 左 右 - 已選取 %1$s + 已選取 %1$d 如果移除這位瀏覽者，對方將無法造訪此網站。\n\n仍要移除這位瀏覽者嗎？ 移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？ 自 %1$s 開始 diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 4c8d02bf8..dd335a5a3 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -585,7 +585,7 @@ 1 item %d items - Selected %1$s + Selected %1$d No items Enter a word or phrase When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\" -- cgit v1.2.3 From 71967e8c4b6a3cc3457ed87f2eb9df4ca7d380c8 Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 22 Sep 2016 13:04:37 -0700 Subject: Removing "reader_timespan_now" and "reader_label_image_count" as they were unused AND there were lint warnings about them --- WordPress/src/main/res/values-bg/strings.xml | 1 - WordPress/src/main/res/values-cs/strings.xml | 2 -- WordPress/src/main/res/values-da/strings.xml | 1 - WordPress/src/main/res/values-de/strings.xml | 1 - WordPress/src/main/res/values-el/strings.xml | 1 - WordPress/src/main/res/values-en-rAU/strings.xml | 1 - WordPress/src/main/res/values-en-rCA/strings.xml | 2 -- WordPress/src/main/res/values-en-rGB/strings.xml | 2 -- WordPress/src/main/res/values-es-rCL/strings.xml | 1 - WordPress/src/main/res/values-es/strings.xml | 1 - WordPress/src/main/res/values-eu/strings.xml | 2 -- WordPress/src/main/res/values-fr/strings.xml | 2 -- WordPress/src/main/res/values-gd/strings.xml | 1 - WordPress/src/main/res/values-he/strings.xml | 2 -- WordPress/src/main/res/values-hi/strings.xml | 1 - WordPress/src/main/res/values-id/strings.xml | 2 -- WordPress/src/main/res/values-it/strings.xml | 1 - WordPress/src/main/res/values-ja/strings.xml | 2 -- WordPress/src/main/res/values-ko/strings.xml | 1 - WordPress/src/main/res/values-mk/strings.xml | 1 - WordPress/src/main/res/values-ms/strings.xml | 1 - WordPress/src/main/res/values-pl/strings.xml | 1 - WordPress/src/main/res/values-pt-rBR/strings.xml | 1 - WordPress/src/main/res/values-ro/strings.xml | 1 - WordPress/src/main/res/values-ru/strings.xml | 2 -- WordPress/src/main/res/values-sk/strings.xml | 1 - WordPress/src/main/res/values-sq/strings.xml | 1 - WordPress/src/main/res/values-sv/strings.xml | 1 - WordPress/src/main/res/values-th/strings.xml | 1 - WordPress/src/main/res/values-tr/strings.xml | 2 -- WordPress/src/main/res/values-zh-rCN/strings.xml | 2 -- WordPress/src/main/res/values-zh-rHK/strings.xml | 2 -- WordPress/src/main/res/values-zh-rTW/strings.xml | 1 - 33 files changed, 45 deletions(-) diff --git a/WordPress/src/main/res/values-bg/strings.xml b/WordPress/src/main/res/values-bg/strings.xml index 19a3e653c..058697808 100644 --- a/WordPress/src/main/res/values-bg/strings.xml +++ b/WordPress/src/main/res/values-bg/strings.xml @@ -29,7 +29,6 @@ Последователите ще спрат да получават известия за сайта ако ги премахнете, освен ако не го добавят отново.\n\nЖелаете ли да продължите с премахването? От %1$s Преглед - %d снимки Неуспешно премахване на последователя Неуспешно премахване на потребителя Неуспешно показване на последователите по имейл. diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml index 8c5b2aa63..bc0f734be 100644 --- a/WordPress/src/main/res/values-cs/strings.xml +++ b/WordPress/src/main/res/values-cs/strings.xml @@ -28,7 +28,6 @@ Chcete odstranit tento prohlížeč, pak už nikdo nebude moct navštívit tuto webovou stránku.\n\nChcete určitě odstranit tento prohlížeč? Pokud odstraníte tohoto fanouška, nebude už dostávat žádné upozornění z tohoto webu..\n\nChcete určitě odstranit tohoto fanouška? Od %1$s - %d obrázků Zobrazit galerii Nepodařilo se odstranit fanouška Nepodařilo se odstranit zobrazení @@ -980,7 +979,6 @@ Tento seznam je prázdný Vyberte z knihovny medií Plugin Jetpack nebyl nalezen - nyní (bez názvu) Sdíleno z %s Sledovat diff --git a/WordPress/src/main/res/values-da/strings.xml b/WordPress/src/main/res/values-da/strings.xml index 574ac0fd4..049a06343 100644 --- a/WordPress/src/main/res/values-da/strings.xml +++ b/WordPress/src/main/res/values-da/strings.xml @@ -480,7 +480,6 @@ Opret galleri Listen er tom Vælg fra mediebiblioteket - nu Tilføjede %s Fjernede %s Du synes godt om dette diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml index a6768667a..6434c48d1 100644 --- a/WordPress/src/main/res/values-de/strings.xml +++ b/WordPress/src/main/res/values-de/strings.xml @@ -29,7 +29,6 @@ Nach dem Entfernen bekommt der Follower keine Mitteilungen über dieser Website mehr, bis er wieder folgt.\n\nMöchtest du diesen Follower noch immer entfernen? Seit %1$s Galerie anzeigen - %d Bilder Konnte Follower nicht entfernen Konnte Besucher nicht entfernen Konnte E-Mail-Follower der Website nicht abrufen diff --git a/WordPress/src/main/res/values-el/strings.xml b/WordPress/src/main/res/values-el/strings.xml index 1543fadf7..e002f9e8b 100644 --- a/WordPress/src/main/res/values-el/strings.xml +++ b/WordPress/src/main/res/values-el/strings.xml @@ -933,7 +933,6 @@ Διαλέξτε από την βιβλιοθήκη πολυμέσων Το Jetpack plugin είναι αναγκαίο για την συλλογή στατιστικών στοιχείων. Θέλετε να εγκαταστήσετε το Jetpack; Δεν βρέθηκε το Jetpack plugin - τώρα Ανώνυμο Μοιράστηκε από %s Μοιράσου diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml index 5e0cfb1f8..4bc48a4a8 100644 --- a/WordPress/src/main/res/values-en-rAU/strings.xml +++ b/WordPress/src/main/res/values-en-rAU/strings.xml @@ -29,7 +29,6 @@ If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? Since %1$s View Gallery - %d images Couldn\'t remove follower Couldn\'t remove viewer Couldn\'t retrieve site email followers diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml index 42995f2e2..7f619d777 100644 --- a/WordPress/src/main/res/values-en-rCA/strings.xml +++ b/WordPress/src/main/res/values-en-rCA/strings.xml @@ -29,7 +29,6 @@ If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? Since %1$s View Gallery - %d images Couldn\'t remove follower Couldn\'t remove viewer Couldn\'t retrieve site email followers @@ -978,7 +977,6 @@ Select from media library The Jetpack plugin is required for stats. Do you want to install Jetpack? Jetpack plugin not found - now (Untitled) Shared from %s Share diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml index 09648653b..97ddbf428 100644 --- a/WordPress/src/main/res/values-en-rGB/strings.xml +++ b/WordPress/src/main/res/values-en-rGB/strings.xml @@ -29,7 +29,6 @@ If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? Since %1$s View Gallery - %d images Couldn\'t remove follower Couldn\'t remove viewer Couldn\'t retrieve site email followers @@ -978,7 +977,6 @@ Select from media library The Jetpack plugin is required for stats. Do you want to install Jetpack? Jetpack plugin not found - now (Untitled) Shared from %s Share diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml index 8a9498983..f2d77a687 100644 --- a/WordPress/src/main/res/values-es-rCL/strings.xml +++ b/WordPress/src/main/res/values-es-rCL/strings.xml @@ -565,7 +565,6 @@ Seleccionar de la biblioteca multimedia Necesitas el pluging Jetpack para tener estadísticas estadísticas. ¿Quieres instalar Jetpack? No se ha encontrado el plugin Jetpack - ahora Sin título Compartido desde %s Compartir diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml index 60a4407ce..f241f97c1 100644 --- a/WordPress/src/main/res/values-es/strings.xml +++ b/WordPress/src/main/res/values-es/strings.xml @@ -29,7 +29,6 @@ Si lo eliminas, este seguidor dejará de recibir informaciones de tu sitio, a no ser que vuelta a seguirte. \n\n¿Todavía quieres eliminar a este seguidor? Desde %1$s Ver galería - %d imágenes No se pudo quitar al seguidor No se pudo quitar el espectador No se pudieron recuperar los correos electrónicos de los seguidores del sitio diff --git a/WordPress/src/main/res/values-eu/strings.xml b/WordPress/src/main/res/values-eu/strings.xml index 6158ba83d..604310475 100644 --- a/WordPress/src/main/res/values-eu/strings.xml +++ b/WordPress/src/main/res/values-eu/strings.xml @@ -25,7 +25,6 @@ Taldea %1$s-(e)tik Ikusi galeria - %d irudi Ezin izan da jarraitzailea kendu Ezin izan da ikuslea kendu Ezin izan dira guneko e-posta jarraitzaileak eskuratu @@ -629,7 +628,6 @@ Ezin izan da %s ireki Hasi! Zerrenda hau hutsik dago - orain %s-tik partekatua Partekatu Jarraitu diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml index bb0bdb6eb..b215e3b40 100644 --- a/WordPress/src/main/res/values-fr/strings.xml +++ b/WordPress/src/main/res/values-fr/strings.xml @@ -29,7 +29,6 @@ Une fois supprimé, cet abonné ne recevra plus de notifications à propos de ce site, à moins de se réabonner.\n\nVoulez-vous vraiment supprimer cet abonné ? Depuis le %1$s Afficher la galerie - %d images Impossible de supprimer l\'abonné Impossible de supprimer le lecteur Impossible de récupérer les abonnés par e-mail @@ -978,7 +977,6 @@ Sélectionner depuis la bibliothèque média Le module Jetpack est requis pour afficher les statistiques. Voulez-vous installer Jetpack ? Le module Jetpack est introuvable - actuellement (Sans Titre) Partagé depuis %s Partager diff --git a/WordPress/src/main/res/values-gd/strings.xml b/WordPress/src/main/res/values-gd/strings.xml index 7a2044a72..a0e0dfa08 100644 --- a/WordPress/src/main/res/values-gd/strings.xml +++ b/WordPress/src/main/res/values-gd/strings.xml @@ -17,7 +17,6 @@ Ma bheir thu an cleachdaiche seo air falbh, chan fhaigh iad brathan mun làrach seo tuilleadh ach ma nì iad leantainn às ùr.\n\nA bheil thu cinnteach gu bheil thu airson an neach-leantainn seo a thoirt air falbh? A-mach o %1$s Seall an gailearaidh - %d dealbh(an) Cha b’ urrainn dhuinn an neach-leantainn a thoirt air falbh Cha b’ urrainn dhuinn an neach-coimhid a thoirt air falbh Cha b’ urrainn dhuinn na daoine a leanas an làrach slighe puist-d fhaighinn diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml index 89aa2e3f0..da9ed339b 100644 --- a/WordPress/src/main/res/values-he/strings.xml +++ b/WordPress/src/main/res/values-he/strings.xml @@ -23,7 +23,6 @@ לאחר הסרת צופה זה, הוא או היא לא יוכלו לבקר יותר באתר זה.\n\nבחרת להסיר צופה זה - האם ההחלטה סופית? לאחר הסרת עוקב זה, הוא יפסיק לקבל הודעות לגבי אתר זה, אלא אם יגדיר מעקב מחדש.\n\nבחרת להסיר עוקב זה - האם ההחלטה סופית? מאז %1$s - %d תמונות הצגת גלריה לא ניתן היה להסיר עוקב לא ניתן היה להסיר צופה @@ -971,7 +970,6 @@ בחר מתוך ספריית מדיה התוסף Jetpack נדרש לקבלת נתונים סטטיסטיים. אתה מעוניין להתקין את Jetpack? התוסף Jetpack לא נמצא - עכשיו (ללא כותרת) שיתוף מ-%s שתף diff --git a/WordPress/src/main/res/values-hi/strings.xml b/WordPress/src/main/res/values-hi/strings.xml index 0764b44d6..9d1cf7284 100644 --- a/WordPress/src/main/res/values-hi/strings.xml +++ b/WordPress/src/main/res/values-hi/strings.xml @@ -435,7 +435,6 @@ गैलरी बनाएं अमान्य उपयोगकर्ता नाम जेटपैक प्लगइन नहीं मिला - अब एक व्यक्ति ने पसंद किया साझा करे आपने इसे पसंद किया diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml index b35517cd3..1010ca7ac 100644 --- a/WordPress/src/main/res/values-id/strings.xml +++ b/WordPress/src/main/res/values-id/strings.xml @@ -29,7 +29,6 @@ Jika dihapus, pengunjung ini akan berhenti menerima notifikasi mengenai situs ini, kecuali mereka mengikuti lagi.\n\nApakah Anda masih ingin menghapus pengunjung ini? Sejak %1$s Lihat Galeri - %d gambar Gagal menghapus pengikut Gagal menghapus pengunjung Gagal menampilkan pengikut email situs @@ -978,7 +977,6 @@ Pilih dari pustaka media Plugin Jetpack diperlukan untuk Statistik. Apakah anda akan menginstall Jetpack ? Plugin Jetpack tidak ditemukan - Sekarang (Tanpa Judul) di sebarkan dari %s Bagikan diff --git a/WordPress/src/main/res/values-it/strings.xml b/WordPress/src/main/res/values-it/strings.xml index 7db7039bd..376510ba7 100644 --- a/WordPress/src/main/res/values-it/strings.xml +++ b/WordPress/src/main/res/values-it/strings.xml @@ -17,7 +17,6 @@ Se rimosso, questo follower smetterà di ricevere notifiche da questo sito, a meno che non si iscriva di nuovo.\n\nVuoi ancora di rimuovere questo follower? Dal %1$s Visualizza galleria - %d imagini Non è possibile rimuovere il follower Non è possibile rimuovere il visitatore Non è possibile recuperare l\'email dei follower del sito diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml index 212e1f8b6..624704dd6 100644 --- a/WordPress/src/main/res/values-ja/strings.xml +++ b/WordPress/src/main/res/values-ja/strings.xml @@ -29,7 +29,6 @@ 削除すると、このフォロワーが再度フォローしない限り、このサイトの通知を受け取れなくなります。\n\n本当にこのフォロワーを削除しますか ? 購読日: %1$s ギャラリーを表示 - %d枚の画像 フォロワーを削除できませんでした。 閲覧者を削除できませんでした。 サイトのメールフォロワーを取得できませんでした。 @@ -995,7 +994,6 @@ 現在何もタグをフォローしていません WordPress.com でアカウントを作成 統計情報を表示するには Jetpack プラグインが必要です。Jetpack をインストールしますか ? - 今 1人がいいねをつけました コメントを投稿できませんでした WordPress.com に接続中 diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml index 217096d76..9c02a3125 100644 --- a/WordPress/src/main/res/values-ko/strings.xml +++ b/WordPress/src/main/res/values-ko/strings.xml @@ -29,7 +29,6 @@ 이 팔로워가 제거된 경우 해당 팔로워는 다시 팔로우하지 않는 한 이 사이트에 대한 알림을 수신할 수 없게 됩니다.\n\n이 팔로워를 제거하시겠습니까? %1$s 이후 갤러리 보기 - %d개의 이미지 팔로워를 제거할 수 없습니다. 방문자를 제거할 수 없습니다. 사이트 이메일 팔로워를 가져올 수 없습니다. diff --git a/WordPress/src/main/res/values-mk/strings.xml b/WordPress/src/main/res/values-mk/strings.xml index 67c1d3636..af97559b4 100644 --- a/WordPress/src/main/res/values-mk/strings.xml +++ b/WordPress/src/main/res/values-mk/strings.xml @@ -349,7 +349,6 @@ Избери медиа од библиотеката Jetpack додатокот е задолжителен за статистиката. Дали сакате да инсталирате Jetpack? Jetpack додатокот не е пронајден - сега (без наслов) Споделено од %s Сподели diff --git a/WordPress/src/main/res/values-ms/strings.xml b/WordPress/src/main/res/values-ms/strings.xml index 7e59c4a9d..75e2760bb 100644 --- a/WordPress/src/main/res/values-ms/strings.xml +++ b/WordPress/src/main/res/values-ms/strings.xml @@ -17,7 +17,6 @@ Jika dibuang, pengikut ini akan berhenti menerima pemberitahuan tentang laman ini, kecuali jika mereka mengikut kembali.\n\nAnda masih ingin membuang pengikut ini? Sejak %1$s Lihat Galeri - %d imej Tidak dapat membuang pengikut Tidak dapat membuang penonton Tidak boleh mendapatkan pengikut emel laman diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml index 4385d53f4..f6df5d078 100644 --- a/WordPress/src/main/res/values-pl/strings.xml +++ b/WordPress/src/main/res/values-pl/strings.xml @@ -29,7 +29,6 @@ Jeśli usuniesz tego obserwującego, przestanie on otrzymywać powiadomienia o tej witrynie, chyba że zacznie ponownie obserwować.\nCzy wciąż chcesz usunąć tego obserwującego? Od %1$s Zabacz Galerię - %d obrazków Nie można usunąć obserwującego Nie można usunąć oglądającego Nie można pobrać obserwujących witrynę przez e-mail diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml index 44a917608..fd063ed09 100644 --- a/WordPress/src/main/res/values-pt-rBR/strings.xml +++ b/WordPress/src/main/res/values-pt-rBR/strings.xml @@ -29,7 +29,6 @@ Caso removido, este seguidor irá parar de receber notificações sobre este site, menos que ele comece a seguir novamente.\n\nVocê gostaria ainda de remover este seguidor? Desde de %1$s Ver galeria - %d imagens Não foi possível remover o seguidor Não foi possível remover o espectador Não foi possível recuperar os seguidores por e-mail do site diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml index 518a451c9..63a195804 100644 --- a/WordPress/src/main/res/values-ro/strings.xml +++ b/WordPress/src/main/res/values-ro/strings.xml @@ -29,7 +29,6 @@ Dacă-l înlături, acest urmăritor nu va mai primi notificări despre acest sit, decât dacă-l reurmărește.\n\nMai vrei să înlături acest urmăritor? De la %1$s Vizualizează galeria - %d imagini N-am putut înlătura urmăritorul N-am putut înlătura vizitatorul N-am putut aduce urmăritorii prin email ai sitului diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml index ed0e72022..e48d32e43 100644 --- a/WordPress/src/main/res/values-ru/strings.xml +++ b/WordPress/src/main/res/values-ru/strings.xml @@ -28,7 +28,6 @@ Если удалить этого обозревателя, он больше не сможет зайти на ваш сайт.\n\nВсё равно удалить этого обозревателя? Если удалить этого читателя, он больше не будет получать уведомления об изменениях на этом сайте, пока не восстановит подписку.\n\nВсё равно удалить этого читателя? Просмотр галереи - %d изображ Не удалось удалить читателя Не удалось удалить обозревателя Не удалось получить список подписчиков по электронной почте @@ -975,7 +974,6 @@ Выбрать из медиа-библиотеки Для статистики нужен плагин Jetpack. Хотите установить его? Плагин Jetpack не найден - сейчас (Без названия) Поделиться через %s Поделиться diff --git a/WordPress/src/main/res/values-sk/strings.xml b/WordPress/src/main/res/values-sk/strings.xml index 07f0be70a..955a2afb2 100644 --- a/WordPress/src/main/res/values-sk/strings.xml +++ b/WordPress/src/main/res/values-sk/strings.xml @@ -646,7 +646,6 @@ Nesprávne použivateľské meno Nie je možné otvoriť %s Zdielať - teraz Tento zoznam je prázdny Vytvoriť galériu Pridať do knižnice súborov diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml index 79e61c4f4..99e057d7f 100644 --- a/WordPress/src/main/res/values-sq/strings.xml +++ b/WordPress/src/main/res/values-sq/strings.xml @@ -29,7 +29,6 @@ Në u heqtë, ku ndjekës do të reshtë së marri njoftime mbi këtë sajt, veç në u ribëftë ndjekës.\n\nDo të donit ta hiqnit këtë ndjekës, sido qoftë? Që prej %1$s Shihni Galerinë - %d figura S&#8217;u hoq dot ndjekësi S&#8217;u hoq dot shikuesi S&#8217;u morën dot ndjekës të sajtit me email diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml index 656ae5110..fd3dca27e 100644 --- a/WordPress/src/main/res/values-sv/strings.xml +++ b/WordPress/src/main/res/values-sv/strings.xml @@ -29,7 +29,6 @@ Om följaren tas bort kommer hen inte längre få notiser från denna webbplats såvida de inte följer webbplatsen på nytt.\n\nVill du fortfarande ta bort denna följare? Sedan %1$s Visa galleri - %d bilder Kunde inte ta bort följare Kunde inte ta bort läsare Kunde inte hämta följare via e-post diff --git a/WordPress/src/main/res/values-th/strings.xml b/WordPress/src/main/res/values-th/strings.xml index 32e1d9c07..57fbeb192 100644 --- a/WordPress/src/main/res/values-th/strings.xml +++ b/WordPress/src/main/res/values-th/strings.xml @@ -682,7 +682,6 @@ กำลังติดตาม การใช้งานสถิติต้องใช้ปลั๊กอิน Jetpack คุณต้องการติดตั้ง Jetpack หรือไม่ ไม่พบปลั๊กอิน Jetpack - ตอนนี้ (ไม่มีหัวข้อ) แบ่งปันจาก %s แล้ว เพิ่มไปยังคลังสื่อ diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml index 41eb65188..110e0013f 100644 --- a/WordPress/src/main/res/values-tr/strings.xml +++ b/WordPress/src/main/res/values-tr/strings.xml @@ -29,7 +29,6 @@ Eğer kaldırılırsa, bu takipçi site hakkındaki bildirimleri almayı kesecek, tabi tekrar takibe başlayana kadar.\n\nHala bu takipçiyi kaldırmak istiyor musunuz? %1$s tarihinden beri Galeriyi görüntüle - %d görsel Takipçi kaldırılamıyor İzleyici kaldırılamıyor Sitenin e-posta takipçileri getirilemedi @@ -994,7 +993,6 @@ Takip et Takipte Yorumunuz gönderilemedi - şuan %s eklendi %s kaldırıldı Imaj görüntülenemedi diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml index 70e112f0f..5b92da2c1 100644 --- a/WordPress/src/main/res/values-zh-rCN/strings.xml +++ b/WordPress/src/main/res/values-zh-rCN/strings.xml @@ -29,7 +29,6 @@ 如果删除该粉丝，则此人将不会再收到关于此站点的通知，除非其重新关注此站点。\n\n是否仍要删除该粉丝？ 从 %1$s开始 查看图库 - %d 张图片 无法删除粉丝 无法删除查看者 无法检索站点电子邮件粉丝 @@ -968,7 +967,6 @@ 从媒体库选择 统计需要Jetpack插件，您希望安装Jetpack吗？ 没有找到Jetpack插件 - 现在 (未命名) 从 %s 共享 共享 diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml index b778f24b6..7f823de4b 100644 --- a/WordPress/src/main/res/values-zh-rHK/strings.xml +++ b/WordPress/src/main/res/values-zh-rHK/strings.xml @@ -15,7 +15,6 @@ 移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？ 自 %1$s 開始 檢視圖庫 - %d 張圖片 無法移除關注者 無法移除瀏覽者 無法擷取網站電子郵件關注者 @@ -954,7 +953,6 @@ 從媒體庫選擇 找不到 Jetpack Jetpack 外掛需要統計資訊。你想要安裝 Jetpack 嗎？ - 現在 （未命名） 從 %s 分享 追蹤 diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml index f60d726d7..c169bcfe8 100644 --- a/WordPress/src/main/res/values-zh-rTW/strings.xml +++ b/WordPress/src/main/res/values-zh-rTW/strings.xml @@ -15,7 +15,6 @@ 移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？ 自 %1$s 開始 檢視圖庫 - %d 張圖片 無法移除關注者 無法移除瀏覽者 無法擷取網站電子郵件關注者 -- cgit v1.2.3 From 2109790012d792afa36a69e63717be7125fdd63c Mon Sep 17 00:00:00 2001 From: Will Kwon Date: Thu, 22 Sep 2016 13:04:37 -0700 Subject: Removing "reader_timespan_now" and "reader_label_image_count" as they were unused AND there were lint warnings about them --- WordPress/src/main/res/values-ar/strings.xml | 1 - WordPress/src/main/res/values-az/strings.xml | 1 - WordPress/src/main/res/values-bg/strings.xml | 2 -- WordPress/src/main/res/values-cs/strings.xml | 2 -- WordPress/src/main/res/values-cy/strings.xml | 1 - WordPress/src/main/res/values-da/strings.xml | 1 - WordPress/src/main/res/values-de/strings.xml | 2 -- WordPress/src/main/res/values-el/strings.xml | 1 - WordPress/src/main/res/values-en-rAU/strings.xml | 2 -- WordPress/src/main/res/values-en-rCA/strings.xml | 2 -- WordPress/src/main/res/values-en-rGB/strings.xml | 2 -- WordPress/src/main/res/values-es-rCL/strings.xml | 1 - WordPress/src/main/res/values-es-rVE/strings.xml | 1 - WordPress/src/main/res/values-es/strings.xml | 2 -- WordPress/src/main/res/values-eu/strings.xml | 2 -- WordPress/src/main/res/values-fr/strings.xml | 2 -- WordPress/src/main/res/values-gd/strings.xml | 2 -- WordPress/src/main/res/values-he/strings.xml | 2 -- WordPress/src/main/res/values-hi/strings.xml | 1 - WordPress/src/main/res/values-hr/strings.xml | 1 - WordPress/src/main/res/values-id/strings.xml | 2 -- WordPress/src/main/res/values-it/strings.xml | 2 -- WordPress/src/main/res/values-ja/strings.xml | 2 -- WordPress/src/main/res/values-ko/strings.xml | 2 -- WordPress/src/main/res/values-mk/strings.xml | 1 - WordPress/src/main/res/values-ms/strings.xml | 2 -- WordPress/src/main/res/values-nb/strings.xml | 1 - WordPress/src/main/res/values-nl/strings.xml | 1 - WordPress/src/main/res/values-pl/strings.xml | 2 -- WordPress/src/main/res/values-pt-rBR/strings.xml | 2 -- WordPress/src/main/res/values-ro/strings.xml | 2 -- WordPress/src/main/res/values-ru/strings.xml | 2 -- WordPress/src/main/res/values-sk/strings.xml | 1 - WordPress/src/main/res/values-sq/strings.xml | 2 -- WordPress/src/main/res/values-sr/strings.xml | 1 - WordPress/src/main/res/values-sv/strings.xml | 2 -- WordPress/src/main/res/values-th/strings.xml | 1 - WordPress/src/main/res/values-tr/strings.xml | 2 -- WordPress/src/main/res/values-uz/strings.xml | 1 - WordPress/src/main/res/values-zh-rCN/strings.xml | 2 -- WordPress/src/main/res/values-zh-rHK/strings.xml | 2 -- WordPress/src/main/res/values-zh-rTW/strings.xml | 2 -- 42 files changed, 68 deletions(-) diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml index a5f266109..4e41cd1a8 100644 --- a/WordPress/src/main/res/values-ar/strings.xml +++ b/WordPress/src/main/res/values-ar/strings.xml @@ -973,7 +973,6 @@ اختر من مكتبة الوسائط مطلوب اضافة الـ Jetpack للإحصائيات , هل تريد تثبيت الـ Jetpack ؟ اضافة Jetpack غير موجودة - الان ( بدون اسم ) تمت المشاركة من %s مشاركة diff --git a/WordPress/src/main/res/values-az/strings.xml b/WordPress/src/main/res/values-az/strings.xml index 3455f2a61..7893297df 100644 --- a/WordPress/src/main/res/values-az/strings.xml +++ b/WordPress/src/main/res/values-az/strings.xml @@ -493,7 +493,6 @@ Keçərsiz istifadəçi adı Başlayın! Statistikalar üçün Jetpack plaqininə ehtiyac var. Jetpack plaqinini qurmaq istəyirsinizmi? - indi (adsız) Paylaşılan %s %s əlavə edildi diff --git a/WordPress/src/main/res/values-bg/strings.xml b/WordPress/src/main/res/values-bg/strings.xml index 19a3e653c..042689ce9 100644 --- a/WordPress/src/main/res/values-bg/strings.xml +++ b/WordPress/src/main/res/values-bg/strings.xml @@ -29,7 +29,6 @@ Последователите ще спрат да получават известия за сайта ако ги премахнете, освен ако не го добавят отново.\n\nЖелаете ли да продължите с премахването? От %1$s Преглед - %d снимки Неуспешно премахване на последователя Неуспешно премахване на потребителя Неуспешно показване на последователите по имейл. @@ -978,7 +977,6 @@ Избор от медийната библиотека Jetpack е нужен за извличане на статистиката. Искате ли да инсталирате Jetpack? Jetpack не беше намерен - сега (Неозаглавен) Споделено от %s Споделяне diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml index 8c5b2aa63..bc0f734be 100644 --- a/WordPress/src/main/res/values-cs/strings.xml +++ b/WordPress/src/main/res/values-cs/strings.xml @@ -28,7 +28,6 @@ Chcete odstranit tento prohlížeč, pak už nikdo nebude moct navštívit tuto webovou stránku.\n\nChcete určitě odstranit tento prohlížeč? Pokud odstraníte tohoto fanouška, nebude už dostávat žádné upozornění z tohoto webu..\n\nChcete určitě odstranit tohoto fanouška? Od %1$s - %d obrázků Zobrazit galerii Nepodařilo se odstranit fanouška Nepodařilo se odstranit zobrazení @@ -980,7 +979,6 @@ Tento seznam je prázdný Vyberte z knihovny medií Plugin Jetpack nebyl nalezen - nyní (bez názvu) Sdíleno z %s Sledovat diff --git a/WordPress/src/main/res/values-cy/strings.xml b/WordPress/src/main/res/values-cy/strings.xml index a05d684eb..ef89695a7 100644 --- a/WordPress/src/main/res/values-cy/strings.xml +++ b/WordPress/src/main/res/values-cy/strings.xml @@ -933,7 +933,6 @@ Dewiswch o\'r llyfrgell cyfryngau Mae angen yr ategyn Jetpack ar gyfer adrodd ar yr ystadegau. Hoffech chi osod Jetpack? Heb ganfod ategyn jetpack - nawr (Dideitl) Rhannu o %s Rhannu diff --git a/WordPress/src/main/res/values-da/strings.xml b/WordPress/src/main/res/values-da/strings.xml index 574ac0fd4..049a06343 100644 --- a/WordPress/src/main/res/values-da/strings.xml +++ b/WordPress/src/main/res/values-da/strings.xml @@ -480,7 +480,6 @@ Opret galleri Listen er tom Vælg fra mediebiblioteket - nu Tilføjede %s Fjernede %s Du synes godt om dette diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml index a6768667a..cd6082832 100644 --- a/WordPress/src/main/res/values-de/strings.xml +++ b/WordPress/src/main/res/values-de/strings.xml @@ -29,7 +29,6 @@ Nach dem Entfernen bekommt der Follower keine Mitteilungen über dieser Website mehr, bis er wieder folgt.\n\nMöchtest du diesen Follower noch immer entfernen? Seit %1$s Galerie anzeigen - %d Bilder Konnte Follower nicht entfernen Konnte Besucher nicht entfernen Konnte E-Mail-Follower der Website nicht abrufen @@ -978,7 +977,6 @@ Aus der Mediathek auswählen Das Jetpack-Plugin ist erforderlich für Statistiken. Möchtest Du Jetpack installieren? Jetpack Plugin nicht gefunden - jetzt (Ohne Titel) Geteilt von %s Teilen diff --git a/WordPress/src/main/res/values-el/strings.xml b/WordPress/src/main/res/values-el/strings.xml index 1543fadf7..e002f9e8b 100644 --- a/WordPress/src/main/res/values-el/strings.xml +++ b/WordPress/src/main/res/values-el/strings.xml @@ -933,7 +933,6 @@ Διαλέξτε από την βιβλιοθήκη πολυμέσων Το Jetpack plugin είναι αναγκαίο για την συλλογή στατιστικών στοιχείων. Θέλετε να εγκαταστήσετε το Jetpack; Δεν βρέθηκε το Jetpack plugin - τώρα Ανώνυμο Μοιράστηκε από %s Μοιράσου diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml index 5e0cfb1f8..af26e0b14 100644 --- a/WordPress/src/main/res/values-en-rAU/strings.xml +++ b/WordPress/src/main/res/values-en-rAU/strings.xml @@ -29,7 +29,6 @@ If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? Since %1$s View Gallery - %d images Couldn\'t remove follower Couldn\'t remove viewer Couldn\'t retrieve site email followers @@ -978,7 +977,6 @@ Select from media library The Jetpack plugin is required for stats. Do you want to install Jetpack? Jetpack plugin not found - now (Untitled) Shared from %s Share diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml index 42995f2e2..7f619d777 100644 --- a/WordPress/src/main/res/values-en-rCA/strings.xml +++ b/WordPress/src/main/res/values-en-rCA/strings.xml @@ -29,7 +29,6 @@ If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? Since %1$s View Gallery - %d images Couldn\'t remove follower Couldn\'t remove viewer Couldn\'t retrieve site email followers @@ -978,7 +977,6 @@ Select from media library The Jetpack plugin is required for stats. Do you want to install Jetpack? Jetpack plugin not found - now (Untitled) Shared from %s Share diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml index 09648653b..97ddbf428 100644 --- a/WordPress/src/main/res/values-en-rGB/strings.xml +++ b/WordPress/src/main/res/values-en-rGB/strings.xml @@ -29,7 +29,6 @@ If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? Since %1$s View Gallery - %d images Couldn\'t remove follower Couldn\'t remove viewer Couldn\'t retrieve site email followers @@ -978,7 +977,6 @@ Select from media library The Jetpack plugin is required for stats. Do you want to install Jetpack? Jetpack plugin not found - now (Untitled) Shared from %s Share diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml index 8a9498983..f2d77a687 100644 --- a/WordPress/src/main/res/values-es-rCL/strings.xml +++ b/WordPress/src/main/res/values-es-rCL/strings.xml @@ -565,7 +565,6 @@ Seleccionar de la biblioteca multimedia Necesitas el pluging Jetpack para tener estadísticas estadísticas. ¿Quieres instalar Jetpack? No se ha encontrado el plugin Jetpack - ahora Sin título Compartido desde %s Compartir diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml index 1a4d761e6..2752d6bc2 100644 --- a/WordPress/src/main/res/values-es-rVE/strings.xml +++ b/WordPress/src/main/res/values-es-rVE/strings.xml @@ -870,7 +870,6 @@ Seleccionar de la biblioteca multimedia Necesitas el pluging Jetpack para tener estadísticas estadísticas. ¿Quieres instalar Jetpack? No se ha encontrado el plugin Jetpack - ahora Sin título Compartido desde %s Compartir diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml index 60a4407ce..e28c99028 100644 --- a/WordPress/src/main/res/values-es/strings.xml +++ b/WordPress/src/main/res/values-es/strings.xml @@ -29,7 +29,6 @@ Si lo eliminas, este seguidor dejará de recibir informaciones de tu sitio, a no ser que vuelta a seguirte. \n\n¿Todavía quieres eliminar a este seguidor? Desde %1$s Ver galería - %d imágenes No se pudo quitar al seguidor No se pudo quitar el espectador No se pudieron recuperar los correos electrónicos de los seguidores del sitio @@ -991,7 +990,6 @@ Eliminado %s Crear galería Esta lista esta vacía - ahora Sin título Compartido desde %s Compartir diff --git a/WordPress/src/main/res/values-eu/strings.xml b/WordPress/src/main/res/values-eu/strings.xml index 6158ba83d..604310475 100644 --- a/WordPress/src/main/res/values-eu/strings.xml +++ b/WordPress/src/main/res/values-eu/strings.xml @@ -25,7 +25,6 @@ Taldea %1$s-(e)tik Ikusi galeria - %d irudi Ezin izan da jarraitzailea kendu Ezin izan da ikuslea kendu Ezin izan dira guneko e-posta jarraitzaileak eskuratu @@ -629,7 +628,6 @@ Ezin izan da %s ireki Hasi! Zerrenda hau hutsik dago - orain %s-tik partekatua Partekatu Jarraitu diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml index bb0bdb6eb..b215e3b40 100644 --- a/WordPress/src/main/res/values-fr/strings.xml +++ b/WordPress/src/main/res/values-fr/strings.xml @@ -29,7 +29,6 @@ Une fois supprimé, cet abonné ne recevra plus de notifications à propos de ce site, à moins de se réabonner.\n\nVoulez-vous vraiment supprimer cet abonné ? Depuis le %1$s Afficher la galerie - %d images Impossible de supprimer l\'abonné Impossible de supprimer le lecteur Impossible de récupérer les abonnés par e-mail @@ -978,7 +977,6 @@ Sélectionner depuis la bibliothèque média Le module Jetpack est requis pour afficher les statistiques. Voulez-vous installer Jetpack ? Le module Jetpack est introuvable - actuellement (Sans Titre) Partagé depuis %s Partager diff --git a/WordPress/src/main/res/values-gd/strings.xml b/WordPress/src/main/res/values-gd/strings.xml index 7a2044a72..7c531f49b 100644 --- a/WordPress/src/main/res/values-gd/strings.xml +++ b/WordPress/src/main/res/values-gd/strings.xml @@ -17,7 +17,6 @@ Ma bheir thu an cleachdaiche seo air falbh, chan fhaigh iad brathan mun làrach seo tuilleadh ach ma nì iad leantainn às ùr.\n\nA bheil thu cinnteach gu bheil thu airson an neach-leantainn seo a thoirt air falbh? A-mach o %1$s Seall an gailearaidh - %d dealbh(an) Cha b’ urrainn dhuinn an neach-leantainn a thoirt air falbh Cha b’ urrainn dhuinn an neach-coimhid a thoirt air falbh Cha b’ urrainn dhuinn na daoine a leanas an làrach slighe puist-d fhaighinn @@ -516,7 +515,6 @@ Tagh o leabhar-lann nam meadhanan Tha feum air plugan Jetpack mus fhaigh thu na stats. A bheil thu airson Jetpack a stàladh? Cha deach am plugan Jetpack a lorg - an-dràsta (Gun tiotal) Air a cho-roinneadh o %s Co-roinn diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml index 89aa2e3f0..da9ed339b 100644 --- a/WordPress/src/main/res/values-he/strings.xml +++ b/WordPress/src/main/res/values-he/strings.xml @@ -23,7 +23,6 @@ לאחר הסרת צופה זה, הוא או היא לא יוכלו לבקר יותר באתר זה.\n\nבחרת להסיר צופה זה - האם ההחלטה סופית? לאחר הסרת עוקב זה, הוא יפסיק לקבל הודעות לגבי אתר זה, אלא אם יגדיר מעקב מחדש.\n\nבחרת להסיר עוקב זה - האם ההחלטה סופית? מאז %1$s - %d תמונות הצגת גלריה לא ניתן היה להסיר עוקב לא ניתן היה להסיר צופה @@ -971,7 +970,6 @@ בחר מתוך ספריית מדיה התוסף Jetpack נדרש לקבלת נתונים סטטיסטיים. אתה מעוניין להתקין את Jetpack? התוסף Jetpack לא נמצא - עכשיו (ללא כותרת) שיתוף מ-%s שתף diff --git a/WordPress/src/main/res/values-hi/strings.xml b/WordPress/src/main/res/values-hi/strings.xml index 0764b44d6..9d1cf7284 100644 --- a/WordPress/src/main/res/values-hi/strings.xml +++ b/WordPress/src/main/res/values-hi/strings.xml @@ -435,7 +435,6 @@ गैलरी बनाएं अमान्य उपयोगकर्ता नाम जेटपैक प्लगइन नहीं मिला - अब एक व्यक्ति ने पसंद किया साझा करे आपने इसे पसंद किया diff --git a/WordPress/src/main/res/values-hr/strings.xml b/WordPress/src/main/res/values-hr/strings.xml index 8dd6697f0..19a2dc49b 100644 --- a/WordPress/src/main/res/values-hr/strings.xml +++ b/WordPress/src/main/res/values-hr/strings.xml @@ -727,7 +727,6 @@ Popis je prazan Odaberi iz medijskih zapisa Dodatak Jetpack nije pronađen - sad (Bez naslova) Podjeli Prati se diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml index b35517cd3..1010ca7ac 100644 --- a/WordPress/src/main/res/values-id/strings.xml +++ b/WordPress/src/main/res/values-id/strings.xml @@ -29,7 +29,6 @@ Jika dihapus, pengunjung ini akan berhenti menerima notifikasi mengenai situs ini, kecuali mereka mengikuti lagi.\n\nApakah Anda masih ingin menghapus pengunjung ini? Sejak %1$s Lihat Galeri - %d gambar Gagal menghapus pengikut Gagal menghapus pengunjung Gagal menampilkan pengikut email situs @@ -978,7 +977,6 @@ Pilih dari pustaka media Plugin Jetpack diperlukan untuk Statistik. Apakah anda akan menginstall Jetpack ? Plugin Jetpack tidak ditemukan - Sekarang (Tanpa Judul) di sebarkan dari %s Bagikan diff --git a/WordPress/src/main/res/values-it/strings.xml b/WordPress/src/main/res/values-it/strings.xml index 7db7039bd..a10f26ff7 100644 --- a/WordPress/src/main/res/values-it/strings.xml +++ b/WordPress/src/main/res/values-it/strings.xml @@ -17,7 +17,6 @@ Se rimosso, questo follower smetterà di ricevere notifiche da questo sito, a meno che non si iscriva di nuovo.\n\nVuoi ancora di rimuovere questo follower? Dal %1$s Visualizza galleria - %d imagini Non è possibile rimuovere il follower Non è possibile rimuovere il visitatore Non è possibile recuperare l\'email dei follower del sito @@ -968,7 +967,6 @@ Rimosso %s Ad una persona piace questo Ti piace questo - adesso (Senza titolo) Condividi da %s Condividi diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml index 212e1f8b6..624704dd6 100644 --- a/WordPress/src/main/res/values-ja/strings.xml +++ b/WordPress/src/main/res/values-ja/strings.xml @@ -29,7 +29,6 @@ 削除すると、このフォロワーが再度フォローしない限り、このサイトの通知を受け取れなくなります。\n\n本当にこのフォロワーを削除しますか ? 購読日: %1$s ギャラリーを表示 - %d枚の画像 フォロワーを削除できませんでした。 閲覧者を削除できませんでした。 サイトのメールフォロワーを取得できませんでした。 @@ -995,7 +994,6 @@ 現在何もタグをフォローしていません WordPress.com でアカウントを作成 統計情報を表示するには Jetpack プラグインが必要です。Jetpack をインストールしますか ? - 今 1人がいいねをつけました コメントを投稿できませんでした WordPress.com に接続中 diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml index 217096d76..237176ceb 100644 --- a/WordPress/src/main/res/values-ko/strings.xml +++ b/WordPress/src/main/res/values-ko/strings.xml @@ -29,7 +29,6 @@ 이 팔로워가 제거된 경우 해당 팔로워는 다시 팔로우하지 않는 한 이 사이트에 대한 알림을 수신할 수 없게 됩니다.\n\n이 팔로워를 제거하시겠습니까? %1$s 이후 갤러리 보기 - %d개의 이미지 팔로워를 제거할 수 없습니다. 방문자를 제거할 수 없습니다. 사이트 이메일 팔로워를 가져올 수 없습니다. @@ -964,7 +963,6 @@ 로그인 중... 갤러리 만들기 미디어 라이브러리에서 선택 - 지금 공유 팔로우 %s를 열 수 없습니다 diff --git a/WordPress/src/main/res/values-mk/strings.xml b/WordPress/src/main/res/values-mk/strings.xml index 67c1d3636..af97559b4 100644 --- a/WordPress/src/main/res/values-mk/strings.xml +++ b/WordPress/src/main/res/values-mk/strings.xml @@ -349,7 +349,6 @@ Избери медиа од библиотеката Jetpack додатокот е задолжителен за статистиката. Дали сакате да инсталирате Jetpack? Jetpack додатокот не е пронајден - сега (без наслов) Споделено од %s Сподели diff --git a/WordPress/src/main/res/values-ms/strings.xml b/WordPress/src/main/res/values-ms/strings.xml index 7e59c4a9d..beda81908 100644 --- a/WordPress/src/main/res/values-ms/strings.xml +++ b/WordPress/src/main/res/values-ms/strings.xml @@ -17,7 +17,6 @@ Jika dibuang, pengikut ini akan berhenti menerima pemberitahuan tentang laman ini, kecuali jika mereka mengikut kembali.\n\nAnda masih ingin membuang pengikut ini? Sejak %1$s Lihat Galeri - %d imej Tidak dapat membuang pengikut Tidak dapat membuang penonton Tidak boleh mendapatkan pengikut emel laman @@ -963,7 +962,6 @@ Pilih dari perpustakaan media Pemalam Jetpack diperlukan bagi statistik. Anda ingin memasang Jetpack? Pemalam Jetpack tidak dijumpai - sekarang (Tanpa tajuk) Dikongsi dari %s Kongsi diff --git a/WordPress/src/main/res/values-nb/strings.xml b/WordPress/src/main/res/values-nb/strings.xml index 6b200d7e3..d2a03fcb5 100644 --- a/WordPress/src/main/res/values-nb/strings.xml +++ b/WordPress/src/main/res/values-nb/strings.xml @@ -238,7 +238,6 @@ Opprett konto Logg inn på WordPress.com Logger inn … - nå Del Følg Fant ikke utvidelsen Jetpack diff --git a/WordPress/src/main/res/values-nl/strings.xml b/WordPress/src/main/res/values-nl/strings.xml index b9d83da3f..b5270459f 100644 --- a/WordPress/src/main/res/values-nl/strings.xml +++ b/WordPress/src/main/res/values-nl/strings.xml @@ -957,7 +957,6 @@ Onmogelijk te delen Onmogelijk afbeelding te bekijken Je volgt geen enkele tags - Nu De Jetpack plugin is nodig voor statistieken. Wil je Jetpack installeren? Deze lijst is leeg Een nieuwe galerij aanmaken diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml index 4385d53f4..7e00cb008 100644 --- a/WordPress/src/main/res/values-pl/strings.xml +++ b/WordPress/src/main/res/values-pl/strings.xml @@ -29,7 +29,6 @@ Jeśli usuniesz tego obserwującego, przestanie on otrzymywać powiadomienia o tej witrynie, chyba że zacznie ponownie obserwować.\nCzy wciąż chcesz usunąć tego obserwującego? Od %1$s Zabacz Galerię - %d obrazków Nie można usunąć obserwującego Nie można usunąć oglądającego Nie można pobrać obserwujących witrynę przez e-mail @@ -977,7 +976,6 @@ Lista jest pusta Wtyczka Jetpack nie została znaleziona (Brak tytułu) - teraz Wtyczka Jetpack jest wymagana, aby uzyskać dostęp do statystyk. Zainstalować wtyczkę? Udostępnione przez %s Udostępnij diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml index 44a917608..6cde5666f 100644 --- a/WordPress/src/main/res/values-pt-rBR/strings.xml +++ b/WordPress/src/main/res/values-pt-rBR/strings.xml @@ -29,7 +29,6 @@ Caso removido, este seguidor irá parar de receber notificações sobre este site, menos que ele comece a seguir novamente.\n\nVocê gostaria ainda de remover este seguidor? Desde de %1$s Ver galeria - %d imagens Não foi possível remover o seguidor Não foi possível remover o espectador Não foi possível recuperar os seguidores por e-mail do site @@ -978,7 +977,6 @@ O plugin Jetpack é necessário para as estatísticas. Você quer instalar o Jetpack? Plugin Jetpack não encontrado Seguir - agora Compartilhar Excluído %s Uma pessoa curte isto diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml index 518a451c9..383034eab 100644 --- a/WordPress/src/main/res/values-ro/strings.xml +++ b/WordPress/src/main/res/values-ro/strings.xml @@ -29,7 +29,6 @@ Dacă-l înlături, acest urmăritor nu va mai primi notificări despre acest sit, decât dacă-l reurmărește.\n\nMai vrei să înlături acest urmăritor? De la %1$s Vizualizează galeria - %d imagini N-am putut înlătura urmăritorul N-am putut înlătura vizitatorul N-am putut aduce urmăritorii prin email ai sitului @@ -987,7 +986,6 @@ %s adăugat Urmăresc Urmărește - acum (Fără titlu) Modulul Jetpack nu e găsit Selectează din biblioteca media diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml index ed0e72022..e48d32e43 100644 --- a/WordPress/src/main/res/values-ru/strings.xml +++ b/WordPress/src/main/res/values-ru/strings.xml @@ -28,7 +28,6 @@ Если удалить этого обозревателя, он больше не сможет зайти на ваш сайт.\n\nВсё равно удалить этого обозревателя? Если удалить этого читателя, он больше не будет получать уведомления об изменениях на этом сайте, пока не восстановит подписку.\n\nВсё равно удалить этого читателя? Просмотр галереи - %d изображ Не удалось удалить читателя Не удалось удалить обозревателя Не удалось получить список подписчиков по электронной почте @@ -975,7 +974,6 @@ Выбрать из медиа-библиотеки Для статистики нужен плагин Jetpack. Хотите установить его? Плагин Jetpack не найден - сейчас (Без названия) Поделиться через %s Поделиться diff --git a/WordPress/src/main/res/values-sk/strings.xml b/WordPress/src/main/res/values-sk/strings.xml index 07f0be70a..955a2afb2 100644 --- a/WordPress/src/main/res/values-sk/strings.xml +++ b/WordPress/src/main/res/values-sk/strings.xml @@ -646,7 +646,6 @@ Nesprávne použivateľské meno Nie je možné otvoriť %s Zdielať - teraz Tento zoznam je prázdny Vytvoriť galériu Pridať do knižnice súborov diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml index 79e61c4f4..b1e79f7ab 100644 --- a/WordPress/src/main/res/values-sq/strings.xml +++ b/WordPress/src/main/res/values-sq/strings.xml @@ -29,7 +29,6 @@ Në u heqtë, ku ndjekës do të reshtë së marri njoftime mbi këtë sajt, veç në u ribëftë ndjekës.\n\nDo të donit ta hiqnit këtë ndjekës, sido qoftë? Që prej %1$s Shihni Galerinë - %d figura S&#8217;u hoq dot ndjekësi S&#8217;u hoq dot shikuesi S&#8217;u morën dot ndjekës të sajtit me email @@ -994,7 +993,6 @@ U mbërrit në kufi. Mund të riprovoni pas 1 minute. Riprovimi para kësaj vetëm sa do të shtojë kohën që ju duhet të prisni para se të hiqet përzënia. Nëse mendoni se ky është një gabim, lidhuni me asistencën. Pasuesi S&#8217;u gjet shtojcë Jetpack - tani Ndjekur prej jush S&#8217;u postua dot komenti juaj Kjo s&#8217;është etiketë e vlefshme diff --git a/WordPress/src/main/res/values-sr/strings.xml b/WordPress/src/main/res/values-sr/strings.xml index 5cb18131e..356a74598 100644 --- a/WordPress/src/main/res/values-sr/strings.xml +++ b/WordPress/src/main/res/values-sr/strings.xml @@ -522,7 +522,6 @@ Поделите Подељено од стране %s (Без наслова) - сада Додатак Џетпек није пронађен Џетпек додатак је неопходан за статистике. Да ли желите да инсталирате Џетпек? Није могуће делити diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml index 656ae5110..a4e3474a9 100644 --- a/WordPress/src/main/res/values-sv/strings.xml +++ b/WordPress/src/main/res/values-sv/strings.xml @@ -29,7 +29,6 @@ Om följaren tas bort kommer hen inte längre få notiser från denna webbplats såvida de inte följer webbplatsen på nytt.\n\nVill du fortfarande ta bort denna följare? Sedan %1$s Visa galleri - %d bilder Kunde inte ta bort följare Kunde inte ta bort läsare Kunde inte hämta följare via e-post @@ -978,7 +977,6 @@ Välj från mediebiblioteket Jetpack-tillägget behövs för att visa statistik. Vill du installera Jetpack? Jetpack-tillägget kunde inte hittas - nu (Ingen titel) Delad från %s Dela diff --git a/WordPress/src/main/res/values-th/strings.xml b/WordPress/src/main/res/values-th/strings.xml index 32e1d9c07..57fbeb192 100644 --- a/WordPress/src/main/res/values-th/strings.xml +++ b/WordPress/src/main/res/values-th/strings.xml @@ -682,7 +682,6 @@ กำลังติดตาม การใช้งานสถิติต้องใช้ปลั๊กอิน Jetpack คุณต้องการติดตั้ง Jetpack หรือไม่ ไม่พบปลั๊กอิน Jetpack - ตอนนี้ (ไม่มีหัวข้อ) แบ่งปันจาก %s แล้ว เพิ่มไปยังคลังสื่อ diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml index 41eb65188..110e0013f 100644 --- a/WordPress/src/main/res/values-tr/strings.xml +++ b/WordPress/src/main/res/values-tr/strings.xml @@ -29,7 +29,6 @@ Eğer kaldırılırsa, bu takipçi site hakkındaki bildirimleri almayı kesecek, tabi tekrar takibe başlayana kadar.\n\nHala bu takipçiyi kaldırmak istiyor musunuz? %1$s tarihinden beri Galeriyi görüntüle - %d görsel Takipçi kaldırılamıyor İzleyici kaldırılamıyor Sitenin e-posta takipçileri getirilemedi @@ -994,7 +993,6 @@ Takip et Takipte Yorumunuz gönderilemedi - şuan %s eklendi %s kaldırıldı Imaj görüntülenemedi diff --git a/WordPress/src/main/res/values-uz/strings.xml b/WordPress/src/main/res/values-uz/strings.xml index 11b7d83aa..4299b1baf 100644 --- a/WordPress/src/main/res/values-uz/strings.xml +++ b/WordPress/src/main/res/values-uz/strings.xml @@ -24,7 +24,6 @@ Akkaunt ochish Yangi galereya (Nomsiz) - hozir Jetpack plagini topilmadi Media kutubxonasiga qo‘sh Ushbu ro‘yxat bo‘sh diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml index 70e112f0f..5b92da2c1 100644 --- a/WordPress/src/main/res/values-zh-rCN/strings.xml +++ b/WordPress/src/main/res/values-zh-rCN/strings.xml @@ -29,7 +29,6 @@ 如果删除该粉丝，则此人将不会再收到关于此站点的通知，除非其重新关注此站点。\n\n是否仍要删除该粉丝？ 从 %1$s开始 查看图库 - %d 张图片 无法删除粉丝 无法删除查看者 无法检索站点电子邮件粉丝 @@ -968,7 +967,6 @@ 从媒体库选择 统计需要Jetpack插件，您希望安装Jetpack吗？ 没有找到Jetpack插件 - 现在 (未命名) 从 %s 共享 共享 diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml index b778f24b6..7f823de4b 100644 --- a/WordPress/src/main/res/values-zh-rHK/strings.xml +++ b/WordPress/src/main/res/values-zh-rHK/strings.xml @@ -15,7 +15,6 @@ 移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？ 自 %1$s 開始 檢視圖庫 - %d 張圖片 無法移除關注者 無法移除瀏覽者 無法擷取網站電子郵件關注者 @@ -954,7 +953,6 @@ 從媒體庫選擇 找不到 Jetpack Jetpack 外掛需要統計資訊。你想要安裝 Jetpack 嗎？ - 現在 （未命名） 從 %s 分享 追蹤 diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml index f60d726d7..daea17395 100644 --- a/WordPress/src/main/res/values-zh-rTW/strings.xml +++ b/WordPress/src/main/res/values-zh-rTW/strings.xml @@ -15,7 +15,6 @@ 移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？ 自 %1$s 開始 檢視圖庫 - %d 張圖片 無法移除關注者 無法移除瀏覽者 無法擷取網站電子郵件關注者 @@ -954,7 +953,6 @@ 從媒體庫選擇 Jetpack 外掛需要統計資訊。你想要安裝 Jetpack 嗎？ 找不到 Jetpack - 現在 （未命名） 從 %s 分享 分享 -- cgit v1.2.3 From 5544e3f807a4258cf0e7fd69053fb20176ffb1e4 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Fri, 23 Sep 2016 16:34:53 +0300 Subject: Use role when validating invite usernames --- .../java/org/wordpress/android/ui/people/PeopleInviteFragment.java | 2 +- .../main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index ccbb4d8f5..5797e657f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -395,7 +395,7 @@ public class PeopleInviteFragment extends Fragment implements if (usernamesToCheck.size() > 0) { String dotComBlogId = getArguments().getString(ARG_BLOGID); - PeopleUtils.validateUsernames(usernamesToCheck, dotComBlogId, new PeopleUtils.ValidateUsernameCallback() { + PeopleUtils.validateUsernames(usernamesToCheck, mRole, dotComBlogId, new PeopleUtils.ValidateUsernameCallback() { @Override public void onUsernameValidation(String username, ValidationResult validationResult) { if (!isAdded()) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java index 3a75303d5..5c01c6ddf 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java @@ -342,7 +342,7 @@ public class PeopleUtils { void onError(); } - public static void validateUsernames(final List usernames, String dotComBlogId, final + public static void validateUsernames(final List usernames, Role role, String dotComBlogId, final ValidateUsernameCallback callback) { com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() { @Override @@ -432,7 +432,7 @@ public class PeopleUtils { for (String username : usernames) { params.put("invitees[" + username + "]", username); // specify an array key so to make the map key unique } - params.put("role", "follower"); // the specific role is not important, just needs to be a valid one + params.put("role", role.toRESTString()); WordPress.getRestClientUtilsV1_1().post(path, params, null, listener, errorListener); } -- cgit v1.2.3 From 07307351921f3051fc39488254624860df5a4a90 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Sat, 24 Sep 2016 12:44:31 -0400 Subject: Use `grey_dark` for suggestion text color --- WordPress/src/main/res/layout/reader_listitem_suggestion.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/src/main/res/layout/reader_listitem_suggestion.xml b/WordPress/src/main/res/layout/reader_listitem_suggestion.xml index 26a21340c..caa405f8d 100644 --- a/WordPress/src/main/res/layout/reader_listitem_suggestion.xml +++ b/WordPress/src/main/res/layout/reader_listitem_suggestion.xml @@ -20,6 +20,7 @@ android:lines="1" android:minHeight="?android:attr/listPreferredItemHeightSmall" android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:textColor="@color/grey_dark" tools:text="Suggestion" /> Date: Mon, 26 Sep 2016 09:07:52 +0200 Subject: Fix wpanalytics build with gradle 3.1 --- libs/analytics/WordPressAnalytics/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle index bbce61996..6332955f4 100644 --- a/libs/analytics/WordPressAnalytics/build.gradle +++ b/libs/analytics/WordPressAnalytics/build.gradle @@ -40,7 +40,7 @@ archivesBaseName = "analytics" signing { required { - has("release") && project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile") + project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile") } sign configurations.archives } -- cgit v1.2.3 From b46d1fe4ebf04011c293ed209c1185e2ff0161d4 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Mon, 26 Sep 2016 12:55:02 +0300 Subject: Re-validate usernames on role change --- .../android/ui/people/PeopleInviteFragment.java | 82 +++++++++++++--------- .../src/main/res/layout/people_invite_fragment.xml | 10 ++- 2 files changed, 58 insertions(+), 34 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index 5797e657f..a09163bf3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -58,7 +58,7 @@ public class PeopleInviteFragment extends Fragment implements private final Map mUsernameButtons = new LinkedHashMap<>(); private final HashMap mUsernameResults = new HashMap<>(); - private final Map mUsernameErrorViews = new Hashtable<>(); + private final Map mUsernameErrorViews = new Hashtable<>(); private Role mRole; private String mCustomMessage = ""; private boolean mInviteOperationInProgress = false; @@ -334,9 +334,7 @@ public class PeopleInviteFragment extends Fragment implements mUsernameResults.remove(username); usernamesView.removeView(removedButton); - final ViewGroup usernamesContainer = (ViewGroup) getView().findViewById(R.id.usernames_container); - View removedErrorView = mUsernameErrorViews.remove(username); - usernamesContainer.removeView(removedErrorView); + updateUsernameError(username, null); } private boolean isUserInInvitees(String username) { @@ -365,6 +363,13 @@ public class PeopleInviteFragment extends Fragment implements @Override public void onRoleSelected(Role newRole) { setRole(newRole); + + if (!mUsernameButtons.keySet().isEmpty()) { + // clear the username results list and let the 'validate' routine do the updates + mUsernameResults.clear(); + + validateAndStyleUsername(mUsernameButtons.keySet(), null); + } } private void setRole(Role newRole) { @@ -374,21 +379,17 @@ public class PeopleInviteFragment extends Fragment implements private void validateAndStyleUsername(Collection usernames, final ValidationEndListener validationEndListener) { List usernamesToCheck = new ArrayList<>(); - List usernamesChecked = new ArrayList<>(); for (String username : usernames) { if (mUsernameResults.containsKey(username)) { - usernamesChecked.add(username); + String resultMessage = mUsernameResults.get(username); + styleButton(username, resultMessage); + updateUsernameError(username, resultMessage); } else { - usernamesToCheck.add(username); - } - } + styleButton(username, null); + updateUsernameError(username, null); - for (String username : usernamesChecked) { - String resultMessage = mUsernameResults.get(username); - if (!resultMessage.equals(FLAG_SUCCESS)) { - styleButton(username, resultMessage); - appendError(username, resultMessage); + usernamesToCheck.add(username); } } @@ -410,10 +411,8 @@ public class PeopleInviteFragment extends Fragment implements final String usernameResultString = getValidationErrorString(username, validationResult); mUsernameResults.put(username, usernameResultString); - if (validationResult != ValidationResult.USER_FOUND) { - styleButton(username, usernameResultString); - appendError(username, usernameResultString); - } + styleButton(username, usernameResultString); + updateUsernameError(username, usernameResultString); } @Override @@ -439,18 +438,15 @@ public class PeopleInviteFragment extends Fragment implements void onValidationEnd(); } - private void styleButton(String username, String validationResultMessage) { + private void styleButton(String username, @Nullable String validationResultMessage) { if (!isAdded()) { return; } TextView textView = (TextView) mUsernameButtons.get(username).findViewById(R.id.username); - - if (!validationResultMessage.equals(FLAG_SUCCESS)) { - textView.setTextColor(ContextCompat.getColor(getActivity(), R.color.alert_red)); - } else { - // properly style the button - } + textView.setTextColor(ContextCompat.getColor(getActivity(), + validationResultMessage == null ? R.color.grey_dark : + (validationResultMessage.equals(FLAG_SUCCESS) ? R.color.blue_wordpress : R.color.alert_red))); } private @@ -474,17 +470,37 @@ public class PeopleInviteFragment extends Fragment implements return null; } - private void appendError(String username, String error) { - if (!isAdded() || error == null) { + private void updateUsernameError(String username, @Nullable String usernameResult) { + if (!isAdded()) { return; } - final ViewGroup usernamesContainer = (ViewGroup) getView().findViewById(R.id.usernames_container); - final TextView usernameError = (TextView) LayoutInflater.from(getActivity()).inflate(R.layout - .people_invite_error_view, null); - usernameError.setText(error); - usernamesContainer.addView(usernameError); - mUsernameErrorViews.put(username, usernameError); + TextView usernameErrorTextView; + if (mUsernameErrorViews.containsKey(username)) { + usernameErrorTextView = mUsernameErrorViews.get(username); + + if (usernameResult == null || usernameResult.equals(FLAG_SUCCESS)) { + // no error so we need to remove the existing error view + ((ViewGroup) usernameErrorTextView.getParent()).removeView(usernameErrorTextView); + mUsernameErrorViews.remove(username); + return; + } + } else { + if (usernameResult == null || usernameResult.equals(FLAG_SUCCESS)) { + // no error so no need to create a new error view + return; + } + + usernameErrorTextView = (TextView) LayoutInflater.from(getActivity()) + .inflate(R.layout.people_invite_error_view, null); + + final ViewGroup usernameErrorsContainer = (ViewGroup) getView() + .findViewById(R.id.username_errors_container); + usernameErrorsContainer.addView(usernameErrorTextView); + + mUsernameErrorViews.put(username, usernameErrorTextView); + } + usernameErrorTextView.setText(usernameResult); } private void clearUsernames(Collection usernames) { diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 88428f66c..20cdf0d76 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -54,7 +54,7 @@ android:paddingLeft="@dimen/margin_medium" android:paddingRight="@dimen/margin_medium" android:singleLine="true" - android:textColor="#444444" + android:textColor="@color/grey_dark" android:textColorHint="#AAAAAA" android:textSize="@dimen/text_sz_medium" tools:text="sdfwefef" @@ -71,6 +71,14 @@ android:textSize="@dimen/text_sz_small" android:textStyle="italic" android:text="@string/invite_message_usernames_limit"/> + + Date: Mon, 26 Sep 2016 15:55:15 +0200 Subject: alpha-22 / 306 version bump --- WordPress/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 720f9ef46..05e2d445f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -34,8 +34,8 @@ android { defaultConfig { applicationId "org.wordpress.android" - versionName "alpha-21" - versionCode 303 + versionName "alpha-22" + versionCode 306 minSdkVersion 16 targetSdkVersion 24 -- cgit v1.2.3 From b8bcc9010e91aa2341bbae87320f1fc193d3e252 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 10:32:56 -0400 Subject: Added `READER_RELATED_POST_CLICKED` to analytics --- .../src/main/java/org/wordpress/android/util/AnalyticsUtils.java | 4 +++- .../main/java/org/wordpress/android/analytics/AnalyticsTracker.java | 1 + .../org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java | 6 ++++++ .../org/wordpress/android/analytics/AnalyticsTrackerNosara.java | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java index c8dd0867a..12aeec257 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java @@ -24,6 +24,7 @@ import java.util.Map; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_COMMENTED_ON; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_LIKED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_OPENED; +import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_RELATED_POST_CLICKED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_INTERACT; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_RENDER; @@ -244,7 +245,8 @@ public class AnalyticsUtils { return stat == READER_ARTICLE_LIKED || stat == READER_ARTICLE_OPENED || stat == READER_SEARCH_RESULT_TAPPED - || stat == READER_ARTICLE_COMMENTED_ON; + || stat == READER_ARTICLE_COMMENTED_ON + || stat == READER_RELATED_POST_CLICKED; } /* diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index 7608e4bd0..c160f47a6 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -43,6 +43,7 @@ public final class AnalyticsTracker { READER_SEARCH_LOADED, READER_SEARCH_PERFORMED, READER_SEARCH_RESULT_TAPPED, + READER_RELATED_POST_CLICKED, STATS_ACCESSED, STATS_INSIGHTS_ACCESSED, STATS_PERIOD_DAYS_ACCESSED, diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java index 2897925af..1e1b278f8 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java @@ -399,6 +399,12 @@ public class AnalyticsTrackerMixpanel extends Tracker { instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reader_search_result_tapped"); instructions.setCurrentDateForPeopleProperty("last_time_reader_search_result_tapped"); break; + case READER_RELATED_POST_CLICKED: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("Reader - Related Post Clicked"); + instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reader_related_post_clicked"); + instructions.setCurrentDateForPeopleProperty("last_time_reader_related_post_clicked"); + break; case EDITOR_CREATED_POST: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Editor - Created Post"); diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index 1d829e355..76c181b9b 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -296,6 +296,8 @@ public class AnalyticsTrackerNosara extends Tracker { return "reader_searchcard_clicked"; case READER_TAG_UNFOLLOWED: return "reader_reader_tag_unfollowed"; + case READER_RELATED_POST_CLICKED: + return "reader_related_post_clicked"; case EDITOR_CREATED_POST: return "editor_post_created"; case EDITOR_SAVED_DRAFT: -- cgit v1.2.3 From 9832c812d21c1ff25f37cee797abff0d904adf71 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 16:13:28 -0400 Subject: Create separate method for showRelatedPost --- .../ui/reader/ReaderPostDetailFragment.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java index ef7c9245b..2f5d8c43c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java @@ -512,15 +512,7 @@ public class ReaderPostDetailFragment extends Fragment postView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - // if we're already viewing a related post, add it to the history stack - // so the user can back-button through the history - otherwise start a - // new detail activity for this related post - if (mIsRelatedPost) { - mPostHistory.push(new ReaderBlogIdPostId(mPost.blogId, mPost.postId)); - replacePost(relatedPost.getBlogId(), relatedPost.getPostId()); - } else { - ReaderActivityLauncher.showReaderPostDetail(getActivity(), relatedPost.getBlogId(), relatedPost.getPostId(), true); - } + showRelatedPost(relatedPost.getBlogId(), relatedPost.getPostId()); } }); @@ -542,6 +534,20 @@ public class ReaderPostDetailFragment extends Fragment } } + /* + * user clicked a related post - if we're already viewing a related post, add it to the history + * stack so the user can back-button through the history - otherwise start a new detail + * activity for this related post + */ + private void showRelatedPost(long blogId, long postId) { + if (mIsRelatedPost) { + mPostHistory.push(new ReaderBlogIdPostId(mPost.blogId, mPost.postId)); + replacePost(blogId, postId); + } else { + ReaderActivityLauncher.showReaderPostDetail(getActivity(), blogId, postId, true); + } + } + /* * if the fragment is maintaining a backstack of posts, navigate to the previous one */ -- cgit v1.2.3 From 841a5ff1c7bfda0ccace3c28481855dd2c78768a Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 16:14:09 -0400 Subject: Null check --- .../org/wordpress/android/ui/reader/ReaderPostDetailFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java index 2f5d8c43c..b12ba0799 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java @@ -541,7 +541,9 @@ public class ReaderPostDetailFragment extends Fragment */ private void showRelatedPost(long blogId, long postId) { if (mIsRelatedPost) { - mPostHistory.push(new ReaderBlogIdPostId(mPost.blogId, mPost.postId)); + if (mPost != null) { + mPostHistory.push(new ReaderBlogIdPostId(mPost.blogId, mPost.postId)); + } replacePost(blogId, postId); } else { ReaderActivityLauncher.showReaderPostDetail(getActivity(), blogId, postId, true); -- cgit v1.2.3 From 8e6d6137ab2e7c87fbf498949e1d39aff8265bcb Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 16:19:54 -0400 Subject: Track READER_RELATED_POST_CLICKED --- .../android/ui/reader/ReaderPostDetailFragment.java | 7 ++++--- .../java/org/wordpress/android/util/AnalyticsUtils.java | 17 +++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java index b12ba0799..18928af01 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java @@ -540,10 +540,11 @@ public class ReaderPostDetailFragment extends Fragment * activity for this related post */ private void showRelatedPost(long blogId, long postId) { + AnalyticsUtils.trackWithReaderPostDetails( + AnalyticsTracker.Stat.READER_RELATED_POST_CLICKED, blogId, postId); + if (mIsRelatedPost) { - if (mPost != null) { - mPostHistory.push(new ReaderBlogIdPostId(mPost.blogId, mPost.postId)); - } + mPostHistory.push(new ReaderBlogIdPostId(mPost.blogId, mPost.postId)); replacePost(blogId, postId); } else { ReaderActivityLauncher.showReaderPostDetail(getActivity(), blogId, postId, true); diff --git a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java index 12aeec257..208605959 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java @@ -13,6 +13,7 @@ import org.wordpress.android.analytics.AnalyticsMetadata; import org.wordpress.android.analytics.AnalyticsTracker; import org.wordpress.android.analytics.AnalyticsTrackerMixpanel; import org.wordpress.android.analytics.AnalyticsTrackerNosara; +import org.wordpress.android.datasets.ReaderPostTable; import org.wordpress.android.models.AccountHelper; import org.wordpress.android.models.Blog; import org.wordpress.android.models.ReaderPost; @@ -210,12 +211,16 @@ public class AnalyticsUtils { } } - /** - * Track when a railcar item has been rendered - * - * @param post The JSON string of the railcar - * - */ + public static void trackWithReaderPostDetails(AnalyticsTracker.Stat stat, long blogId, long postId) { + trackWithReaderPostDetails(stat, ReaderPostTable.getPost(blogId, postId, true)); + } + + /** + * Track when a railcar item has been rendered + * + * @param post The JSON string of the railcar + * + */ public static void trackRailcarRender(String railcarJson) { if (TextUtils.isEmpty(railcarJson)) return; -- cgit v1.2.3 From e2634f4ef694211f55122a3e5aab21f017836561 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 16:21:56 -0400 Subject: Added READER_RELATED_POST_SITE_CLICKED --- .../src/main/java/org/wordpress/android/util/AnalyticsUtils.java | 4 +++- .../main/java/org/wordpress/android/analytics/AnalyticsTracker.java | 1 + .../org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java | 6 ++++++ .../org/wordpress/android/analytics/AnalyticsTrackerNosara.java | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java index 208605959..211f418f7 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java @@ -26,6 +26,7 @@ import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTIC import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_LIKED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_OPENED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_RELATED_POST_CLICKED; +import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_RELATED_POST_SITE_CLICKED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_INTERACT; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_RENDER; @@ -251,7 +252,8 @@ public class AnalyticsUtils { || stat == READER_ARTICLE_OPENED || stat == READER_SEARCH_RESULT_TAPPED || stat == READER_ARTICLE_COMMENTED_ON - || stat == READER_RELATED_POST_CLICKED; + || stat == READER_RELATED_POST_CLICKED + || stat == READER_RELATED_POST_SITE_CLICKED; } /* diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index c160f47a6..c7c7f18ed 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -44,6 +44,7 @@ public final class AnalyticsTracker { READER_SEARCH_PERFORMED, READER_SEARCH_RESULT_TAPPED, READER_RELATED_POST_CLICKED, + READER_RELATED_POST_SITE_CLICKED, STATS_ACCESSED, STATS_INSIGHTS_ACCESSED, STATS_PERIOD_DAYS_ACCESSED, diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java index 1e1b278f8..900268465 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java @@ -405,6 +405,12 @@ public class AnalyticsTrackerMixpanel extends Tracker { instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reader_related_post_clicked"); instructions.setCurrentDateForPeopleProperty("last_time_reader_related_post_clicked"); break; + case READER_RELATED_POST_SITE_CLICKED: + instructions = AnalyticsTrackerMixpanelInstructionsForStat. + mixpanelInstructionsForEventName("Reader - Related Post Site Clicked"); + instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reader_related_post_site_clicked"); + instructions.setCurrentDateForPeopleProperty("last_time_reader_related_post_site_clicked"); + break; case EDITOR_CREATED_POST: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Editor - Created Post"); diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index 76c181b9b..41f0cda02 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -298,6 +298,8 @@ public class AnalyticsTrackerNosara extends Tracker { return "reader_reader_tag_unfollowed"; case READER_RELATED_POST_CLICKED: return "reader_related_post_clicked"; + case READER_RELATED_POST_SITE_CLICKED: + return "reader_related_post_site_clicked"; case EDITOR_CREATED_POST: return "editor_post_created"; case EDITOR_SAVED_DRAFT: -- cgit v1.2.3 From d0d3b1f8925a947737b1a3c8438aa813aa33dbb2 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 16:25:11 -0400 Subject: Renamed to showRelatedPostDetail --- .../org/wordpress/android/ui/reader/ReaderPostDetailFragment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java index 18928af01..da635bfe4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java @@ -512,7 +512,7 @@ public class ReaderPostDetailFragment extends Fragment postView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - showRelatedPost(relatedPost.getBlogId(), relatedPost.getPostId()); + showRelatedPostDetail(relatedPost.getBlogId(), relatedPost.getPostId()); } }); @@ -535,11 +535,11 @@ public class ReaderPostDetailFragment extends Fragment } /* - * user clicked a related post - if we're already viewing a related post, add it to the history - * stack so the user can back-button through the history - otherwise start a new detail + * user clicked a single related post - if we're already viewing a related post, add it to the + * history stack so the user can back-button through the history - otherwise start a new detail * activity for this related post */ - private void showRelatedPost(long blogId, long postId) { + private void showRelatedPostDetail(long blogId, long postId) { AnalyticsUtils.trackWithReaderPostDetails( AnalyticsTracker.Stat.READER_RELATED_POST_CLICKED, blogId, postId); -- cgit v1.2.3 From 5a86fe26047500ed912ac3fc0a7238f8996c9055 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 26 Sep 2016 16:27:33 -0400 Subject: Removed READER_RELATED_POST_SITE_CLICKED --- .../src/main/java/org/wordpress/android/util/AnalyticsUtils.java | 4 +--- .../main/java/org/wordpress/android/analytics/AnalyticsTracker.java | 1 - .../org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java | 6 ------ .../org/wordpress/android/analytics/AnalyticsTrackerNosara.java | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java index 211f418f7..208605959 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/AnalyticsUtils.java @@ -26,7 +26,6 @@ import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTIC import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_LIKED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_OPENED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_RELATED_POST_CLICKED; -import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_RELATED_POST_SITE_CLICKED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_INTERACT; import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_RENDER; @@ -252,8 +251,7 @@ public class AnalyticsUtils { || stat == READER_ARTICLE_OPENED || stat == READER_SEARCH_RESULT_TAPPED || stat == READER_ARTICLE_COMMENTED_ON - || stat == READER_RELATED_POST_CLICKED - || stat == READER_RELATED_POST_SITE_CLICKED; + || stat == READER_RELATED_POST_CLICKED; } /* diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index c7c7f18ed..c160f47a6 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -44,7 +44,6 @@ public final class AnalyticsTracker { READER_SEARCH_PERFORMED, READER_SEARCH_RESULT_TAPPED, READER_RELATED_POST_CLICKED, - READER_RELATED_POST_SITE_CLICKED, STATS_ACCESSED, STATS_INSIGHTS_ACCESSED, STATS_PERIOD_DAYS_ACCESSED, diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java index 900268465..1e1b278f8 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java @@ -405,12 +405,6 @@ public class AnalyticsTrackerMixpanel extends Tracker { instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reader_related_post_clicked"); instructions.setCurrentDateForPeopleProperty("last_time_reader_related_post_clicked"); break; - case READER_RELATED_POST_SITE_CLICKED: - instructions = AnalyticsTrackerMixpanelInstructionsForStat. - mixpanelInstructionsForEventName("Reader - Related Post Site Clicked"); - instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_reader_related_post_site_clicked"); - instructions.setCurrentDateForPeopleProperty("last_time_reader_related_post_site_clicked"); - break; case EDITOR_CREATED_POST: instructions = AnalyticsTrackerMixpanelInstructionsForStat. mixpanelInstructionsForEventName("Editor - Created Post"); diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index 41f0cda02..76c181b9b 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -298,8 +298,6 @@ public class AnalyticsTrackerNosara extends Tracker { return "reader_reader_tag_unfollowed"; case READER_RELATED_POST_CLICKED: return "reader_related_post_clicked"; - case READER_RELATED_POST_SITE_CLICKED: - return "reader_related_post_site_clicked"; case EDITOR_CREATED_POST: return "editor_post_created"; case EDITOR_SAVED_DRAFT: -- cgit v1.2.3 From 0bdad5820c60ef7b46a2a2b06955ed63f5b05156 Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 27 Sep 2016 02:47:32 +0530 Subject: Added show dropdown action on mRoleTextView in PeopleInviteFragment Removed Border from dropdown Updated url to Https --- .../wordpress/android/ui/people/PeopleInviteFragment.java | 12 ++++++------ WordPress/src/main/res/layout/people_invite_fragment.xml | 3 +-- WordPress/src/main/res/values/strings.xml | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index 874f05485..d6148a4df 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -196,18 +196,18 @@ public class PeopleInviteFragment extends Fragment implements populateUsernameButtons(usernames); } - View roleContainer = view.findViewById(R.id.role); - roleContainer.setOnClickListener(new View.OnClickListener() { + + mRoleTextView = (TextView) view.findViewById(R.id.role); + setRole(role); + mRoleTextView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { RoleSelectDialogFragment.show(PeopleInviteFragment.this, 0, isPrivateSite()); } }); - mRoleTextView = (TextView) view.findViewById(R.id.role); - setRole(role); - ImageView imgInfo = (ImageView) view.findViewById(R.id.imgInfo); - imgInfo.setOnClickListener(new View.OnClickListener() { + ImageView imgRoleInfo = (ImageView) view.findViewById(R.id.imgRoleInfo); + imgRoleInfo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Uri uri = Uri.parse(getString(R.string.role_info_url)); diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 90b9c1a71..962bd7353 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -100,7 +100,7 @@ tools:text="@string/role" /> Some media uploads have failed. You can\'t save or publish your post in this state. Would you like to remove all failed media? Remove failed uploads - http://en.support.wordpress.com/user-roles/ + https://en.support.wordpress.com/user-roles/ -- cgit v1.2.3 From 29ac328cda67c9b16e13e1e5bac34e69598712c9 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 26 Sep 2016 19:52:45 -0300 Subject: minor style fix: comment indentation --- .../org/wordpress/android/ui/comments/CommentDetailFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index 401c06635..eafe02723 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -116,9 +116,9 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm private boolean mShouldApproveInstantly; /* - * Used to request a comment from a note using its site and comment ids, rather than build - * the comment with the content in the note. See showComment() - */ + * Used to request a comment from a note using its site and comment ids, rather than build + * the comment with the content in the note. See showComment() + */ private boolean mShouldRequestCommentFromNote = false; private boolean mIsSubmittingReply = false; private NotificationsDetailListFragment mNotificationsDetailListFragment; -- cgit v1.2.3 From afea67a342d4482ddef8a9535a78ea312b2a77d4 Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 26 Sep 2016 19:54:11 -0300 Subject: changed var name to fit code style for local vars --- .../src/main/java/org/wordpress/android/GCMMessageService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index aaed60b7f..6d56b9cb3 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -211,7 +211,7 @@ public class GCMMessageService extends GcmListenerService { private void addActionsForCommentNotification(NotificationCompat.Builder builder, String noteId) { // Add some actions if this is a comment notification - boolean bActionsSet = false; + boolean areActionsSet = false; if (SimperiumUtils.getNotesBucket() != null) { try { @@ -234,14 +234,14 @@ public class GCMMessageService extends GcmListenerService { } } } - bActionsSet = true; + areActionsSet = true; } catch (BucketObjectMissingException e) { e.printStackTrace(); } } // if we could not set the actions, set the default ones REPLY / LIKE - if (!bActionsSet) { + if (!areActionsSet) { addCommentReplyActionForCommentNotification(builder, noteId); addCommentLikeActionForCommentNotification(builder, noteId); } -- cgit v1.2.3 From 4a8d269ca526ff3f261274a8535e53e8397fa0fe Mon Sep 17 00:00:00 2001 From: Mario Zorz Date: Mon, 26 Sep 2016 20:00:24 -0300 Subject: literals extracted to string constants for readability/reuse --- .../main/java/org/wordpress/android/GCMMessageService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java index 6d56b9cb3..de0e92aa9 100644 --- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java @@ -73,6 +73,11 @@ public class GCMMessageService extends GcmListenerService { private static final String PUSH_TYPE_PUSH_AUTH = "push_auth"; private static final String PUSH_TYPE_BADGE_RESET = "badge-reset"; + private static final String KEY_CATEGORY_COMMENT_LIKE = "comment-like"; + private static final String KEY_CATEGORY_COMMENT_REPLY = "comment-reply"; + private static final String KEY_CATEGORY_COMMENT_MODERATE = "comment-moderate"; + + // Add to the analytics properties map a subset of the push notification payload. private static String[] propertiesToCopyIntoAnalytics = {PUSH_ARG_NOTE_ID, PUSH_ARG_TYPE, "blog_id", "post_id", "comment_id"}; @@ -250,7 +255,7 @@ public class GCMMessageService extends GcmListenerService { private void addCommentReplyActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { // adding comment reply action Intent commentReplyIntent = getCommentActionIntent(); - commentReplyIntent.addCategory("comment-reply"); + commentReplyIntent.addCategory(KEY_CATEGORY_COMMENT_REPLY); commentReplyIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, true); if (noteId != null) { commentReplyIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId); @@ -264,7 +269,7 @@ public class GCMMessageService extends GcmListenerService { private void addCommentLikeActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { // adding comment like action Intent commentLikeIntent = getCommentActionIntent(); - commentLikeIntent.addCategory("comment-like"); + commentLikeIntent.addCategory(KEY_CATEGORY_COMMENT_LIKE); commentLikeIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, true); if (noteId != null) { commentLikeIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId); @@ -278,7 +283,7 @@ public class GCMMessageService extends GcmListenerService { private void addCommentApproveActionForCommentNotification(NotificationCompat.Builder builder, String noteId) { // adding comment approve action Intent commentApproveIntent = getCommentActionIntent(); - commentApproveIntent.addCategory("comment-moderate"); + commentApproveIntent.addCategory(KEY_CATEGORY_COMMENT_MODERATE); commentApproveIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, true); if (noteId != null) { commentApproveIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId); -- cgit v1.2.3 From 63df9ac1ac83e25fd48a92e2c2b9aee5406f4d75 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 27 Sep 2016 11:31:01 +0300 Subject: Better condition for "sent but with errors" toast --- .../java/org/wordpress/android/ui/people/PeopleInviteFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index a09163bf3..e68cf29f8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -602,7 +602,8 @@ public class PeopleInviteFragment extends Fragment implements populateUsernameButtons(failedUsernameErrors.keySet()); - ToastUtils.showToast(getActivity(), R.string.invite_error_some_failed); + ToastUtils.showToast(getActivity(), succeededUsernames.isEmpty() + ? R.string.invite_error_sending : R.string.invite_error_some_failed); } else { ToastUtils.showToast(getActivity(), R.string.invite_sent, ToastUtils.Duration.LONG); } -- cgit v1.2.3 From de3ececf52029eb525d45b92524d110a70e43338 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 27 Sep 2016 11:32:48 +0300 Subject: A bit saner line wrapping --- .../java/org/wordpress/android/ui/people/PeopleInviteFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index e68cf29f8..1af3111fb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -580,8 +580,8 @@ public class PeopleInviteFragment extends Fragment implements enableSendButton(false); String dotComBlogId = getArguments().getString(ARG_BLOGID); - PeopleUtils.sendInvitations(new ArrayList<>(mUsernameButtons.keySet()), mRole, mCustomMessage, - dotComBlogId, new PeopleUtils.InvitationsSendCallback() { + PeopleUtils.sendInvitations(new ArrayList<>(mUsernameButtons.keySet()), mRole, mCustomMessage, dotComBlogId, + new PeopleUtils.InvitationsSendCallback() { @Override public void onSent(List succeededUsernames, Map failedUsernameErrors) { if (!isAdded()) { -- cgit v1.2.3 From c426ae0d247064a356e945c28a11894c18a53a8a Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 27 Sep 2016 16:16:02 +0530 Subject: click on parent layout role_container for showing the dropdown used wrapcontent for the dropdown textview moved mRoleTextView initialisation and setRole below the listener. --- .../java/org/wordpress/android/ui/people/PeopleInviteFragment.java | 6 +++--- WordPress/src/main/res/layout/people_invite_fragment.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index d6148a4df..0beb7d2e1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -197,15 +197,15 @@ public class PeopleInviteFragment extends Fragment implements } - mRoleTextView = (TextView) view.findViewById(R.id.role); - setRole(role); - mRoleTextView.setOnClickListener(new View.OnClickListener() { + view.findViewById(R.id.role_container).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { RoleSelectDialogFragment.show(PeopleInviteFragment.this, 0, isPrivateSite()); } }); + mRoleTextView = (TextView) view.findViewById(R.id.role); + setRole(role); ImageView imgRoleInfo = (ImageView) view.findViewById(R.id.imgRoleInfo); imgRoleInfo.setOnClickListener(new View.OnClickListener() { @Override diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 962bd7353..fd426ca61 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -110,7 +110,7 @@ Date: Tue, 27 Sep 2016 13:48:57 +0200 Subject: Remove BUCK references in the README --- README.md | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/README.md b/README.md index c4ed9a80e..377f265e6 100644 --- a/README.md +++ b/README.md @@ -75,27 +75,6 @@ how we're organizing branches in our repository in the Say hello on our [Slack][4] channel: `#mobile`. -## Alternative Build Instructions ## - -WordPress-Android can be compiled with [Buck][8], an alternative to Gradle, -that makes the build process much faster. You first need to fetch the -dependencies by doing: - - $ buck fetch wpandroid - -This command will fetch all dependencies (`.aar` and `.jar`) needed to build -the project. Then you can run buck to build the apk: - - $ buck build wpandroid - -You can build, install and run the project if you have a device or an emulator -connected by running the following: - - $ buck install --run wpandroid - -It's recommended to install [watchman][9] to take advantage of the Buck -daemon: `buckd`. - ## FAQ ## * Q: I can't build/test/package the project because of a `PermGen space` error. @@ -115,5 +94,4 @@ be covered by a different license compatible with the GPLv2. [5]: https://developer.wordpress.com/apps/ [6]: https://developer.wordpress.com/docs/oauth2/ [7]: https://developer.wordpress.com/docs/api/ -[8]: https://facebook.github.io/buck [9]: https://facebook.github.io/watchman/docs/install.html -- cgit v1.2.3 From 8a2948e3e0c26c5ea5e9440e6c063fa10c107025 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Tue, 27 Sep 2016 13:55:59 +0200 Subject: Remove BUCK config files --- .buckconfig | 18 -- .buckversion | 1 - .gitignore | 6 - BUCK | 523 ----------------------------------------------------------- 4 files changed, 548 deletions(-) delete mode 100644 .buckconfig delete mode 100644 .buckversion delete mode 100644 BUCK diff --git a/.buckconfig b/.buckconfig deleted file mode 100644 index df7f5f98d..000000000 --- a/.buckconfig +++ /dev/null @@ -1,18 +0,0 @@ -[alias] - wpandroid = //:wpandroid - -[android] - target = Google Inc.:Google APIs:23 - -[cache] - mode = dir - dir_max_size = 5GB - -[project] - ignore = .git, WordPress/build - -[maven_repositories] - central = https://repo1.maven.org/maven2 - wordpress = http://wordpress-mobile.github.io/WordPress-Android - fabric = https://maven.fabric.io/public - m2 = ~/.m2/repository diff --git a/.buckversion b/.buckversion deleted file mode 100644 index 2cfbc6f92..000000000 --- a/.buckversion +++ /dev/null @@ -1 +0,0 @@ -3f8df32c6224c8d51497cb7543b646d290df6fac diff --git a/.gitignore b/.gitignore index 5da281b2e..1180a715c 100644 --- a/.gitignore +++ b/.gitignore @@ -49,9 +49,3 @@ WordPress/src/main/res/values/com_crashlytics_export_strings.xml WordPress/src/androidTest/monkeys/settings.py *.pyc WordPress/src/androidTest/monkeys/*.png - -# Buck -.buckd -buck-cache/ -buck-out/ -extlibs/ diff --git a/BUCK b/BUCK deleted file mode 100644 index 0e3aab0db..000000000 --- a/BUCK +++ /dev/null @@ -1,523 +0,0 @@ -import re - -### Helper functions - -# List all jars matching globfile -def get_all_jars(globfile): - jar_deps = [] - for jarfile in glob([globfile]): - name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile) - jar_deps.append(':' + name) - prebuilt_jar( - name = name, - binary_jar = jarfile, - ) - return jar_deps - -# Generate the build config values from the gradle.properties file -def get_build_config_values(filename): - values = ['String APP_PN_KEY = "org.wordpress.android.playstore"'] - for line in open(filename).readlines(): - if line.startswith('wp.'): - key, value = line.strip().replace(" ", "").split("=") - key = key.replace("wp.", "").upper().replace(".", "_") - values.append('String %s = "%s"' % (key, value)) - return values - -### Inject versionCode and versionName in the AndroidManifest.xml file - -genrule( - name = 'processed_manifest', - srcs = [ - 'tools/inject_version_in_manifest.py', - 'WordPress/src/main/AndroidManifest.xml', - 'WordPress/build.gradle' - ], - cmd = 'tools/inject_version_in_manifest.py WordPress/src/main/AndroidManifest.xml WordPress/build.gradle > $OUT', - out = 'AndroidManifest.xml', -) - -### Define aar and jar dependencies / auto-generated - -remote_file( - name = 'appcompat-v7-file', - out = 'appcompat-v7.aar', - url = 'mvn:com.android.support:appcompat-v7:aar:23.1.0', - sha1 = '0ec99fae8716984ec56489fb45d1ae752724bae7', -) -android_prebuilt_aar( - name = 'appcompat-v7', - aar = ':appcompat-v7-file', -) -remote_file( - name = 'cardview-v7-file', - out = 'cardview-v7.aar', - url = 'mvn:com.android.support:cardview-v7:aar:23.1.0', - sha1 = '9c0994ace3fd3339ea99521e66570adb5df3d5b2', -) -android_prebuilt_aar( - name = 'cardview-v7', - aar = ':cardview-v7-file', -) -remote_file( - name = 'design-file', - out = 'design.aar', - url = 'mvn:com.android.support:design:aar:23.1.0', - sha1 = '88a6c3ea503e2740c2091e8d5112d383a21f05fe', -) -android_prebuilt_aar( - name = 'design', - aar = ':design-file', -) -remote_file( - name = 'recyclerview-v7-file', - out = 'recyclerview-v7.aar', - url = 'mvn:com.android.support:recyclerview-v7:aar:23.1.0', - sha1 = '9baf22ce2d5c1162365bfce00766e47ebd768fbc', -) -android_prebuilt_aar( - name = 'recyclerview-v7', - aar = ':recyclerview-v7-file', -) -remote_file( - name = 'support-v13-file', - out = 'support-v13.aar', - url = 'mvn:com.android.support:support-v13:aar:23.1.0', - sha1 = '77e34b6545e8594b102bf97c50c57071f161f88f', -) -android_prebuilt_aar( - name = 'support-v13', - aar = ':support-v13-file', -) -remote_file( - name = 'support-v4-file', - out = 'support-v4.aar', - url = 'mvn:com.android.support:support-v4:aar:23.1.0', - sha1 = '8820cb60b2eb5c707be237476fef1b78aa3ccdbe', -) -android_prebuilt_aar( - name = 'support-v4', - aar = ':support-v4-file', -) -remote_file( - name = 'wpcomrest-file', - out = 'wpcomrest.aar', - url = 'mvn:com.automattic:rest:aar:1.0.2', - sha1 = 'e632a6f347ae2ae39a01b22c5b2dd8f44d0116da', -) -android_prebuilt_aar( - name = 'wpcomrest', - aar = ':wpcomrest-file', -) -remote_file( - name = 'tracks-file', - out = 'tracks.aar', - url = 'mvn:com.automattic:tracks:aar:1.1.0', - sha1 = '2dbad8d69e7d118b6930115040d284f2319be497', -) -android_prebuilt_aar( - name = 'tracks', - aar = ':tracks-file', -) -remote_file( - name = 'crashlytics-file', - out = 'crashlytics.aar', - url = 'mvn:com.crashlytics.sdk.android:crashlytics:aar:2.2.2', - sha1 = 'b0b2570cfe1a36d8f4b9680ad62d2aabe51dc2f7', -) -android_prebuilt_aar( - name = 'crashlytics', - aar = ':crashlytics-file', -) -remote_file( - name = 'photoview-file', - out = 'photoview.aar', - url = 'mvn:com.github.chrisbanes.photoview:library:aar:1.2.4', - sha1 = '8abf92fe0df72a97547a172474dcd538722a5371', -) -android_prebuilt_aar( - name = 'photoview', - aar = ':photoview-file', -) -remote_file( - name = 'play-services-gcm-file', - out = 'play-services-gcm.aar', - url = 'mvn:com.google.android.gms:play-services-gcm:aar:8.1.0', - sha1 = 'd86d8b4c502c6169773b27496290ed5c0f294d73', -) -android_prebuilt_aar( - name = 'play-services-gcm', - aar = ':play-services-gcm-file', -) -remote_file( - name = 'play-services-base-file', - out = 'play-services-base.aar', - url = 'mvn:com.google.android.gms:play-services-base:aar:8.1.0', - sha1 = '6ec5b3f737b28a64818b5d245d839e2290994a49', -) -android_prebuilt_aar( - name = 'play-services-basement', - aar = ':play-services-basement-file', -) -remote_file( - name = 'play-services-basement-file', - out = 'play-services-basement.aar', - url = 'mvn:com.google.android.gms:play-services-basement:aar:8.1.0', - sha1 = '997dfcce730a948ff7a59d20fa38161a7d513720', -) -android_prebuilt_aar( - name = 'play-services-base', - aar = ':play-services-base-file', -) -remote_file( - name = 'gson-file', - out = 'gson.jar', - url = 'mvn:com.google.code.gson:gson:jar:2.2.2', - sha1 = '1f96456ca233dec780aa224bff076d8e8bca3908', -) -prebuilt_jar( - name = 'gson', - binary_jar = ':gson-file', -) -remote_file( - name = 'helpshift-file', - out = 'helpshift.aar', - url = 'mvn:com.helpshift:android-aar:aar:3.12.0', - sha1 = '113f25994931714e120a675d8abe9703aeab4699', -) -android_prebuilt_aar( - name = 'helpshift', - aar = ':helpshift-file', -) -remote_file( - name = 'volley-file', - out = 'volley.aar', - url = 'mvn:com.mcxiaoke.volley:library:aar:1.0.18', - sha1 = 'eb970d6cf6ae79345692431dc029e26828096758', -) -android_prebuilt_aar( - name = 'volley', - aar = ':volley-file', -) -remote_file( - name = 'mixpanel-android-file', - out = 'mixpanel-android.aar', - url = 'mvn:com.mixpanel.android:mixpanel-android:aar:4.6.4', - sha1 = '2ae3e05fdb0008a5cd0364a63ab03bd99b6b6205', -) -android_prebuilt_aar( - name = 'mixpanel-android', - aar = ':mixpanel-android-file', -) -remote_file( - name = 'simperium-file', - out = 'simperium.aar', - url = 'mvn:com.simperium.android:simperium:aar:0.6.6', - sha1 = '46a189de8974bdbf16ee20fc0cdd99f666650dff', -) -android_prebuilt_aar( - name = 'simperium', - aar = ':simperium-file', -) -remote_file( - name = 'tagsoup-file', - out = 'tagsoup.jar', - url = 'mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2.1', - sha1 = '5584627487e984c03456266d3f8802eb85a9ce97', -) -prebuilt_jar( - name = 'tagsoup', - binary_jar = ':tagsoup-file', -) -remote_file( - name = 'drag-sort-listview-file', - out = 'drag-sort-listview.aar', - url = 'mvn:org.wordpress:drag-sort-listview:aar:0.6.1', - sha1 = '238699f638a40b9850d7dfabe65ffdf93cd9bfa2', -) -android_prebuilt_aar( - name = 'drag-sort-listview', - aar = ':drag-sort-listview-file', -) -remote_file( - name = 'emailchecker-file', - out = 'emailchecker.aar', - url = 'mvn:org.wordpress:emailchecker:aar:0.3', - sha1 = 'd5f9d7dbb36560357b4894495366bd80303d031d', -) -android_prebuilt_aar( - name = 'emailchecker', - aar = ':emailchecker-file', -) -remote_file( - name = 'graphview-file', - out = 'graphview.aar', - url = 'mvn:org.wordpress:graphview:aar:3.4.0', - sha1 = '710db0f26a101d4dc6042601e122469d5fcc1439', -) -android_prebuilt_aar( - name = 'graphview', - aar = ':graphview-file', -) -remote_file( - name = 'mediapicker-file', - out = 'mediapicker.aar', - url = 'mvn:org.wordpress:mediapicker:aar:1.2.4', - sha1 = 'ce142db12fb37e6f0d0dc08d76aeb2feb8ac711b', -) -android_prebuilt_aar( - name = 'mediapicker', - aar = ':mediapicker-file', -) -remote_file( - name = 'passcodelock-file', - out = 'passcodelock.aar', - url = 'mvn:org.wordpress:passcodelock:aar:1.0.0', - sha1 = 'b203d519db2f6ec0507fd1cb46e3f001da4db10e', -) -android_prebuilt_aar( - name = 'passcodelock', - aar = ':passcodelock-file', -) -remote_file( - name = 'persistentedittext-file', - out = 'persistentedittext.aar', - url = 'mvn:org.wordpress:persistentedittext:aar:1.0.1', - sha1 = 'ed8c682b51d2bdf70bf4dc879b92bc676422a1e8', -) -android_prebuilt_aar( - name = 'persistentedittext', - aar = ':persistentedittext-file', -) -remote_file( - name = 'slidinguppanel-file', - out = 'slidinguppanel.aar', - url = 'mvn:org.wordpress:slidinguppanel:aar:1.0.0', - sha1 = '225937b13cd93277379dbd5168206706a0f049a7', -) -android_prebuilt_aar( - name = 'slidinguppanel', - aar = ':slidinguppanel-file', -) - -## Manually created - -remote_file( - name = 'androidpinning-file', - out = 'androidpinning.aar', - url = 'mvn:org.thoughtcrime.ssl.pinning:AndroidPinning:aar:1.0.0', - sha1 = '01a3bcfa0b90580c3119f0eb2a620560b6e99495', -) -android_prebuilt_aar( - name = 'androidpinning', - aar = ':androidpinning-file', -) -remote_file( - name = 'fabric-file', - out = 'fabric.aar', - url = 'mvn:io.fabric.sdk.android:fabric:aar:1.2.0', - sha1 = '3ccb675269c6fc7b002bba0a97318d0109c4e3ae', -) -android_prebuilt_aar( - name = 'fabric', - aar = ':fabric-file', -) -remote_file( - name = 'commons-lang-file', - out = 'commons-lang.jar', - url = 'mvn:commons-lang:commons-lang:jar:2.6', - sha1 = '0ce1edb914c94ebc388f086c6827e8bdeec71ac2', -) -prebuilt_jar( - name = 'commons-lang', - binary_jar = ':commons-lang-file' -) -remote_file( - name = 'support-annotations-file', - out = 'support-annotations.jar', - url = 'mvn:com.android.support:support-annotations:jar:23.1.0', - sha1 = '92e3fc113ec3ee36b64603a38857b95700025633', -) -prebuilt_jar( - name = 'support-annotations', - binary_jar = ':support-annotations-file' -) -remote_file( - name = 'eventbus-file', - out = 'eventbus.jar', - url = 'mvn:de.greenrobot:eventbus:jar:2.4.0', - sha1 = 'ddd166d01b3158d1c00576d29f7ed15c030df719', -) -prebuilt_jar( - name = 'eventbus', - binary_jar = ':eventbus-file', -) -remote_file( - name = 'androidasync-file', - out = 'androidasync.jar', - url = 'mvn:com.koushikdutta.async:androidasync:jar:2.1.3', - sha1 = '52aed89a155265a48984ecc06aa8dec12674edad', -) -prebuilt_jar( - name = 'androidasync', - binary_jar = ':androidasync-file', -) - -### WordPressUtils - -android_build_config( - name = 'build-config-utils', - package = 'org.wordpress.android.util', -) - -android_resource( - name = 'wpandroid-utils-res', - package = 'org.wordpress.android.util', - res = 'libs/utils/WordPressUtils/src/main/res', -) - -android_library( - name = 'wpandroid-utils', - srcs = glob(['libs/utils/WordPressUtils/src/main/java/**/*.java']), - deps = [ - ':support-v4', - ':wpandroid-utils-res', - ':build-config-utils', - ':volley', - ':commons-lang', - ] -) - -### WordPressEditor - -android_resource( - name = 'wpandroid-editor-res', - package = 'org.wordpress.android.editor', - res = 'libs/editor/WordPressEditor/src/main/res', - # TODO: exclude fonts assets = 'libs/editor/WordPressEditor/src/main/assets', -) - -android_library( - name = 'wpandroid-editor', - srcs = glob(['libs/editor/WordPressEditor/src/main/java/**/*.java']), - deps = [ - ':volley', - ':support-v4', - ':wpandroid-utils', - ':wpanalytics', - ':wpandroid-editor-res', - ':appcompat-v7', - ':support-annotations', - ] -) - -### WordPressAnalytics - -android_library( - name = 'wpanalytics', - srcs = glob(['libs/analytics/WordPressAnalytics/src/main/java/**/*.java']), - deps = [ - ':wpandroid-utils', - ':mixpanel-android', - ':tracks', - ] -) - -### WordPressNetworking - -android_library( - name = 'wpnetworking', - srcs = glob(['libs/networking/WordPressNetworking/src/main/java/**/*.java']), - deps = [ - ':wpcomrest', - ':wpandroid-utils', - ':volley', - ] -) - -### Main app - -keystore( - name = 'debug_keystore', - store = 'keystore/debug.keystore', - properties = 'keystore/debug.keystore.properties', -) - -android_resource( - name = 'zres', # when buck merge resources, it sort them by name, - # the last one override previous - package = 'org.wordpress.android', - res = 'WordPress/src/main/res', - assets = 'WordPress/src/main/assets', - deps = [ - ':appcompat-v7', - ':design', - ':passcodelock', - ':wpandroid-utils', - ':wpandroid-utils-res', - ':wpandroid-editor-res', - ':drag-sort-listview', - ':mediapicker', - ':cardview-v7', - ] -) - -android_build_config( - name = 'build-config', - package = 'org.wordpress.android', - values = get_build_config_values('WordPress/gradle.properties'), -) - -android_library( - name = 'main-lib', - srcs = glob(['WordPress/src/main/java/org/**/*.java']), - deps = [ - ':wpandroid-editor-res', - ':zres', - ':volley', - ':appcompat-v7', - ':support-v13', - ':support-v4', - ':design', - ':recyclerview-v7', - ':cardview-v7', - ':persistentedittext', - ':wpandroid-utils', - ':wpandroid-editor', - ':wpcomrest', - ':wpanalytics', - ':graphview', - ':build-config', - ':drag-sort-listview', - ':simperium', - ':mediapicker', - ':slidinguppanel', - ':passcodelock', - ':wpnetworking', - ':helpshift', - ':emailchecker', - ':crashlytics', - ':fabric', - ':photoview', - ':androidpinning', - ':support-annotations', - ':commons-lang', - ':eventbus', - ':gson', - ':tagsoup', - ':play-services-gcm', - ':play-services-base', - ':play-services-basement', - ':androidasync', - ], -) - -android_binary( - name = 'wpandroid', - manifest = ':processed_manifest', - keystore = ':debug_keystore', - package_type = 'debug', - deps = [ - ':main-lib', - ], -) -- cgit v1.2.3 From dfa97d9865fdabab86708ccb96bf41fff98f02e1 Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 27 Sep 2016 17:31:52 +0530 Subject: Fixed commit issue --- .../org/wordpress/android/ui/people/PeopleInviteFragment.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index 32e8d2341..1108627bb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -447,6 +447,11 @@ public class PeopleInviteFragment extends Fragment implements } } + + public interface ValidationEndListener { + void onValidationEnd(); + } + private void styleButton(String username, @Nullable String validationResultMessage) { if (!isAdded()) { return; @@ -661,7 +666,4 @@ public class PeopleInviteFragment extends Fragment implements return blog != null && blog.isPrivate(); } - public interface ValidationEndListener { - void onValidationEnd(); - } } -- cgit v1.2.3 From bc3505030b89ad2864af41d2c555fae3adcd3a35 Mon Sep 17 00:00:00 2001 From: Nawab Date: Tue, 27 Sep 2016 17:45:51 +0530 Subject: Added gradle.properties-example --- WordPress/gradle.properties-example | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 WordPress/gradle.properties-example diff --git a/WordPress/gradle.properties-example b/WordPress/gradle.properties-example new file mode 100644 index 000000000..f80f9dec1 --- /dev/null +++ b/WordPress/gradle.properties-example @@ -0,0 +1,16 @@ +wp.oauth.app_id = wordpress +wp.oauth.app_secret = wordpress +wp.oauth.redirect_uri = http://android.wordpress.org/ +wp.gcm.id = wordpress +wp.db_secret = wordpress +wp.mixpanel_token = wordpress +wp.simperium.app_secret = wordpress +wp.simperium.app_name = wordpress +wp.helpshift.api.key = wordpress +wp.helpshift.api.domain = wordpress.org +wp.helpshift.api.id = wordpress +wp.app_license_key = wordpress + +# Optional: used to autofill username and password fields at login on debug build only +wp.debug.dotcom_login_username = +wp.debug.dotcom_login_password = -- cgit v1.2.3 From 76f180da77928d84cdc6c475f9310cd31ba335ba Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 28 Sep 2016 13:08:21 +0300 Subject: Revert "Fixed commit issue" This reverts commit dfa97d9865fdabab86708ccb96bf41fff98f02e1. --- .../org/wordpress/android/ui/people/PeopleInviteFragment.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index 1108627bb..32e8d2341 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -447,11 +447,6 @@ public class PeopleInviteFragment extends Fragment implements } } - - public interface ValidationEndListener { - void onValidationEnd(); - } - private void styleButton(String username, @Nullable String validationResultMessage) { if (!isAdded()) { return; @@ -666,4 +661,7 @@ public class PeopleInviteFragment extends Fragment implements return blog != null && blog.isPrivate(); } + public interface ValidationEndListener { + void onValidationEnd(); + } } -- cgit v1.2.3 From 7a0e69be592e3c94708edfcc1d636e1a062309d8 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 28 Sep 2016 13:12:39 +0300 Subject: Remove unneeded padding in invites role dropdown --- WordPress/src/main/res/layout/people_invite_fragment.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 81ead88b0..12ee2ba50 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -126,10 +126,6 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingBottom="@dimen/margin_medium" - android:paddingLeft="@dimen/margin_medium" - android:paddingRight="@dimen/margin_medium" - android:paddingTop="@dimen/margin_medium" android:textColor="@color/grey" android:textSize="@dimen/text_sz_medium" tools:text="@string/role" /> -- cgit v1.2.3 From 5777faa30b1300ea1022c09806a84c3a3d004025 Mon Sep 17 00:00:00 2001 From: aerych Date: Fri, 30 Sep 2016 09:17:15 -0500 Subject: Notifications: Updates noticons font. --- WordPress/src/main/assets/fonts/Noticons-Regular.otf | Bin 17780 -> 0 bytes WordPress/src/main/assets/fonts/Noticons.ttf | Bin 0 -> 29604 bytes .../org/wordpress/android/widgets/NoticonTextView.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 WordPress/src/main/assets/fonts/Noticons-Regular.otf create mode 100644 WordPress/src/main/assets/fonts/Noticons.ttf diff --git a/WordPress/src/main/assets/fonts/Noticons-Regular.otf b/WordPress/src/main/assets/fonts/Noticons-Regular.otf deleted file mode 100644 index 842fce6e6..000000000 Binary files a/WordPress/src/main/assets/fonts/Noticons-Regular.otf and /dev/null differ diff --git a/WordPress/src/main/assets/fonts/Noticons.ttf b/WordPress/src/main/assets/fonts/Noticons.ttf new file mode 100644 index 000000000..7cbcabe84 Binary files /dev/null and b/WordPress/src/main/assets/fonts/Noticons.ttf differ diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java b/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java index eb2959aae..f6255692c 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java +++ b/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java @@ -8,7 +8,7 @@ import android.widget.TextView; * TextView that uses noticon icon font */ public class NoticonTextView extends TextView { - private static final String NOTICON_FONT_NAME = "Noticons-Regular.otf"; + private static final String NOTICON_FONT_NAME = "Noticons.ttf"; public NoticonTextView(Context context) { super(context, null); -- cgit v1.2.3 From 40f107c0bd3a0eb3bcdc5c2fbab716d9b9b8af21 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 3 Oct 2016 15:41:15 +0200 Subject: es-rVE fix after release/3.9 merge --- WordPress/src/main/res/values-es-rVE/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml index 2752d6bc2..a948cb0fe 100644 --- a/WordPress/src/main/res/values-es-rVE/strings.xml +++ b/WordPress/src/main/res/values-es-rVE/strings.xml @@ -46,6 +46,7 @@ Algo fue mal. No se pudo realizar la compra. Borrando sitio... Esta acción no se puede deshacer. Eliminar tu sitio eliminará todo el contenido, contribuidores y dominios de tu sitio. + Borrar tu sitio Exportar tu sitio a un archivo XML ¿Estás seguro? Si estás seguro, por favor asegúrate de invertir tiempo en exportar tu contenido ahora. No podrá ser recuperado en el futuro. @@ -81,6 +82,7 @@ Premium Gratis Estado + Centrado Imagen Galería Estándar @@ -985,6 +987,7 @@ Ancho de la imagen en escala Programado URL + Subiendo Versión Términos del servicio WordPress para Android @@ -1012,6 +1015,7 @@ Categorías Eliminando comentarios Notificación luminosa + Notificación sonora Vibrar Estado Ubicación -- cgit v1.2.3 From 7ef8f4915e84c8f58f3f192db09156b58c4b77a0 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 3 Oct 2016 15:41:36 +0200 Subject: Fix site_settings_list_editor_action_mode_title for Galician (recently added in release/5.9) --- WordPress/src/main/res/values-gl/strings.xml | 1149 ++++++++++++++++++++++++++ 1 file changed, 1149 insertions(+) create mode 100644 WordPress/src/main/res/values-gl/strings.xml diff --git a/WordPress/src/main/res/values-gl/strings.xml b/WordPress/src/main/res/values-gl/strings.xml new file mode 100644 index 000000000..47712af16 --- /dev/null +++ b/WordPress/src/main/res/values-gl/strings.xml @@ -0,0 +1,1149 @@ + + + 1 imaxe + agora + Administrador + Autor + Colaborador + Seguidor + Editor + Lector + Sen conexión, non se pode gardar o perfil. + Ningún + Esquerda + Dereita + Seleccionado %1$d + Non foi posible obter os usuarios do sitio + Xestiona o teu plan en\nWordPress.com/plans + Aínda non tes lectores. + Seguidor + Á procura dos usuarios... + Seguidor por correo-e + Aínda non tes seguidor por correo electrónico ningún + Aínda non tes seguidor ningún + Aínda non tes usuario ningún + Lectores + Seguidores por correo-e + Seguidores + Equipo + Invita ate 10 enderezos de correo electrónico e/ou nomes de usuario de WordPress.com. A\naqueles que necesiten un nome de usuario se lles enviarán instrucións de como crear un. + Se eliminas a este lector, el ou ela non poderán visitar o sitio.\n\nAínda así, queres eliminar a este lector? + Se o eliminas, este seguidor deixará de recibir notificacións sobre este sitio, agás que volva a seguirche.\n \n\nAínda así queres eliminar a este seguidor? + Desde %1$s + Ver a Galería + %d imaxes + Non foi posible eliminar o lector + Non foi posible eliminar o seguidor + Non foi posible obter os seguidores do sitio por correo electrónico + Non foi posible obter os seguidores do sitio + Fallou a carga dalgúns ficheiros. Nesta situación non podes cambiar a modo HTML\nQueres borrar todas as cargas que fallaron e continuar? + Editor visual + Miniatura + Modo HTML + Lista sen orde + Lista ordenada + Inserir máis + Inserir ficheiro + Riscado + Cita + Inserir enlace + Cursiva + Subliñado + Cambios gardados + Lenda + Texto alternativo + Ligar a + Largo + Grosa + Descartar os cambios sen gardar? + Deter a carga + Suspender a carga? + Houbo un erro na inserción do ficheiro + Estanse a cargar os ficheiros. Por favor, espera a que o proceso termine. + Non se poden inserir ficheiros directamente no modo HTML. Hai que volver ao modo visual. + Cargando a galería... + Enviouse a invitación, pero houbo algún erro. + Invitación enviada con éxito + %1$s: %2$s + Pulsa para tentalo outra vez! + Houbo un erro mentres se enviaba a invitación. + Non se pode enviar: Hai nomes de usuario ou enderezos de correo non válidos. + Fallou o envío: un nome de usuario ou un enderezo non é válido. + Introduce como mínimo un nome de usuario + (Opcional) Podes escribir unha mensaxe persoal de ata 500 caracteres para incluíla na invitación ao/s usuario/s. + quedan %d caracteres + queda 1 carácter + quedan 0 caracteres + O enderezo de correo \'%s\' non é válido + Mensaxe persoal + Xa hai un membro co nome de usuario \'%s\' + Non se atopou usuario co nome \'%s\' + Invitar + Nomes de usuario ou enderezos de correo + Enviar o enlace + Externo + Invitar xente + A túa conta está creada, pero houbo u erro mentres cha dabamos acceso. Proba a entrar cos teus nome de usuario e contrasinal novos. + Limpar o historial de busca + Limpar o historial de busca? + Non se atoparon artigos para %s na túa lingua + Buscando... + Non se atoparon artigos + Lecturas relacionadas + Buscar en todos os blogues públicos de WordPress.com + Buscar en WordPress.com + Artigos relacionados + Busca de %s + Os enlaces están inhabilitados na vista previa + Este artigo é un borrador sen publicar + Enviar + Se eliminas a %1$s, o usuario non poderá acceder máis a este sitio, aínda que todos os contidos creados por %1$s permanecerán nel.\n\nQueres aínda así eliminar a este usuario? + %1$s foi eliminado + Eliminar a %1$s + Os sitios desta lista non publicaron nada ultimamente + Xente + Rol + Editar usuario + Non foi posible eliminar o usuario + Non foi posible obter os lectores do sitio + Non foi posible actualizar o rol do usuario + Necesítase permiso para seleccionar ou facer unha foto + Houbo un erro ao actualizar o teu Gravatar + Erro na localización da imaxe recortada + Erro ao recargar o teu Gravatar + Novo! Pulsa no teu Gravatar para cambialo! + Erro no recorte da imaxe + Abre a túa aplicación de correo electrónico + Verificando o enderezo de correo electrónico + Non tes conta en WordPress.com? + Non dispoñible neste momento. Introduce o teu contrasinal.. + Verifica o teu correo electrónico + Conectando + Enviar un enlace ao teu correo para iniciar sesión de inmediato + Introduce o teu contrasinal se non + Móstrase publicamente no teus comentarios. + Jetpack está instalado, pero sen conexión a WordPress.com. Queres conectalo? + Correo electrónico ou nome de usuario + Jetpack non está conectado + O editor visual non é compatible co teu dispositivo. Foi\ndesactivado automaticamente. + (sen título) + Fai ou escolle unha foto + Ver os temas + Agora tes acceso ilimitado aos temas Premium. Proba unha vista previa de calquera deles no teu sitio para comezar. + Atopa un tema Premium perfecto + Comezar un artigo novo + Con VideoPress podes cargar e aloxar vídeos no teu sitio, dispoñendo ademais dunha capacidade de almacenamento ampliada. + Dálle vida aos artigos incluíndo vídeos + Personalizar o sitio + Non tes acceso a caracteres ou colores personalizados, nin á posibilidade de edición de CSS. + Personalizar caracteres e colores + O teu sitio está a dar chimpos de entusiasmo! Explora as novas funcionalidades do teu sitio e escolle por onde che gustaría comezar. + Todo teu, adiante! + Os teus artigos, páxinas e configuración enviaránseche a %s. + Plan + Plans + Non foi posible cargar os plans + Exportar os contidos + Exportando os contidos... + Mensaxe de exportación enviada + Tes melloras Premium no teu sitio. Cancela as melloras antes de eliminalo. + Mostrar compras + Comprobando as compras + Melloras Premium + Algo foi mal. Non foi posible solicitar as compras. + Eliminando o sitio... + Esta acción non se pode desfacer. Eliminar o sitio implica borrar todos os contidos, colaboradores y dominios do sitio. + Eliminar o sitio + Exportar o sitio a un ficheiro XML + Estás seguro? + Se estás seguro, aproveita a ocasión para exportar os teus contidos agora. Máis adiante vai ser imposible recuperalos. + Garda os teus contidos + Dominios que deixarán de funcionar cando elimines o teu sitio + Mírao ben! A eliminación do sitio borrará tamén o/s dominio/s enumerados a continuación. + Dominio principal + Eliminación do dominio + Houbo un erro ao eliminar o sitio. Por favor, contacta co soporte para obter asistencia. + Erro na eliminación do sitio + Escribe %1$s na caixa de embaixo para confirmar. Nese momento o teu sitio desaparecerá para sempre. + Exportar os contidos + Confirmar a eliminación do sitio + Contactar co soporte + Se queres un sitio pero non queres preservar os contidos que tes agora, o noso soporte pode eliminar artigos, páxinas, ficheiros e comentarios por ti.\n \nIsto manterá activo o teu sitio e a súa URL, e darache a oportunidade de comezar a crear contidos desde cero. Contacta connosco para solicitar unha limpeza total do teu sitio. + Borrar todo e comezar desde cero + Imos che axudar + Configuración da aplicación + Comezar desde cero + Eliminar os contidos que non foi posible cargar + Fallou a carga dalgúns ficheiros. Nesta situación non se pode \n gardar nin publicar o artigo. Queres borrar todas as cargas que fallaron? + Non hai comentarios no lixo + Avanzado + Non hai comentarios pendentes + Non hai comentarios aprobados + Feito + Omitir + Fallou a conexión a WordPress. Tempo de espera esgotado. + Non foi posible conectar. A instalación de WordPress respondeu cun documento XML-RPC non válido. + Non foi posible conectar. Os métodos XML-RPC requiridos non están no servidor. + Estado + Vídeo + Centro + Gratis + Todos + Premium + Galería + Imaxe + Enlace + Cita + Estándar + Chat + Aparte + Información sobre os cursos e eventos de WordPress.com (en liña ou presenciais) + Audio + Oportunidades para participar nas investigacións e enquisas de WordPress.com. + Trucos para sacar o mellor partido de WordPress.com + Comunidade + Respostas aos meus comentarios + Propostas + Investigación + Logros do sitio + Mencións do usuario + Seguimentos do sitio + "gústame" nos meus artigos + "gústame" nos meus comentarios + Comentarios no meu sitio + %d elementos + 1 elemento + Comentarios de usuarios coñecidos + Todos os usuarios + Ningún comentario + %d comentarios por páxina + 1 comentario por páxina + Precisa aprobación se ten máis de %d enlaces + Precisa aprobación se ten máis de 1 enlace + Precisa aprobación se ten máis de 0 enlaces + Aprobar automaticamente os comentarios de quen sexa. + Aprobar automaticamente se o usuario ten un comentario aprobado previamente + Solicitar aprobación manual para calquera comentario. + No lixo + 1 día + %d días + Publicados + Borradores + Programados + Sitio principal + Preme no enlace de verificación na mensaxe enviada a %1$s para confirmar o teu novo enderezo + Enderezo web + Estanse a cargar os ficheiros. Por favor, espera a que o proceso termine. + Non foi posible actualizar os comentarios neste momento - mostrando comentarios antigos + Poñer como imaxe destacada + Imaxe destacada + A aplicación de WordPress para Android inclúe agora un novo editor\n visual. Próbao creando unha entrada nova. + Editor novo + Estupendo, grazas! + Editor visual habilitado + Comparte aquí as túas anécdotas... + Título da páxina + Título do artigo + Correo electrónico + Mostrar o editor visual + Editor + Eliminar definitivamente estes comentarios? + Eliminar definitivamente este comentario? + Eliminar + Comentario eliminado + Recuperar + Non hai comentarios spam + Non foi posible cargar a páxina + Todo + Idioma da interface + Off + Acerca da aplicación + Non foi posible gardar a configuración da conta + Non foi posible gardar o perfil + Non foi posible acceder á configuración da conta + Non foi posible acceder ao teu perfil + Vale, entendido. + Engade o widget á pantalla de inicio para acceder ás estatísticas cun toque + Widget de estatísticas para a pantalla de inicio + Código de idioma no aceptado + Permitir a xerarquización dos comentarios en fíos + Fíos até + Borrar + Busca + Engadir categoría + Desactivado + Tamaño orixinal + O sitio só é visible para ti e para os usuarios autorizados + O sitio é visible para calquera, pero pídese aos motores de busca que non o indexen. + O sitio é visible para calquera e os motores de busca poden indexalo + Unhas palabras acerca de ti... + Acerca de mi + Se non se define, o nome mostrado por defecto será o nome de usuario, + Nome público + O meu perfil + Nome + Apelido + Permitir a indexación do sitio aos motores de busca + Rexeitar a indexación do sitio polos motores de busca + Gustaríame que o sitio fose privado, visible só para os usuarios que eu escolla. + Imaxe de vista previa do artigo relacionado + Non foi posible gardar a información do sitio + Non foi posible acceder á información do sitio + Houbo un fallo na conexión mentres se cargaba o ficheiro + Sen conexión, edición inhabilitada. + Versión de WordPress sen soporte + Solicitar aprobación dos comentarios que inclúan un número de enlaces superior a este + Pechar automaticamente + Pechar automaticamente os comentarios nos artigos + Separar os fíos de comentarios en distintas páxinas + Comentarios por páxina + Pechar os comentarios + Cando un comentario conteña algunha destas palabras no seu contido, nome, URL, correo electrónico ou IP, será sinalado como spam. Pódense incluír fragmentos de palabra, de xeito que "press" servirá para "WordPress". + Cando un comentario conteña algunha destas palabras no seu contido, nome, URL, correo electrónico ou IP, será retido na cola de moderación. Pódense incluír fragmentos de palabra, de xeito que "press" servirá para "WordPress". + Introduce unha palabra ou frase + Sen elementos + Pódese modificar esta configuración individualmente en cada artigo + en "Melloras" + Novas melloras: VideoPress para vodas. + en "Aplicacións" + A aplicación WordPress para Android mellora o seu aspecto + en "Móbil" + Dispoñible actualización para iPhone/iPad + Mostrar imaxes + Mostrar a cabeceira + "Artigos relacionados" mostra contido pertinente do sitio despois dos artigos. + Mostrar artigos relacionados + Borra os datos do sitio da aplicación + Os comentarios que coincidan cun filtro serán sinalados como spam + Os comentarios que coincidan cun filtro poñeranse na cola de moderación + Ignora o límite de enlaces para os usuarios coñecidos + O autor do comentario debe ter un comentario previamente aprobado + Os usuarios deben estar rexistrados e conectados para comentar + O autor do comentario debe encher o nome e o correo electrónico + Os comentarios deben ser aprobados manualmente + Mostrar os comentarios en grupos do tamaño especificado + Permitir a xerarquización dos comentarios até un nivel determinado + Establece a orde en que se mostran os comentarios + No permitir comentarios despois do tempo especificado + Permitir notificacións de enlace desde outros blogues + Tentar a notificación aos blogues enlazados desde o artigo + Permitir enviar comentarios aos lectores + Ver e cambiar a configuración de conversa do sitio + Ver todas as opcións de conversa dispoñibles + Mostrar ou ocultar artigos relacionados na Guía de Lectura + Habilitar a carga de imaxes sempre en tamaño completo + Escala as imaxes nos artigos a este largo + Establece o formato do novo artigo + Establece a categoría do novo artigo + Engadir automaticamente a localización aos artigos + Cambiar o contrasinal + Conta de usuario actual + Lingua na está escrito principalmente este blogue. + Controla quen pode ver o sitio + O cambio de enderezo non é admitido neste momento + Unha descrición curta ou unha frase atractiva para describir o blogue + Explica en poucas palabras de que trata este sitio + Comentarios de usuarios coñecidos + Comentarios de todos os usuarios + %d niveis + Privado + Oculto + Eliminar o sitio + Público + Lista negra + Pendentes de moderación + Enlaces nos comentarios + Aprobar automaticamente + Paxinación + Xerarquización + Ordenar por + O usuario debe estar conectado + Debe incluír nome e correo electrónico + Recibir Pingbacks + Enviar Pingbacks + Permitir comentarios + Formato predeterminado + Categoría predeterminada + Habilitar localización + Enderezo + Título do sitio + Subtítulo + Este dispositivo + Prederterminado para os artigos novos + Conta + Escrita + Os máis recentes primeiro + Xeral + Conversa + Privacidade + Artigos relacionados + Comentarios + Os máis antigos primeiro + Pecar despois de + Non tes permiso para cargar ficheiros neste sitio + Nunca + Descoñecido + O artigo xa non existe + Non tes permiso para ver este artigo + Non foi posible acceder a este artigo + O enderezo do sitio non pode conter espazos + O nome de usuario non pode conter espazos + Os sitios que segues non publicaron nada ultimamente + Sen artigos recentes + URL copiado ao portapapeis + Editar o ficheiro + Copiar o URL + Cargado + Engadido + Tema escollido + Non foi posible cargar o tema + Algo foi mal. Non foi posible activar o tema. + por %1$s + Grazas por escoller %1$s + Ver + Detalles + Soporte + FEITO + XESTIONAR O SITIO + Probar e personalizar + Activar + Temas + Tema actual + Personalizar + Data de inicio + Data de finalización + Detalles + Soporte + Activo + Algo foi mal durante o proceso. O estado de spam non foi cambiado. + Sinalando como non spam + Non é spam + Sinalando como spam + Artigo publicado + Páxina publicada + Artigo actualizado + Páxina actualizada + Erro na procura dos temas: fallou a identificación do usuario. + Spam + Sentímolo, non se atoparon temas. + Nome do ficheiro: %s + Cargado o: %s + Dimensións: %s + Tipo de ficheiro: %s + Agardando na cola + Cargar máis artigos + Non hai sitios que coincidan con \'%s\' + Buscar sitios + Sen ler + Ver a Guía de Lectura + Faie ver: comenta nos artigos que liches. + Únete a unha conversa: comenta nos artigos dos blogues que segues. + Reaviva a conversa: escribe un artigo novo. + Sé activo! comenta nos artigos dos blogues que segues. + Non hai novos "gústame" que mostrar ... de momento. + Non hai novos seguidores dos que informar ... de momento + Non hai comentarios novos ... de momento + Xa estás ao día! + Por favor, accede ás estatísticas na aplicación e tenta engadir o widget máis tarde. + Elimina o widget e engádeo de novo + Non se pode acceder ás estatísticas sen ter un blogue visible. + A túa conta de WordPress.com non pode acceder ás estatísticas deste blogue + Por favor, inicia sesión en WordPress. + Non foi posible cargar as estatísticas + Cargando datos... + Estatísticas de hoxe para %1$s + Estatísticas de WordPress hoxe + Necesítase permiso para engadir a localización + Necesítase permiso para engadir contido multimedia + Necesítase permiso para acceder aos contidos multimedia + Para ver as estatísticas debes activar o módulo JSON API en Jetpack + Este artigo ou páxina foi publicado en outro sitio + %s comentarios + 1 comentario + ENVIADO + Responder ao artigo... + Ver %s + Publicado orixinalmente en %s + Publicado orixinalmente por %s + Publicado orixinalmente por %1$s en %2$s + %s "gústame" + %,d seguidores + 1 "gústame" + "Gústame" + Editar etiquetas e blogues + Artigo da Guía de Lectura + Este artigo é un borrador local aínda sen publicar + Este artigo ten cambios locais aínda sen publicar + Configuración de notificacións que aparece no teu dispositivo + Configuración de notificacións enviada ao correo electrónico asociado á túa conta. + Configuración de notificacións que aparece na lapela de notificacións + As notificacións da aplicación están desactivadas. Pulsa aquí para activalas na Configuración. + Tipos de notificacións + Non foi posible cargar a configuración das notificacións + Respostas aos teus comentarios + "Gústame" nos comentarios + Notificacións da aplicación + Lapela de notificacións + Correo electrónico + Comentarios en outros sitios + Actualizacións de WordPress.com + Outras + Correo-e de WordPress.com + Enviaremos sempre mensaxes importantes relativos á túa conta, e terás tamén algúns extras de utilidade. + Os teus sitios + Avisos de notificación + Hai %1$s que %2$s foi publicado. Aquí tes como lle foi ao artigo até este momento... + Resumo do último artigo + Reverter + Hai %d días + Onte + Sen conexión + Páxina botada ao lixo + Artigo eliminado + Artigo botado ao lixo + Non hai actividade neste período + No lixo + Páxina eliminada + Estatísticas + Vista previa + Ver + Editar + Publicar + Atrás + Lixo + Gustaríache engadir un? + Aínda non tes sitio ningún en WordPress + Ilustración + Non tes autorización para acceder a este blogue + Non foi posible atopar este blogue + Desfacer + O meu sitio + Eu + Introduce o PIN + Cambios gardados + A solicitude expirou. Inicia sesión en WordPress.com para tentalo de novo. + Ignorar + %1$d%% de visitas + A mellor de todas + Hora máis popular + Día máis popular + Día e hora máis populares + Estatísticas de hoxe + Entradas, visitas e lectores desde o comezo. + Información + Para ver as estatísticas, inicia sesión na conta de WordPress.com que utilizaches para conectar a Jetpack. + Estás a buscar outras estatísticas recentes? Trasladámolas á páxina "Información". + Desconectarse de WordPress.com + Conectarse a WordPress.com + Entrar/Saír + Configuración da conta + "%s" non foi ocultado porque é o sitio actual + Axuda e soporte + Crear un sitio en WordPress.com + Engadir sitio + Mostrar/ocultar sitios + Engadir un sitio autoaloxado + Ver o sitio + Escoller sitio + Cambiar de sitio + Ir ao Panel + Artigos do blogue + Configuración + Publicar + Aparencia + Pulsa para velos + Configuración + Inicia sesión en WordPress.com para ver as notificacións + Autor descoñecido + Imaxe engadida + Desconectar + Mostrar + Ocultar + Seleccionar todo + Desmarcar todo + Ao desconectar da túa conta borraranse todos os datos de @%s’s WordPress.com neste dispositivo, incluídos borradores e cambios locais. + Selección múltiple co novo selector + Non hai vídeos + Non hai imaxes + Non hai vídeos + Non hai imaxes + Erro na carga de vídeos + Erro na carga de imaxes + Á procura das imaxes... + Á procura dos vídeos... + Non foi posible cargar as estatísticas requiridas + Fallou a procura das imaxes + Fallou a procura dos vídeos + Fallou a procura dos ficheiros + Cargando vídeos + Cargando imaxes + Non hai ficheiros + Dispositivo + Idioma + Engadir ao artigo + Escoller ficheiro + Fai unha foto + Grava un vídeo + Imaxes do dispositivo + Vídeos do dispositivo + Imaxes do sitio + Vídeos do sitio + Nome do ficheiro + Tipo de ficheiro + Non se pode publicar sen ter conexión. Gardado como borrador. + Ruta do ficheiro non válida + Código de verificación + Código de verificación non válido + Verificar + Introduce o código da túa aplicación de autenticación + Busca o código de verificación nos teus SMS + Enviar o código por SMS + Para conectar a Jetpack entra na túa conta de WordPress.com + Inicia sesión de novo para continuar + Termos de busca descoñecidos + Mostrando %1$d - %2$d de %3$s seguidores de WordPress.com + Non se rexistraron termos de busca + Termo de busca + Autores + Termos de busca + Á procura dos comentarios... + Á procura das páxinas... + Á procura dos artigos... + Á procura dos ficheiros... + Editor: + Non foi posible abrir a notificación + Mostrando %1$d - %2$d de %3$s seguidores por correo-e + Non se pode abrir o artigo mentres está en proceso de carga + Aprende máis sobre o tráfico de buscas mirando os termos que levaron aos lectores ao teu sitio. + Fallou a procura de artigos + Cargando + Total + En total + Período + Artigos novos + Este blogue está baleiro + Media diaria + Últimas semanas + Houbo un erro ao copiar o texto no portapapeis + Sitios que poden gustarche + Meses e anos + Os rexistros da aplicación foron copiados no portapapeis + Estatísticas para %s + Outras estatísticas recentes + Ver todo + Ver + hai unha hora + hai un minuto + hai uns segundos + WordPress.com + Sen seguidores + Sen reproducións de vídeos + Sen referencias rexistradas + Sen visitas en artigos ou páxinas + Desde + Sen países rexistrados + Vídeo + Autor + Seguidor + Seguidores + Enlace + Artigos e páxinas + Vídeos + Seguidores + Países + Páxina %1$s de %2$s + Anos + Visitas + Lectores + Á procura dos temas... + "Gústame" + %1$d meses + Un ano + %1$d anos + Un mes + %1$d minutos + %1$d horas + Un día + %1$d días + Total de seguidores por correo-e: %1$s + Correo-e + Total de seguidores en WordPress.com: %1$s + Total de artigos con seguidores dos comentarios: %1$s + Por autores + Por artigos e páxinas + Fai un seguimento do número total de seguidores e do tempo que cada un leva seguindo o teu sitio. + Fai un seguimento dos teus seguidores desde diversas redes sociais utilizando Publicize. + Nos se rexistraron seguidores en Publicize + Servizo + Publicize + Se os teus contidos inclúen enlaces a outros sitios, poderás ver cales son os máis utilizados polos lectores. + Non se rexistraron clics + Se tes cargado vídeos con VideoPress, descobre cantas veces foron vistos. + Se admites comentarios no teu sitio, fai seguimento dos comentadores máis activos e descobre que contidos provocan as conversas máis animadas (baseado nos 1000 comentarios máis recentes). + Bota unha ollada aos asuntos máis populares no teu sitio, segundo os teus artigos máis lidos da semana pasada. + Fai seguimento das visitas aos artigos de cada colaborador e descobre o contido máis popular de cada un. + Sen visitas a artigos ou páxinas etiquetados + Aprende máis sobre a visibilidade do teu sitio mirando os sitios e buscadores desde os que chegan máis visitas. + Descobre cal é o teu contido máis visitado e comproba como lle vai a cada artigo ou paxina ao longo do tempo. + Nesta lista verás que países e rexións xeran máis tráfico no teu sitio + Detalles + Eliminar este artigo + Eliminar este borrador + Eliminar esta páxina + Mostrando ficheiros do %1$s ao %2$s + Borrar os elementos seleccionados? + Borrar o elemento seleccionado? + Borrar este sitio? + %d seleccionados + Non estas a seguir sitio ningún aínda + FAQ + Crear un blogue en WordPress.com + Blogue en WordPress.com creado! + Sen comentarios aínda + Non hai artigos con esta etiqueta + %,d comentarios + Ver o artigo orixinal + Un comentario + Os comentarios están pechados + Comentarios en + %1$d de %2$d + Non se pode publicar un artigo baleiro + Non tes permiso para ver ou editar páxinas + Non tes permiso para ver ou editar artigos + Non tes permiso para ver ou editar comentarios + Con máis dun mes de antigüidade + Máis + Con máis de dous días de antigüidade + Con máis dunha semana de antigüidade + Escolle un sitio de WordPress + Comentario + Comentario no lixo + Aínda sen artigos. Por que non crear un? + Resposta a %s + Aínda sen páxinas. Por que non crear unha? + Non hai ficheiros neste intervalo de tempo + Enviando "%s" + Saíndo... + Non foi posible cargar as estatísticas do blogue requirido + Non deches "gústame" a artigo ningún + Gústame + Gustoulle a + Gustou + Vai ao centro de axuda para obter respostas a preguntas comúns ou visita os foros para tratar outras cuestións. + Ao creares unha conta aceptas os fascinantes %1$sTerms of Service%2$s + Cargando o contido de %s + Cargando %1$d de %2$d + Ves as FAQ + Bloquear este blogue + Non foi posible bloquear este blogue + Os artigos deste blogue non se mostrarán máis + Non foi posible realizar esta acción + Introduce un nome válido + Introduce un correo electrónico válido + Contacta connosco + Describe o problema que estás tendo + Chat de soporte + Chat de soporte + Engadir localización + Localización actual + Buscar + Modificar + Localizar + Enviar automaticamente as estatísticas de uso para axudarnos a mellorar WordPress para Android + Enviar estatísticas + Actualizar + Programar + Etiquetas que sigo + Sitios que sigo + Introduce unha URL ou unha etiqueta para seguila + Artigos coa etiqueta %s + Non se pode mostrar este blogue + Xa segues este blogue + Non foi posible seguir este blogue + Non foi posible deixar de seguir este blogue + Sen blogues recomendados + Blogue da Guía de Lectura + Etiqueta da Guía de Lectura + Etiquetas e blogues + Blogue en seguimento + Gardando... + Sen ficheiros + Truco: Arrastra cara abaixo para actualizar + Perdiches o contrasinal? + Axuda + Foros + Centro de axuda + Certificado SSL non válido + Se habitualmente conectas a este sitio sen problema, este erro pode significar que alguén esta¡á tentando suplantarche no sitio, así que que non deberías continuar. Queres confiar no certificado aínda así? + Non hai rede dispoñible + Houbo un erro mentres se accedía a este blogue + Non hai comentarios + Non é spam + Non foi posible conectar ao sitio de WordPress + Categoría engadida con éxito + O campo de nome de categoría é obrigatorio + O nome de categoría %1$s non é válido. Foi cambiado por %2$s. + Non se atopou conta de WordPress, engade unha conta e proba outra vez. + Non hai comentarios aínda + Non hai estatísticas dispoñibles + Comproba se a URL introducida é válida + Sen notificacións + Houbo un erro mentres se eliminaba o %s + Houbo un erro + PIN incorrecto + O contrasinal debe conter como mínimo 4 caracteres + O nome de usuario debe ter máis de 4 caracteres + O nome de usuario debe ter menos de 61 caracteres + O nome de usuario só pode conter letras minúsculas (a-z) e números + Introduce un nome de usuario + Nome de usuario non permitido + O nome de usuario debe ter como mínimo 4 caracteres + O nome de usuario non pode conter o carácter “_” + O nome de usuario debe conter como mínimo unha letra (a-z) + Ese enderezo de correo electrónico non está permitido + Introduce un enderezo de correo electrónico válido + Ese nome de usuario xa existe + Ese enderezo de correo electrónico xa está sendo usado + Ese nome de usuario está reservado neste momento, pero pode ser que estea dispoñible nun par de días. + Ese enderezo de sitio non está permitido + Introduce un enderezo para o sitio + O enderezo do sitio debe ter como mínimo 4 caracteres + O enderezo do sitio debe ter menos de 64 caracteres + O enderezo do sitio non pode conter o carácter “_” + Non podes usar ese enderezo de sitio + O enderezo do sitio só pode conter letras minúsculas (a-z) e números + Ese sitio xa existe + Ese sitio está reservado + Ese sitio está reservado neste momento, pero pode que estea dispoñible nun par de días. + O nome de usuario ou o contrasinal introducido é incorrecto + Non foi posible conectar + Non foi posible obter o elemento multimedia + Agarda até que se complete a carga + Non foi posible borrar o sitio + Non foi posible actualizar os artigos neste momento + Non foi posible actualizar as páxinas neste momento + Non foi posible cargar o comentario + Non foi posible actualizar as estatísticas neste momento + Non foi posible actualizar os comentarios neste momento + Non foi posible actualizar as notificacións neste momento + O enderezo de correo non é válido + Fallou a resposta + Houbo un erro durante a moderación + Houbo un erro durante a edición do comentario + Houbo un erro mentres se cargaba o %s + Erro na descarga da imaxe + Fallou a procura de temas + Fallou a activación do tema + Asegúrate de se tes privilexio para activar temas + Fallou a adición da categoría + Para cargar ficheiros fai é necesario ter unha tarxeta SD montada + Memoria do dispositivo esgotada + Campo obrigatorio + Correo electrónico + O enderezo do sitio debe ter como mínimo unha letra (a-z) + Enderezo do sitio non válido + Título do sitio non válido + Sen notificacións ... de momento. + Artigo novo + Ficheiro novo + Ver o sitio + Política de privacidade + Cambios locais + Configuración da imaxe + Enderezo do blogue + Blogue feito con WordPress + Non foi posible engadir esta etiqueta + Engadir categoría nova + Nome da categoría + Identificador da categoría (opcional) + Descrición da categoría (opcional) + Categoría superior (opcional) + Artigo novo + Biblioteca Multimedia + Non foi posible crear o ficheiro temporal para a carga. Asegúrate de que haxa espazo libre suficiente no dispositivo. + Localización descoñecida + Comproba se a URL introducida é válida + Pendente de revisión + Necesítase autorización + Formato do artigo + Comentario + Gardando os cambios + Borrar o sitio + Sitio borrado con éxito + Eliminar o borrador + Vista previa da páxina + Vista previa do artigo + Comentario engadido con éxito + Ver no navegador + Non foi posible conectar. Introduce a ruta completa a xmlrpc.php no teu sitio e proba outra vez. + Seleccionar categorías + Detalles da conta + Editar o artigo + Engadir un comentario + Erro de conexión + Cancelar a edición + Grella de miniaturas + Editar a galería + Non tes permiso para ver a Biblioteca Multimedia + Non se poden eliminar algún ficheiros neste momento. Téntao de novo máis tarde. + Vista previa + Tema actual + Tema Premium + Texto do enlace (opcional) + Crear un enlace + Configuración da páxina + Borrador local + Fallou a carga + Aliñamento horizontal + Configuración do artigo + Eliminar o artigo + Eliminar a páxina + Aprobado + Pendente + Spam + No lixo + Editar o comentario + Aprobar + Rexeitar + Spam + Botar ao lixo + Aprobando + Rexeitando + Sinalando como spam + Enviando ao lixo + Botar ao lixo? + Botalo ao lixo + Non botalo ao lixo + Lixo + Nome do autor + Correo-e do autor + URL do autor + Cancelar a edición deste comentario? + Non foi posible atopar o ficheiro para cargar. Terá sido eliminado ou movido? + Non foi posible borrar esta etiqueta + Ese enderezo de correo non serve para rexistrarche. Temos problemas con ese provedor por bloqueo das nosas mensaxes. Utiliza outro provedor de correo electrónico. + Ese enderezo de correo xa está en uso. Comproba se tes unha mensaxe de activación na túa bandexa de entrada. Se non o activas, podes tentalo de novo dentro dalgúns días. + Rexistro da aplicación + Este blogue non se pode cargar porque está oculto. Habilítao de novo na configuración e proba outra vez. + Houbo un erro mentres se creaba a base de datos da aplicación. Proba a reinstalar a aplicación. + O plugin Jetppack é necesario para as estatísticas. Contacta co administrador do sitio. + O estado da páxina non está publicado + Licenzas de Código Aberto + Credenciais HTTP (opcional) + Fai falla un comentario + O comentario non foi modificado + O estado do artigo non está publicado + Introduce un valor de largura a escala válido + Houbo un erro mentres se cargaba o artigo. Actualiza os artigos e téntao de novo. + Saber máis + Configuración da Galería + Orde das imaxes + Número de columnas + Enlace para compartir + Enderezo (URL) do teu sitio autoaloxado + Eliminando a páxina + Eliminando o artigo + Compartir o artigo + Compartir a páxina + Enlace para compartir + Creando o teu sitio + Creando a conta + Algo foi mal mentres se actualizaba a Biblioteca Multimedia. Téntao máis tarde. + Á procura de artigos... + Responder + Vídeo + Descargando o ficheiro + Comentario sinalado como spam + Non podes compartir en WordPress se non tes algún blogue visible + A ti e a outros %,d gustoulles isto + A %,d persoas gustoulles isto + Non foi posible acceder a este comentario + Escoller foto + Escoller vídeo + Escoller a hora + Escoller a data + Non hai problema, pulsa na icona enriba á dereita para comezar a exploración! + A ti e a un máis gustoulles isto + Non foi posible acceder a este artigo + Esta conta ten activada a autenticación de dou pasos. Vai á configuración de seguridade de WordPress.com e crea un contrasinal específico para a aplicación. + Validando os datos de usuario + Validando os datos do sitio + Continuar + Crear unha conta + Conectando... + Iniciar sesión en WordPress.com + Necesitas un contrasinal máis seguro. Asegúrate de usar sete ou máis caracteres e mestura letras maiúsculas e minúsculas, números e caracteres especiais. + Engadir un sitio autoaloxado + Xa segues esta etiqueta + Non é unha etiqueta válida + Non segues etiqueta ningunha + Crear unha conta en WordPress.com + Seguinte + Conectando con WordPress.com + Nome de usuario non válido + Comezar! + Escoller na Biblioteca Multimedia + Para as estatísticas é necesario o plugin JetPack. Queres instalar Jetpack? + Non se atopou Jetpack + (Sen título) + Compartir + Seguir + Seguindo + Responder ao comentario + %s engadido + %s eliminado + Non foi posible enviar o comentario + Engadir á Biblioteca Multimedia + Crear unha Galería + Esta lista está baleira + A unha persoa gustoulle isto + Gústache isto + Non foi posible compartir + Non foi posible mostrar a imaxe + No foi posible abrir %s + Compartido desde %s + Límite acadado. Podes intentalo de novo dentro dun minuto. Tentalo antes só servirá para incrementar a espera até que a prohibición caduque. Se consideras que se trata dun erro, contacta co soporte. + Reproducións + Administrar o bloqueo con PIN + Introduce o PIN + Introduce o PIN anterior + Volve introducir o PIN + Cambiar o PIN + PIN establecido + Bloqueo con PIN + Desactivar o bloqueo con PIN + Activar o bloqueo con PIN + Etiquetas e categorías + Referencias + Hoxe + Onte + Días + Semanas + Meses + País + Título + Asunto + Autor + Referencia + Visitas + Introduce aquí unha lenda + Introduce aquí unha descrición + Actualizado + Detalles + Características + Activar + Extracto + Compartir + Estatísticas + Lectores e visitas + Sen anexar + Data personalizada + Aleatorio + Inverso + Tipo + Cadrados + Mosaico + Círculos + Pase de diapositivas + Título + Lenda + Descrición + Introduce aquí o título + Facer unha foto + Gravar un vídeo + Temas + Todo + Imaxes + Clics + Clics + Fallou a actualización + Activando + Fallou a procura de temas + Engadir a ... + Tema activado con éxito! + Cargar + Descartar + %d notificacións novas + e %d máis. + Entrar + Notificacións + Resposta publicada + Segue + Cargando... + usuario HTTP + contrasinal HTTP + Houbo un erro mentres se cargaba o ficheiro + Contido (pulsa para engadir texto e ficheiros) + Publicar + Engadir ficheiro + Nome de usuario ou contrasinal incorrecto + Contrasinal + Nome de usuario + Guía de Lectura + Páxinas + Lenda (opcional) + Largo + Artigos + Anónimo + Páxina + Artigo + Usar como imaxe destacada + Incluír una imaxe no contido do artigo + Non hai rede dispoñible + usuario + Vale + Largo da imaxe escalada + Cargar e ligar á imaxe escalada + Programado + URL + Cargando... + Versión + Termos de servizo + WordPress para Android + Largo predeterminado da imaxe + Aliñación + Actualizar + Sen título + Editar + Artigo + Páxina + Contrasinal (opcional) + Inmediatamente + Establecer o nome do atallo + Configuración + Hoxe + Compartir o URL + Seleccionar un blogue para o atallo de QuickPress + O nome do atallo non pode estar baleiro + Publicar + Borrador + Privado + Cargar e ligar á imaxe completa + Título + Etiquetas (separadas por comas) + Categorías + Borrando os comentarios + Vibración + Son de notificación + Aviso luminoso + Estado + Localización + Tarxeta SD requirida + Selecciona un vídeo da galería + Multimedia + Borrar + Ningún + Blogues + Escolle unha foto da Galería + Si + Non + Opcións de notificación + Responder + Vista previa + Erro + Cancelar + Gardar + Engadir + en + Erro na actualización da categoría + -- cgit v1.2.3 From 8c09da2bb8e87fe0d89ac515956e9341b588931a Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 3 Oct 2016 18:09:58 +0200 Subject: 6.0-rc-1 / 308 version bump --- WordPress/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 27d60929b..ea8ce96e0 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -34,8 +34,8 @@ android { defaultConfig { applicationId "org.wordpress.android" - versionName "alpha-22" - versionCode 306 + versionName "6.0-rc-1" + versionCode 308 minSdkVersion 16 targetSdkVersion 24 -- cgit v1.2.3