gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 06:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3743 from nextcloud/Valdnet-patch-1

Browse Source 
i18n: Change to capital letter
This commit is contained in:
Marcel Hibbe 2024-03-26 11:50:52 +01:00 committed by GitHub
commit 60eb03977a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

@ -51,12 +51,12 @@ import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.repositories.reactions.ReactionsRepository
import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.SpreedFeatures
import com.nextcloud.talk.utils.CapabilitiesUtil
import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
import com.nextcloud.talk.utils.ConversationUtils
import com.nextcloud.talk.utils.DateConstants
import com.nextcloud.talk.utils.DateUtils
import com.nextcloud.talk.utils.CapabilitiesUtil
import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
import com.nextcloud.talk.utils.SpreedFeatures
import com.vanniktech.emoji.EmojiPopup
import com.vanniktech.emoji.EmojiTextView
import com.vanniktech.emoji.installDisableKeyboardInput
@ -386,10 +386,13 @@ class MessageActionsDialog(
message.lastEditTimestamp *
DateConstants.SECOND_DIVIDER
)
val editorName = context.getString(R.string.nc_edited_by) + message.lastEditActorDisplayName
dialogMessageActionsBinding.editorName.setText(editorName)
dialogMessageActionsBinding.editedTime.setText(editedTime)
val lastEditorName = message.lastEditActorDisplayName ?: ""
val editorName = String.format(
context.getString(R.string.message_last_edited_by),
lastEditorName
)
dialogMessageActionsBinding.editorName.text = editorName
dialogMessageActionsBinding.editedTime.text = editedTime
}
dialogMessageActionsBinding.menuMessageEditedInfo.visibility = getVisibility(showEditorDetails)
}

6
app/src/main/res/values/strings.xml
View File

@ -180,7 +180,7 @@ How to translate with transifex:
<string name="nc_diagnose_dialog_open_diagnose">Open diagnosis screen</string>
<string name="nc_ignore_battery_optimization_dialog_title">Ignore battery optimization</string>
<string name="nc_ignore_battery_optimization_dialog_text">Battery optimization is not ignored. This should be changed to make sure that notifications work in the background! Please click OK and select \"All apps\" -> %1$s -> Don\'t optimize</string>
<string name="nc_ignore_battery_optimization_dialog_text">Battery optimization is not ignored. This should be changed to make sure that notifications work in the background! Please click OK and select \"All apps\" -> %1$s -> Do not optimize</string>
<string name="nc_diagnose_meta_category_title">Meta information</string>
<string name="nc_diagnose_meta_system_report_date">Generation of system report</string>
@ -779,8 +779,8 @@ How to translate with transifex:
<string name="nc_conversation_not_found">Conversation not found</string>
<string name="add_to_notes">Add to Notes</string>
<string name="nc_edited_by_admin">Edited by admin</string>
<string name="nc_edited_by">"Edited by "</string>
<string name="nc_clear_edit_button">clear Edit Button</string>
<string name="nc_clear_edit_button">Clear Edit Button</string>
<string name="nc_edit_icon">Edit Icon</string>
<string name="get_invitations_error">Failed to fetch pending invitations</string>
<string name="message_last_edited_by">Edited by %1$s</string>
</resources>