Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: Incorrect error message is displayed in the Centers activity #575

Merged
merged 1 commit into from
Mar 14, 2017
Merged

style: Incorrect error message is displayed in the Centers activity #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...sng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public void onDatePicked(String date) {
public void showFetchingError() {
rv_centers.setVisibility(View.GONE);
rlError.setVisibility(View.VISIBLE);
String errorMessage = getStringMessage(R.string.failed_to_fetch_groups)
String errorMessage = getStringMessage(R.string.failed_to_fetch_centers)
+ getStringMessage(R.string.new_line) + getStringMessage(R.string.click_to_refresh);
mNoCenterText.setText(errorMessage);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ng-android/src/main/java/com/mifos/mifosxdroid/online/centerlist/CenterListPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void onCompleted() {
public void onError(Throwable e) {
getMvpView().showProgressbar(false);
if (loadmore) {
getMvpView().showMessage(R.string.failed_to_fetch_center);
getMvpView().showMessage(R.string.failed_to_fetch_centers);
} else {
getMvpView().showFetchingError();
}
Expand Down
2 changes: 1 addition & 1 deletion mifosng-android/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
<string name="failed_to_add_savings_account">Failed to add SavingsAccount</string>
<string name="failed_to_fetch_documents">Failed to fetch documents</string>
<string name="failed_to_fetch_groups">Failed to Fetch Groups</string>
<string name="failed_to_fetch_center">Failed to Fetch Center</string>
<string name="failed_to_fetch_centers">Failed to Fetch Centers</string>
<string name="failed_to_fetch_Group_and_meeting">Failed to Fetch Group and Meeting</string>
<string name="failed_to_fetch_group_and_account">Failed to fetch group and accounts</string>
<string name="failed_fetch_document">Failed to fetch document</string>
Expand Down
4 changes: 2 additions & 2 deletions mifosng-android/src/test/java/com/mifos/mifosxdroid/online/CenterListPresenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void testLoadMoreCenters() {

verify(mCenterListMvpView).showProgressbar(true);
verify(mCenterListMvpView).showMoreCenters(centerPage.getPageItems());
verify(mCenterListMvpView, never()).showMessage(R.string.failed_to_fetch_center);
verify(mCenterListMvpView, never()).showMessage(R.string.failed_to_fetch_centers);
verify(mCenterListMvpView).showProgressbar(false);
}

Expand All @@ -114,7 +114,7 @@ public void testLoadMoreCentersFails() {
centerListPresenter.loadCenters(true, offset);

verify(mCenterListMvpView).showProgressbar(true);
verify(mCenterListMvpView).showMessage(R.string.failed_to_fetch_center);
verify(mCenterListMvpView).showMessage(R.string.failed_to_fetch_centers);
verify(mCenterListMvpView, never()).showFetchingError();
verify(mCenterListMvpView).showProgressbar(false);
}
Expand Down