Skip to content

i18n: localize legacy channel names/descriptions + ringtone "None" (#165) #191

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

Merged
almothafar merged 1 commit into from
Jul 19, 2026
Merged

i18n: localize legacy channel names/descriptions + ringtone "None" (#165) #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 28 additions & 23 deletions app/src/main/java/com/almothafar/simplebatterynotifier/service/NotificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,49 +654,52 @@ private static void createNotificationChannels(final Context context) {
final boolean vibrate = prefs.getBoolean(context.getString(R.string._pref_key_notifications_vibrate), true);
final int version = alertChannelVersion(prefs);

createChannelIfNotExists(manager, versionedChannelId(CHANNEL_ID_CRITICAL, version),
"Battery Critical Alerts", "Critical battery level alerts", Color.RED, vibrate);
createChannelIfNotExists(manager, versionedChannelId(CHANNEL_ID_WARNING, version),
"Battery Warnings", "Battery warning notifications", Color.rgb(0xff, 0x66, 0x00), vibrate);
createChannelIfNotExists(manager, versionedChannelId(CHANNEL_ID_FULL, version),
"Battery Full", "Battery fully charged notifications", Color.GREEN, vibrate);
createChannelIfNotExists(manager, versionedChannelId(CHANNEL_ID_TEMPERATURE, version),
createOrUpdateAlertChannel(manager, versionedChannelId(CHANNEL_ID_CRITICAL, version),
context.getString(R.string.notification_critical_channel_name),
context.getString(R.string.notification_critical_channel_description), Color.RED, vibrate);
createOrUpdateAlertChannel(manager, versionedChannelId(CHANNEL_ID_WARNING, version),
context.getString(R.string.notification_warning_channel_name),
context.getString(R.string.notification_warning_channel_description), Color.rgb(0xff, 0x66, 0x00), vibrate);
createOrUpdateAlertChannel(manager, versionedChannelId(CHANNEL_ID_FULL, version),
context.getString(R.string.notification_full_channel_name),
context.getString(R.string.notification_full_channel_description), Color.GREEN, vibrate);
createOrUpdateAlertChannel(manager, versionedChannelId(CHANNEL_ID_TEMPERATURE, version),
context.getString(R.string.notification_temperature_channel_name),
context.getString(R.string.notification_temperature_channel_description), Color.RED, vibrate);
createChannelIfNotExists(manager, versionedChannelId(CHANNEL_ID_FAST_DRAIN, version),
createOrUpdateAlertChannel(manager, versionedChannelId(CHANNEL_ID_FAST_DRAIN, version),
context.getString(R.string.notification_fast_drain_channel_name),
context.getString(R.string.notification_fast_drain_channel_description), Color.rgb(0xff, 0x66, 0x00), vibrate);
createChannelIfNotExists(manager, versionedChannelId(CHANNEL_ID_SLOW_CHARGE, version),
createOrUpdateAlertChannel(manager, versionedChannelId(CHANNEL_ID_SLOW_CHARGE, version),
context.getString(R.string.notification_slow_charge_channel_name),
context.getString(R.string.notification_slow_charge_channel_description), Color.rgb(0xff, 0x66, 0x00), vibrate);
createSilentChannelIfNotExists(manager, CHANNEL_ID_STATUS,
createOrUpdateSilentChannel(manager, CHANNEL_ID_STATUS,
context.getString(R.string.notification_status_channel_name),
context.getString(R.string.notification_status_channel_description));
createSilentChannelIfNotExists(manager, CHANNEL_ID_ALERTS_SILENT,
createOrUpdateSilentChannel(manager, CHANNEL_ID_ALERTS_SILENT,
context.getString(R.string.notification_quiet_channel_name),
context.getString(R.string.notification_quiet_channel_description));
}

/**
* Create a low-importance, fully silent channel (no sound, vibration, lights or badge).
* Create a low-importance, fully silent channel (no sound, vibration, lights or badge), or update
* its name/description if it already exists.
* <p>
* Used both by the persistent status notification and, during the user's quiet hours, to deliver
* an alert quietly so it stays visible without disturbing the user (issue #111).
* <p>
* As with the alert channels, re-calling for an existing ID updates only name/description, so
* translated names reach upgraded installs (#165) without disturbing the silent behaviour.
*
* @param manager The NotificationManager
* @param channelId The channel ID to create
* @param name The channel name
* @param description The channel description
*/
private static void createSilentChannelIfNotExists(
private static void createOrUpdateSilentChannel(
final NotificationManager manager,
final String channelId,
final String name,
final String description) {
if (nonNull(manager.getNotificationChannel(channelId))) {
return;
}

final NotificationChannel channel = new NotificationChannel(channelId, name, NotificationManager.IMPORTANCE_LOW);
channel.setDescription(description);
channel.enableLights(false);
Expand All @@ -707,7 +710,13 @@ private static void createSilentChannelIfNotExists(
}

/**
* Create a notification channel if it doesn't already exist
* Create an alert channel, or update its name/description if it already exists.
* <p>
* Re-calling {@code createNotificationChannel} with an existing ID updates only the name,
* description and group — Android ignores importance, vibration, lights and sound so the user's
* (and the versioned #153) settings are preserved. This is how translated channel names reach
* <em>upgraded</em> installs, not just fresh ones (#165): the channel already exists, so we still
* re-apply the current locale's name and description.
*
* @param manager The NotificationManager
* @param channelId The channel ID
Expand All @@ -716,17 +725,13 @@ private static void createSilentChannelIfNotExists(
* @param ledColor The LED color for notifications
* @param vibrate Whether the channel should vibrate (from the user's Vibrate preference)
*/
private static void createChannelIfNotExists(
private static void createOrUpdateAlertChannel(
final NotificationManager manager,
final String channelId,
final String name,
final String description,
final int ledColor,
final boolean vibrate) {
if (nonNull(manager.getNotificationChannel(channelId))) {
return;
}

final NotificationChannel channel = new NotificationChannel(channelId, name, NotificationManager.IMPORTANCE_HIGH);
channel.setDescription(description);
channel.enableLights(true);
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/almothafar/simplebatterynotifier/ui/BatteryInsightsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ private void showDebugMenu() {
return;
}

// Debug-only strings: this block runs only in debuggable builds, so its literals are
// deliberately left untranslated (no values-ar). Skip them in i18n sweeps (#165).
final String[] options = {
"Show Debug Info",
"Add 50 Test Cycles",
Expand Down Expand Up @@ -388,6 +390,8 @@ private void lookUpBatteryModel() {
* Resets all health tracking data, including the first-use date and real charge cycles.
*/
private void resetHealthData() {
// Reached only from the debuggable-only debug menu, so these literals are deliberately
// left untranslated (no values-ar). Skip them in i18n sweeps (#165).
new MaterialAlertDialogBuilder(this)
.setTitle("Reset ALL health data?")
.setMessage("This deletes ALL tracked battery health data, including the first-use date "
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/almothafar/simplebatterynotifier/ui/preference/RingtonePreference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import android.util.Log;
import androidx.preference.Preference;

import com.almothafar.simplebatterynotifier.R;

import static java.util.Objects.nonNull;

/**
Expand Down Expand Up @@ -203,7 +205,7 @@ private void updateSummary() {
Log.e(TAG, "Error loading ringtone for " + currentRingtoneUri, e);
}
}
// Empty or null URI means no ringtone selected (silent/none)
setSummary("None");
// Empty or null URI means no ringtone selected — matches the picker's own "Silent" option (#165)
setSummary(getContext().getString(R.string.pref_ringtone_silent));
}
}
8 changes: 8 additions & 0 deletions app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@

<!-- ==== Added for localization pass #42 (drafted by Claude — pending maintainer review) ==== -->

<!-- Notification channel names/descriptions shown in system Settings → Notifications (#165) -->
<string name="notification_critical_channel_name">تنبيهات البطارية الحرجة</string>
<string name="notification_critical_channel_description">تنبيهات مستوى البطارية الحرج</string>
<string name="notification_warning_channel_name">تحذيرات البطارية</string>
<string name="notification_warning_channel_description">إشعارات تحذير البطارية</string>
<string name="notification_full_channel_name">اكتمال شحن البطارية</string>
<string name="notification_full_channel_description">إشعارات اكتمال شحن البطارية</string>

<!-- Persistent foreground-service status notification -->
<string name="notification_status_channel_name">حالة البطارية</string>
<string name="notification_status_channel_description">حالة البطارية المستمرة أثناء تفعيل المراقبة</string>
Expand Down
9 changes: 9 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 @@ -129,6 +129,15 @@
<string name="notification_full_level_content">You can unplug your charger now</string>
<string name="notification_full_level_content_big" formatted="false">Charge complete — you can unplug now. Batteries age fastest when kept at 100%, so unplugging soon (and staying roughly between 20% and 80% day to day) helps the battery last longer.</string>

<!-- Notification channel names/descriptions shown in system Settings → Notifications (#165).
The critical/warning/full channels predate the resourced newer channels below. -->
<string name="notification_critical_channel_name">Battery Critical Alerts</string>
<string name="notification_critical_channel_description">Critical battery level alerts</string>
<string name="notification_warning_channel_name">Battery Warnings</string>
<string name="notification_warning_channel_description">Battery warning notifications</string>
<string name="notification_full_channel_name">Battery Full</string>
<string name="notification_full_channel_description">Battery fully charged notifications</string>

<string name="notification_charge_started_title">Charging started</string>

<!-- Charge-connected message (issue #122): reports charging speed + wired/wireless instead of
Expand Down