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

Jump to bottom

Working with #3129 issue #3146

Merged
merged 5 commits into from
Sep 9, 2019
Merged

Working with #3129 issue #3146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6916b1f
Working with hardcoded string
PavelAplevich Sep 5, 2019
5837b20
Minor fix
PavelAplevich Sep 5, 2019
e22cb6f
Another fix
PavelAplevich Sep 5, 2019
e1f10bc
minor fix #2
PavelAplevich Sep 5, 2019
3125d94
Add some fix in another places
PavelAplevich Sep 5, 2019
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
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void shareScreen(Bitmap bitmap) {
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(Intent.EXTRA_STREAM, fileUri);
intent.setType("image/png");
startActivity(Intent.createChooser(intent, "Share image via"));
startActivity(Intent.createChooser(intent, getString(R.string.share_image_via)));
} catch (IOException e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -316,8 +316,8 @@ private void setUploadProgress(int uploadCount){

private void setZeroAchievements() {
AlertDialog.Builder builder=new AlertDialog.Builder(this)
.setMessage("You haven't made any contributions yet")
.setPositiveButton("Ok", (dialog, which) -> {
.setMessage(getString(R.string.no_achievements_yet))
.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
Copy link
Collaborator

@ashishkumar468 ashishkumar468 Sep 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly this could be no_achievements_yet

Copy link
Collaborator

@ashishkumar468 ashishkumar468 Sep 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am sorry I meant, "no_achievements_yet" :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say no_achievements_yet is grammatically better? :-)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, my bad, the same typo again, @PavelAplevich would be great if you could make it "no_achievements_yet"

});
AlertDialog dialog = builder.create();
dialog.show();
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.widget.Toast;

import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.theme.BaseActivity;
import timber.log.Timber;

Expand Down Expand Up @@ -39,7 +40,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
Timber.d("Overriding URL %s", url);

Toast toast = Toast.makeText(SignupActivity.this,
"Account created!", Toast.LENGTH_LONG);
R.string.account_created, Toast.LENGTH_LONG);
toast.show();
// terminate on task completion.
finish();
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
}
title.setOnLongClickListener(view -> {
Utils.copy("place",title.getText().toString(),getContext());
Toast.makeText(getContext(),"Text copied to clipboard",Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(),getString(R.string.text_copy),Toast.LENGTH_SHORT).show();
return true;
}
);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void removeNotification(Notification notification) {
setAdapter(notificationList);
adapter.notifyDataSetChanged();
Snackbar snackbar = Snackbar
.make(relativeLayout,"Notification marked as read", Snackbar.LENGTH_LONG);
.make(relativeLayout, getString(R.string.notification_mark_read), Snackbar.LENGTH_LONG);

snackbar.show();
if (notificationList.size()==0){
Expand All @@ -99,7 +99,7 @@ public void removeNotification(Notification notification) {
else {
adapter.notifyDataSetChanged();
setAdapter(notificationList);
Toast.makeText(NotificationActivity.this, "There was some error!", Toast.LENGTH_SHORT).show();
Toast.makeText(NotificationActivity.this, getString(R.string.some_error), Toast.LENGTH_SHORT).show();
}
}, throwable -> {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void shareScreen(Bitmap bitmap) {
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
intent.setType("image/png");
startActivity(Intent.createChooser(intent, "Share image via"));
startActivity(Intent.createChooser(intent, getString(R.string.share_image_via)));
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,4 +575,10 @@ Upload your first media by tapping on the add button.</string>
<string name="delete_helper_ask_reason_copyright_logo">Logo</string>
<string name="delete_helper_ask_reason_copyright_other">Other</string>
<string name="delete_helper_ask_alert_set_positive_button_reason">Because it is</string>
<string name="share_image_via">Share image via</string>
<string name="no_achievements_yet">You haven\'t made any contributions yet</string>
<string name="account_created">Account created!</string>
<string name="text_copy">Text copied to clipboard</string>
<string name="notification_mark_read">Notification marked as read</string>
<string name="some_error">There was some error!</string>
</resources>