thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

Add further strings

Browse source
This commit is contained in:
Arne 2024-11-30 20:38:33 +01:00
parent 9462395901
commit ca8d93a19e
9 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -254,7 +254,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
case R.id.action_block_avatar:
new AlertDialog.Builder(this)
.setTitle(R.string.block_media)
.setMessage("Do you really want to block this avatar?")
.setMessage(R.string.block_avatar_question)
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
xmppConnectionService.blockMedia(xmppConnectionService.getFileBackend().getAvatarFile(mConversation.getContact().getAvatarFilename()));
xmppConnectionService.getFileBackend().getAvatarFile(mConversation.getContact().getAvatarFilename()).delete();

4
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -2384,7 +2384,7 @@ public class ConversationFragment extends XmppFragment
case R.id.block_media:
new MaterialAlertDialogBuilder(activity)
.setTitle(R.string.block_media)
.setMessage("Do you really want to block this media in all messages?")
.setMessage(R.string.block_media_question)
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
List<Element> thumbs = selectedMessage.getFileParams() != null ? selectedMessage.getFileParams().getThumbnails() : null;
if (thumbs != null && !thumbs.isEmpty()) {
@ -2545,7 +2545,7 @@ public class ConversationFragment extends XmppFragment
case R.id.action_block_avatar:
new MaterialAlertDialogBuilder(activity)
.setTitle(R.string.block_media)
.setMessage("Do you really want to block this avatar?")
.setMessage(R.string.block_avatar_question)
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
activity.xmppConnectionService.blockMedia(activity.xmppConnectionService.getFileBackend().getAvatarFile(conversation.getContact().getAvatarFilename()));
activity.xmppConnectionService.getFileBackend().getAvatarFile(conversation.getContact().getAvatarFilename()).delete();

4
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -294,7 +294,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
final var textColor = MaterialColors.getColor(binding.drawer, com.google.android.material.R.attr.colorOnPrimaryContainer);
final var requests = new com.mikepenz.materialdrawer.model.PrimaryDrawerItem();
requests.setIdentifier(DRAWER_CHAT_REQUESTS);
com.mikepenz.materialdrawer.model.interfaces.NameableKt.setNameText(requests, "Chat Requests");
com.mikepenz.materialdrawer.model.interfaces.NameableKt.setNameText(requests, getString(R.string.chat_requests));
com.mikepenz.materialdrawer.model.interfaces.IconableKt.setIconRes(requests, R.drawable.ic_person_add_24dp);
requests.setBadgeStyle(new com.mikepenz.materialdrawer.holder.BadgeStyle(com.mikepenz.materialdrawer.R.drawable.material_drawer_badge, color, color, textColor));
binding.drawer.getItemAdapter().add(binding.drawer.getItemAdapter().getGlobalPosition(binding.drawer.getItemAdapter().getAdapterPosition(DRAWER_CHANNELS) + 1), requests);
@ -1288,7 +1288,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
populateWithOrderedConversations(list, true, false);
new AlertDialog.Builder(this)
.setTitle(R.string.report_spam)
.setMessage("Do you really want to block all these users and report as SPAM?")
.setMessage(R.string.block_user_and_spam_question)
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
for (final var conversation : list) {
final var m = conversation.getLatestMessage();

2
src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
View file

@ -548,7 +548,7 @@ public class ConversationsOverviewFragment extends XmppFragment {
if (activity.getPreferences().getBoolean("no_mam_pref_warn:" + account.getUuid(), false)) continue;
if (account.mamPrefs() != null && !"always".equals(account.mamPrefs().getAttribute("default"))) {
binding.overviewSnackbar.setVisibility(View.VISIBLE);
binding.overviewSnackbarMessage.setText("Your account " + account.getJid().asBareJid().toEscapedString() + " does not have archiving fully enabled. This may result in missed messages if you use multiple devices or apps.");
binding.overviewSnackbarMessage.setText(R.string.your_account + " " + account.getJid().asBareJid().toEscapedString() + " " + R.string.archiving_not_enabled_text);
binding.overviewSnackbarAction.setOnClickListener((v) -> {
final var prefs = account.mamPrefs();
prefs.setAttribute("default", "always");

6
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -1536,14 +1536,14 @@ public class EditAccountActivity extends OmemoActivity
this.binding.verificationBox.setVisibility(View.VISIBLE);
if (mAccount.getXmppConnection() != null && mAccount.getXmppConnection().resolverAuthenticated()) {
if (mAccount.getXmppConnection().daneVerified()) {
this.binding.verificationMessage.setText("DNSSEC + DANE Verified");
this.binding.verificationMessage.setText(R.string.dnssec_dane_verified);
this.binding.verificationIndicator.setImageResource(R.drawable.shield_verified);
} else {
this.binding.verificationMessage.setText("DNSSEC Verified");
this.binding.verificationMessage.setText(R.string.dnssec_verified);
this.binding.verificationIndicator.setImageResource(R.drawable.shield);
}
} else {
this.binding.verificationMessage.setText("Not DNSSEC Verified");
this.binding.verificationMessage.setText(R.string.not_dnssec_verified);
this.binding.verificationIndicator.setImageResource(R.drawable.shield_question);
}
} else {

4
src/main/java/eu/siacs/conversations/ui/fragment/settings/BackupSettingsFragment.java
View file

@ -190,8 +190,8 @@ public class BackupSettingsFragment extends XmppPreferenceFragment {
private boolean onBackupPreferenceClicked(final Preference preference) {
new AlertDialog.Builder(requireActivity())
.setTitle("Disable accounts")
.setMessage("Do you want to disable your accounts before making a backup (recommended)?")
.setTitle(R.string.disable_all_accounts)
.setMessage(R.string.disable_all_accounts_question)
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
for (final var account : requireService().getAccounts()) {
account.setOption(Account.OPTION_DISABLED, true);

6
src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java
View file

@ -192,10 +192,10 @@ public final class MucDetailsContextMenuHelper {
if (!conversation.getMucOptions().getSelf().getRole().ranks(MucOptions.Role.MODERATOR) || !conversation.getMucOptions().hasFeature("urn:xmpp:message-moderate:0")) return;
DialogQuickeditBinding binding = DataBindingUtil.inflate(activity.getLayoutInflater(), R.layout.dialog_quickedit, null, false);
binding.inputEditText.setText("Spam");
binding.inputEditText.setText(R.string.spam);
new AlertDialog.Builder(activity)
.setTitle(R.string.moderate_recent)
.setMessage("Do you want to moderate all recent messages from this user?")
.setMessage(R.string.moderate_recent_question)
.setView(binding.getRoot())
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
for (Message m : conversation.findMessagesBy(user)) {
@ -224,7 +224,7 @@ public final class MucDetailsContextMenuHelper {
case R.id.action_block_avatar:
new AlertDialog.Builder(activity)
.setTitle(R.string.block_media)
.setMessage("Do you really want to block this avatar?")
.setMessage(R.string.block_avatar_question)
.setPositiveButton(R.string.yes, (dialog, whichButton) -> {
activity.xmppConnectionService.blockMedia(
activity.xmppConnectionService.getFileBackend().getAvatarFile(user.getAvatar())

6
src/main/res/layout/activity_edit_account.xml
View file

@ -555,7 +555,7 @@
android:id="@+id/verification_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Not DNSSEC Verified"
android:text="@string/not_dnssec_verified"
android:textAppearance="?textAppearanceBodyMedium" />
</LinearLayout>
@ -630,14 +630,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Account Color"
android:text="@string/account_color"
android:textAppearance="?textAppearanceBodyMedium"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Used on conversation and contact lists, and notifications"
android:text="@string/account_color_used_on"
android:textAppearance="?textAppearanceBodyMedium"/>
</LinearLayout>

13
src/main/res/values/strings.xml
View file

@ -1376,4 +1376,17 @@
<string name="pref_chat_bubbles">Chat bubbles</string>
<string name="pref_chat_bubbles_summary">Background color, Font size, Avatars</string>
<string name="pref_title_bubbles">Chat Bubbles</string>
<string name="block_avatar_question">Do you really want to block this avatar?</string>
<string name="block_media_question">Do you really want to block this media in all messages?</string>
<string name="block_user_and_spam_question">Do you really want to block all these users and report as SPAM?</string>
<string name="disable_all_accounts_question">Do you want to disable your accounts before making a backup (recommended)?</string>
<string name="spam">Spam</string>
<string name="moderate_recent_question">Do you want to moderate all recent messages from this user?</string>
<string name="chat_requests">Chat requests</string>
<string name="archiving_not_enabled_text">does not have archiving fully enabled. This may result in missed messages if you use multiple devices or apps.</string>
<string name="dnssec_dane_verified">DNSSEC + DANE verified</string>
<string name="dnssec_verified">DNSSEC verified</string>
<string name="not_dnssec_verified">Not DNSSEC verified</string>
<string name="account_color">Account color</string>
<string name="account_color_used_on">Used on conversation and contact lists, and notifications</string>
</resources>