centralcloud/oncall-mobile-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strings

Browse source
This commit is contained in:
Philipp Heckel 2025-12-29 14:06:21 -05:00
parent fcc9e879f7
commit 64c86a19ec
5 changed files with 45 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/io/heckel/ntfy/ui/CustomHeaderFragment.kt
View file

@ -59,7 +59,7 @@ class CustomHeaderFragment : DialogFragment() {
// Build root view
val view = requireActivity().layoutInflater.inflate(R.layout.fragment_custom_header_dialog, null)
val positiveButtonTextResId = if (header == null) R.string.custom_headers_add else R.string.custom_headers_save
val positiveButtonTextResId = if (header == null) R.string.custom_headers_dialog_button_add else R.string.custom_headers_dialog_button_save
val descriptionView: TextView = view.findViewById(R.id.custom_header_dialog_description)
baseUrlView = view.findViewById(R.id.custom_header_dialog_base_url)
@ -69,12 +69,12 @@ class CustomHeaderFragment : DialogFragment() {
var title: String
if (header == null) {
title = getString(R.string.custom_headers_add_title)
descriptionView.text = getString(R.string.custom_header_dialog_description_add)
title = getString(R.string.custom_headers_dialog_title_add)
descriptionView.text = getString(R.string.custom_headers_dialog_description_add)
baseUrlView.visibility = View.VISIBLE
} else {
title = getString(R.string.custom_headers_edit_title)
descriptionView.text = getString(R.string.custom_header_dialog_description_edit)
title = getString(R.string.custom_headers_dialog_title_edit)
descriptionView.text = getString(R.string.custom_headers_dialog_description_edit)
baseUrlView.visibility = View.GONE
baseUrlView.setText(header!!.baseUrl)
headerNameView.setText(header!!.name)
@ -92,7 +92,7 @@ class CustomHeaderFragment : DialogFragment() {
// Do nothing
}
if (header != null) {
builder.setNeutralButton(R.string.custom_headers_delete) { _, _ ->
builder.setNeutralButton(R.string.custom_headers_dialog_button_delete) { _, _ ->
if (this::listener.isInitialized) {
listener.onDeleteCustomHeader(this, header!!)
}
@ -169,10 +169,10 @@ class CustomHeaderFragment : DialogFragment() {
var isValid = true
if (headerName.isNotEmpty()) {
if (!validateHeaderName(headerName)) {
headerNameLayout.error = getString(R.string.custom_headers_invalid_name)
headerNameLayout.error = getString(R.string.custom_headers_dialog_error_invalid_name)
isValid = false
} else if (isReservedHeader(headerName)) {
headerNameLayout.error = getString(R.string.custom_headers_reserved_name)
headerNameLayout.error = getString(R.string.custom_headers_dialog_error_reserved_name)
isValid = false
} else if (headerName.equals("Authorization", ignoreCase = true)) {
// Check if a user exists for this server (async)
@ -185,7 +185,7 @@ class CustomHeaderFragment : DialogFragment() {
false
}
if (userExists) {
headerNameLayout.error = getString(R.string.custom_headers_user_exists)
headerNameLayout.error = getString(R.string.custom_headers_dialog_error_user_exists)
isValid = false
}
}

8
app/src/main/res/layout/fragment_custom_header_dialog.xml
View file

@ -21,7 +21,7 @@
android:layout_marginTop="4dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/custom_header_dialog_description_add"
android:text="@string/custom_headers_dialog_description_add"
android:textColor="?android:attr/textColorSecondary"/>
<com.google.android.material.textfield.TextInputLayout
@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="?dialogPreferredPadding"
android:paddingTop="?dialogPreferredPadding"
android:hint="@string/custom_header_dialog_base_url_hint">
android:hint="@string/custom_headers_dialog_base_url_hint">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/custom_header_dialog_base_url"
@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="?dialogPreferredPadding"
android:layout_marginTop="6dp"
android:hint="@string/custom_headers_name_hint">
android:hint="@string/custom_headers_dialog_name_hint">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/custom_header_dialog_name"
@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="?dialogPreferredPadding"
android:layout_marginTop="6dp"
android:hint="@string/custom_headers_value_hint">
android:hint="@string/custom_headers_dialog_value_hint">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/custom_header_dialog_value"

27
app/src/main/res/values-de/strings.xml
View file

@ -349,28 +349,27 @@
<string name="settings_advanced_exact_alarms_false">ntfy kann keine genauen Alarme planen. Um WebSockets im Hintergrund wieder zu verbinden, sind genaue Alarme erforderlich. Tippe hier, um die Berechtigung zu erteilen.</string>
<string name="settings_advanced_custom_headers_title">Benutzerdefinierte Header</string>
<string name="settings_advanced_custom_headers_summary">Benutzerdefinierte HTTP-Header pro Server hinzufügen</string>
<string name="settings_advanced_custom_headers_prefs_title">Benutzerdefinierte Header</string>
<string name="settings_advanced_custom_headers_prefs_header_add">Header hinzufügen</string>
<string name="settings_advanced_custom_headers_prefs_header_add_title">Header für einen Server hinzufügen</string>
<string name="settings_advanced_custom_headers_prefs_header_add_summary">Header werden mit jeder HTTP-Anfrage an diesen Server gesendet</string>
<string name="custom_headers_add_header">Header hinzufügen</string>
<string name="custom_headers_add_summary">Neuen benutzerdefinierten HTTP-Header hinzufügen</string>
<string name="custom_headers_add_title">Neuen Header hinzufügen</string>
<string name="custom_headers_edit_title">Header bearbeiten</string>
<string name="custom_headers_dialog_title_add">Neuen Header hinzufügen</string>
<string name="custom_headers_dialog_title_edit">Header bearbeiten</string>
<string name="custom_headers_delete_title">Header löschen</string>
<string name="custom_headers_delete_message">Sicher, dass Sie den Header „%1$s" löschen möchten?</string>
<string name="custom_headers_add">Hinzufügen</string>
<string name="custom_headers_save">Speichern</string>
<string name="custom_headers_delete">Löschen</string>
<string name="custom_headers_dialog_button_add">Hinzufügen</string>
<string name="custom_headers_dialog_button_save">Speichern</string>
<string name="custom_headers_dialog_button_delete">Löschen</string>
<string name="custom_headers_error_title">Ungültiger Header</string>
<string name="custom_headers_invalid_name">Ungültige Zeichen im Header-Namen</string>
<string name="custom_headers_reserved_name">Dieser Header ist reserviert und wird von ntfy gesetzt</string>
<string name="custom_headers_user_exists">Authorization-Header kann nicht hinzugefügt werden: Ein Benutzer ist bereits für diesen Server konfiguriert</string>
<string name="custom_headers_name_hint">Name (z.B. CF-Access-Client-Id)</string>
<string name="custom_headers_value_hint">Wert</string>
<string name="custom_header_dialog_description_add">Einen benutzerdefinierten HTTP-Header hinzufügen, der mit jeder Anfrage an den angegebenen Server gesendet wird.</string>
<string name="custom_header_dialog_description_edit">Den Header-Namen/Wert bearbeiten oder löschen.</string>
<string name="custom_header_dialog_base_url_hint">Service-URL</string>
<string name="custom_headers_dialog_error_invalid_name">Ungültige Zeichen im Header-Namen</string>
<string name="custom_headers_dialog_error_reserved_name">Dieser Header ist reserviert und wird von ntfy gesetzt</string>
<string name="custom_headers_dialog_error_user_exists">Authorization-Header kann nicht hinzugefügt werden: Ein Benutzer ist bereits für diesen Server konfiguriert</string>
<string name="custom_headers_dialog_name_hint">Name (z.B. CF-Access-Client-Id)</string>
<string name="custom_headers_dialog_value_hint">Wert</string>
<string name="custom_headers_dialog_description_add">Einen benutzerdefinierten HTTP-Header hinzufügen, der mit jeder Anfrage an den angegebenen Server gesendet wird.</string>
<string name="custom_headers_dialog_description_edit">Den Header-Namen/Wert bearbeiten oder löschen.</string>
<string name="custom_headers_dialog_base_url_hint">Service-URL</string>
<string name="settings_general_dynamic_colors_title">Dynamische Farben</string>
<string name="settings_general_dynamic_colors_summary_enabled">Verwendung der dynamischen Systemfarben</string>
<string name="settings_general_dynamic_colors_summary_disabled">Verwendung der ntfy-Themenfarben</string>

40
app/src/main/res/values/strings.xml
View file

@ -391,11 +391,10 @@
<string name="settings_advanced_unifiedpush_summary_enabled">ntfy will act as a UnifiedPush distributor</string>
<string name="settings_advanced_unifiedpush_summary_disabled">ntfy will not act as a UnifiedPush distributor</string>
<string name="settings_advanced_custom_headers_title">Custom headers</string>
<string name="settings_advanced_custom_headers_summary">Add custom HTTP headers per server</string>
<string name="settings_advanced_custom_headers_prefs_title">Custom Headers</string>
<string name="settings_advanced_custom_headers_summary">Define custom HTTP headers that will be sent along with every request, e.g. if your ntfy server is behind an authenticated proxy or tunnel.</string>
<string name="settings_advanced_custom_headers_prefs_header_add">Add header</string>
<string name="settings_advanced_custom_headers_prefs_header_add_title">Add a header for a server</string>
<string name="settings_advanced_custom_headers_prefs_header_add_summary">Headers are sent with every HTTP request to that server</string>
<string name="settings_advanced_custom_headers_prefs_header_add_summary">Headers are included with every HTTP request. Each ntfy server can have its own set of custom headers.</string>
<string name="settings_advanced_record_logs_title">Record logs</string>
<string name="settings_advanced_record_logs_summary_enabled">Logging (up to 1,000 entries) to device …</string>
<string name="settings_advanced_record_logs_summary_disabled">Turn on logging, so you can share logs later to diagnose issues.</string>
@ -458,7 +457,7 @@
<string name="user_dialog_description_add">You can add a user here. All topics for the given server will use this user.</string>
<string name="user_dialog_description_edit">You may edit username/password for the selected user, or delete it.</string>
<string name="user_dialog_base_url_hint">Service URL</string>
<string name="user_dialog_base_url_error_authorization_header_exists">Authorization header already set in custom headers for this server</string>
<string name="user_dialog_base_url_error_authorization_header_exists">Cannot add user if custom Authorization header is set for this server</string>
<string name="user_dialog_username_hint">Username</string>
<string name="user_dialog_password_hint_add">Password</string>
<string name="user_dialog_password_hint_edit">Password (unchanged if left blank)</string>
@ -467,23 +466,18 @@
<string name="user_dialog_button_delete">Delete user</string>
<string name="user_dialog_button_save">Save</string>
<!-- Custom Headers dialog -->
<string name="custom_headers_add_header">Add Header</string>
<string name="custom_headers_add_summary">Add a new custom HTTP header</string>
<string name="custom_headers_add_title">Add Custom Header</string>
<string name="custom_headers_edit_title">Edit Custom Header</string>
<string name="custom_headers_delete_title">Delete Header</string>
<string name="custom_headers_delete_message">Are you sure you want to delete the header "%1$s"?</string>
<string name="custom_headers_add">Add</string>
<string name="custom_headers_save">Save</string>
<string name="custom_headers_delete">Delete</string>
<string name="custom_headers_error_title">Invalid Header</string>
<string name="custom_headers_invalid_name">Header name contains invalid characters</string>
<string name="custom_headers_reserved_name">This header is reserved and set by ntfy</string>
<string name="custom_headers_user_exists">Cannot add Authorization header: A user is already configured for this server</string>
<string name="custom_headers_name_hint">Name (e.g. CF-Access-Client-Id)</string>
<string name="custom_headers_value_hint">Value</string>
<string name="custom_header_dialog_description_add">Add a custom HTTP header that will be sent with every request to the specified server.</string>
<string name="custom_header_dialog_description_edit">You may edit the header name/value for the selected header, or delete it.</string>
<string name="custom_header_dialog_base_url_hint">Service URL</string>
<!-- Custom headers dialog -->
<string name="custom_headers_dialog_title_add">Add Custom Header</string>
<string name="custom_headers_dialog_title_edit">Edit Custom Header</string>
<string name="custom_headers_dialog_base_url_hint">Service URL</string>
<string name="custom_headers_dialog_name_hint">Header name (e.g. CF-Access-Client-Id)</string>
<string name="custom_headers_dialog_value_hint">Value (e.g. 9f3c2e4a1b2d4e)</string>
<string name="custom_headers_dialog_description_add">Add a custom HTTP header that will be sent with every request to the specified server.</string>
<string name="custom_headers_dialog_description_edit">You may edit the header name/value for the selected header, or delete it.</string>
<string name="custom_headers_dialog_error_invalid_name">Header name contains invalid characters</string>
<string name="custom_headers_dialog_error_reserved_name">This header is reserved and set by ntfy</string>
<string name="custom_headers_dialog_error_user_exists">Cannot add Authorization header if a user is configured for this server</string>
<string name="custom_headers_dialog_button_add">Add</string>
<string name="custom_headers_dialog_button_save">Save</string>
<string name="custom_headers_dialog_button_delete">Delete</string>
</resources>

3
app/src/main/res/xml/custom_header_preferences.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
app:title="@string/settings_advanced_custom_headers_prefs_title">
app:title="@string/settings_advanced_custom_headers_title">
<!-- This is just a template/shell. It's dynamically populated by the code. -->
</PreferenceScreen>