vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-15 08:41:10 +01:00
Code Issues Releases Wiki Activity

Update Crowdin configuration file ; Update and refactor translations

Browse source
This commit is contained in:
Gregor Santner 2016-08-06 01:35:52 +02:00
parent e13f10a688
commit 3a593b0618
10 changed files with 201 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -350,7 +350,7 @@ public class MainActivity extends AppCompatActivity
takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath);
} catch (IOException ex) {
// Error occurred while creating the File
Snackbar.make(swipeRefreshLayout, R.string.image, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeRefreshLayout, R.string.unable_to_load_image, Snackbar.LENGTH_LONG).show();
return false;
}
@ -556,27 +556,27 @@ public class MainActivity extends AppCompatActivity
if (url != null && url.startsWith("https://" + podDomain)) {
String subUrl = url.substring(("https://" + podDomain).length());
if (subUrl.startsWith("/stream")) {
setTitle(R.string.title_stream);
setTitle(R.string.nav_stream);
} else if (subUrl.startsWith("/posts/")) {
setTitle(R.string.diaspora); //TODO: Extract posts title somehow?
} else if (subUrl.startsWith("/notifications")) {
setTitle(R.string.title_notifications);
setTitle(R.string.notifications);
} else if (subUrl.startsWith("/conversations")) {
setTitle(R.string.title_conversations);
setTitle(R.string.conversations);
} else if (subUrl.startsWith("/status_messages/new")) {
setTitle(R.string.new_post);
} else if (subUrl.startsWith("/people/" + appSettings.getProfileId())) {
setTitle(R.string.title_profil);
setTitle(R.string.nav_profile);
} else if (subUrl.startsWith("/activity")) {
setTitle(R.string.title_activities);
setTitle(R.string.nav_activities);
} else if (subUrl.startsWith("/liked")) {
setTitle(R.string.title_liked);
setTitle(R.string.nav_liked);
} else if (subUrl.startsWith("/commented")) {
setTitle(R.string.title_commented);
setTitle(R.string.nav_commented);
} else if (subUrl.startsWith("/mentions")) {
setTitle(R.string.title_mentions);
setTitle(R.string.nav_mentions);
} else if (subUrl.startsWith("/public")) {
setTitle(R.string.title_public);
setTitle(R.string.public_);
}
}
}
@ -790,7 +790,7 @@ public class MainActivity extends AppCompatActivity
}
if (!hasToShareScreenshot) {
Snackbar.make(swipeRefreshLayout, getString(R.string.toast_screenshot) + " " + fileSaveName, Snackbar.LENGTH_LONG).show();
Snackbar.make(swipeRefreshLayout, getString(R.string.share__toast_screenshot) + " " + fileSaveName, Snackbar.LENGTH_LONG).show();
}
Bitmap bitmap;
@ -822,7 +822,7 @@ public class MainActivity extends AppCompatActivity
sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
Uri bmpUri = Uri.fromFile(new File(fileSaveDirectory, fileSaveName));
sharingIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_dotdotdot)));
startActivity(Intent.createChooser(sharingIntent, getString(R.string.action_share_dotdotdot)));
} else {
// Broadcast that this file is indexable
File file = new File(fileSaveDirectory, fileSaveName);
@ -1016,7 +1016,7 @@ public class MainActivity extends AppCompatActivity
if (Helpers.isOnline(MainActivity.this)) {
// webView.loadUrl("https://" + podDomain + "/followed_tags");
Helpers.showFollowedTagsList(webView, app);
setTitle(R.string.jb_followed_tags);
setTitle(R.string.nav_followed_tags);
} else {
snackbarNoInternet.show();
}
@ -1027,7 +1027,7 @@ public class MainActivity extends AppCompatActivity
if (Helpers.isOnline(MainActivity.this)) {
// webView.loadUrl("https://" + podDomain + "/aspects");
Helpers.showAspectList(webView, app);
setTitle(R.string.title_aspects);
setTitle(R.string.aspects);
} else {
snackbarNoInternet.show();
}

4
app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
View file

@ -113,7 +113,7 @@ public class ContextMenuWebView extends NestedWebView {
+ System.currentTimeMillis()+".png");
request.setDestinationUri(Uri.fromFile(destinationFile));
((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
Toast.makeText(context, context.getText(R.string.toast_saved_image_to_location) + " " +
Toast.makeText(context, context.getText(R.string.share__toast_saved_image_to_location) + " " +
destinationFile.getAbsolutePath(), Toast.LENGTH_LONG).show();
}
}
@ -152,7 +152,7 @@ public class ContextMenuWebView extends NestedWebView {
if (url != null) {
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(ClipData.newPlainText("text", url));
Toast.makeText(context, R.string.toast_link_address_copied, Toast.LENGTH_SHORT).show();
Toast.makeText(context, R.string.share__toast_link_address_copied, Toast.LENGTH_SHORT).show();
}
break;