Skip to content

ADFA-4537: externalize hardcoded user-facing strings #156

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
luisguzman-adfa merged 1 commit into from
Jul 8, 2026
Merged

ADFA-4537: externalize hardcoded user-facing strings #156

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
2 changes: 1 addition & 1 deletion controller/app/src/main/java/org/iiab/controller/AdbPairingReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void onReceive(Context context, Intent intent) {
performNativePairing(context.getApplicationContext(), hostIp, pairingPort, pin);

} else {
Toast.makeText(context, "Invalid PIN length. Must be 6 digits.", Toast.LENGTH_LONG).show();
Toast.makeText(context, context.getString(R.string.adb_invalid_pin_length), Toast.LENGTH_LONG).show();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion controller/app/src/main/java/org/iiab/controller/DeployFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ private void checkAndHandleSyncFragmentFocus() {
android.content.SharedPreferences adbPrefs = requireContext().getSharedPreferences("iiab_adb_prefs", Context.MODE_PRIVATE);
if (adbPrefs.getBoolean("pairing_just_succeeded", false)) {
adbPrefs.edit().putBoolean("pairing_just_succeeded", false).apply();
btnAdbAction.setText("Securing connection...");
btnAdbAction.setText(R.string.securing_connection);
new Handler(Looper.getMainLooper()).postDelayed(() -> adbShareController.startAdbPairingFlow(true), 2500);
}
if (adbPrefs.getBoolean("focus_adb", false)) {
Expand Down
2 changes: 1 addition & 1 deletion controller/app/src/main/java/org/iiab/controller/TerminalController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public void openFullTerminal() {
new androidx.appcompat.app.AlertDialog.Builder(activity)
.setTitle(R.string.terminal_crash_title)
.setMessage(android.util.Log.getStackTraceString(t))
.setPositiveButton("OK", null)
.setPositiveButton(android.R.string.ok, null)
.show();
}
}
Expand Down
6 changes: 3 additions & 3 deletions controller/app/src/main/java/org/iiab/controller/install/presentation/PlannerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ public void onCalculated(InstallationPlanner.StorageProjection projection) {
txtLegendFree.setText(String.format(java.util.Locale.US, "%.1fG", (freeSpaceGb - pTotal)));
txtLegendFree.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.dash_text_inverted));
} else {
txtLegendFree.setText("OVERLOAD");
txtLegendFree.setText(R.string.storage_overload);
txtLegendFree.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.status_danger));
}
}
Expand Down Expand Up @@ -410,7 +410,7 @@ public void onCalculated(InstallationPlanner.StorageProjection projection) {
}

int centerColor = (host.getSelectedTier() == null || host.isStorageSafe()) ? ContextCompat.getColor(fragment.requireContext(), R.color.dash_text_inverted) : ContextCompat.getColor(fragment.requireContext(), R.color.status_danger);
storageGauge.updateData(segments, String.format(java.util.Locale.US, "%.1fG", pTotal), centerColor, "Projected", "Storage");
storageGauge.updateData(segments, String.format(java.util.Locale.US, "%.1fG", pTotal), centerColor, fragment.getString(R.string.gauge_projected), fragment.getString(R.string.gauge_storage));
}

if (fragment.getActivity() != null)
Expand All @@ -419,7 +419,7 @@ public void onCalculated(InstallationPlanner.StorageProjection projection) {

@Override
public void onError(String error) {
if (fragment.isAdded() && txtLegendFree != null) txtLegendFree.setText("Error");
if (fragment.isAdded() && txtLegendFree != null) txtLegendFree.setText(R.string.gauge_error);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion controller/app/src/main/java/org/iiab/controller/sync/presentation/ReceiveController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public void renderTransfer(SyncTransferState st) {
progressBarTransfer.setIndeterminate(false);
progressBarTransfer.setProgress(st.percent);
txtTransferSpeed.setText(st.speed);
txtTransferEta.setText("ETA: " + st.eta);
txtTransferEta.setText(fragment.getString(R.string.sync_transfer_eta, st.eta));
if (!st.file.isEmpty()) {
String displayFile = st.file.length() > 40 ? "..." + st.file.substring(st.file.length() - 40) : st.file;
txtTransferFilename.setText(fragment.getString(R.string.sync_transfer_filename, displayFile));
Expand Down
6 changes: 3 additions & 3 deletions controller/app/src/main/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Wi-Fi"
android:text="@string/wifi"
android:textColor="@color/text_secondary"
android:textSize="13sp"
android:layout_toEndOf="@id/ic_wifi"
Expand Down Expand Up @@ -161,7 +161,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hotspot"
android:text="@string/hotspot"
android:textColor="@color/text_secondary"
android:textSize="13sp"
android:layout_toEndOf="@id/ic_hotspot"
Expand Down Expand Up @@ -199,7 +199,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Uptime:"
android:text="@string/uptime_label"
android:textColor="@color/text_secondary"
android:textSize="13sp"
android:layout_marginStart="6dp"
Expand Down
2 changes: 1 addition & 1 deletion controller/app/src/main/res/layout/fragment_usage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
android:id="@+id/btn_server_control"
android:layout_width="match_parent"
android:layout_height="90dp"
android:text="Launch Server"
android:text="@string/launch_server"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@color/text_on_accent"
Expand Down
6 changes: 3 additions & 3 deletions controller/app/src/main/res/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_center_focus_strong"
android:contentDescription="Share via QR"
android:contentDescription="@string/cd_share_via_qr"
android:padding="12dp"
android:scaleType="fitCenter"
android:tint="#FFFFFF" />
Expand All @@ -57,7 +57,7 @@
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_menu_preferences"
android:contentDescription="Settings"
android:contentDescription="@string/cd_settings"
android:padding="12dp"
android:scaleType="fitCenter"
android:tint="#FFFFFF" />
Expand All @@ -69,7 +69,7 @@
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_theme_system"
android:contentDescription="Toggle Theme"
android:contentDescription="@string/cd_toggle_theme"
android:padding="12dp"
android:scaleType="fitCenter"
android:tint="#FFFFFF" />
Expand Down
13 changes: 13 additions & 0 deletions controller/app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,4 +570,17 @@
<string name="setup_dns_hint">DNS personalizado para el servidor.</string>
<string name="tooltip_see_more">Ver más</string>
<string name="tooltip_help_unavailable">El contenido de ayuda aún no está instalado.</string>

<!-- ADFA-4537: externalized strings -->
<string name="adb_invalid_pin_length">Longitud de PIN inválida. Debe tener 6 dígitos.</string>
<string name="securing_connection">Asegurando la conexión…</string>
<string name="storage_overload">SOBRECARGA</string>
<string name="gauge_projected">Proyectado</string>
<string name="gauge_storage">Almacenamiento</string>
<string name="gauge_error">Error</string>
<string name="sync_transfer_eta">ETA: %1$s</string>
<string name="cd_share_via_qr">Compartir por QR</string>
<string name="cd_settings">Ajustes</string>
<string name="cd_toggle_theme">Cambiar tema</string>
<string name="uptime_label">Tiempo activo:</string>
</resources>
13 changes: 13 additions & 0 deletions controller/app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,4 +571,17 @@
<string name="setup_dns_hint">DNS personnalisé pour le serveur.</string>
<string name="tooltip_see_more">Voir plus</string>
<string name="tooltip_help_unavailable">Le contenu d\'aide n\'est pas encore installé.</string>

<!-- ADFA-4537: externalized strings -->
<string name="adb_invalid_pin_length">Longueur de code PIN invalide. Doit comporter 6 chiffres.</string>
<string name="securing_connection">Sécurisation de la connexion…</string>
<string name="storage_overload">SURCHARGE</string>
<string name="gauge_projected">Projeté</string>
<string name="gauge_storage">Stockage</string>
<string name="gauge_error">Erreur</string>
<string name="sync_transfer_eta">ETA : %1$s</string>
<string name="cd_share_via_qr">Partager via QR</string>
<string name="cd_settings">Paramètres</string>
<string name="cd_toggle_theme">Changer de thème</string>
<string name="uptime_label">Temps de fonctionnement :</string>
</resources>
13 changes: 13 additions & 0 deletions controller/app/src/main/res/values-hi/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,4 +571,17 @@
<string name="setup_dns_hint">सर्वर के लिए कस्टम DNS।</string>
<string name="tooltip_see_more">और देखें</string>
<string name="tooltip_help_unavailable">सहायता सामग्री अभी इंस्टॉल नहीं है।</string>

<!-- ADFA-4537: externalized strings -->
<string name="adb_invalid_pin_length">अमान्य पिन लंबाई। 6 अंक होने चाहिए।</string>
<string name="securing_connection">कनेक्शन सुरक्षित किया जा रहा है…</string>
<string name="storage_overload">अधिभार</string>
<string name="gauge_projected">अनुमानित</string>
<string name="gauge_storage">संग्रहण</string>
<string name="gauge_error">त्रुटि</string>
<string name="sync_transfer_eta">ETA: %1$s</string>
<string name="cd_share_via_qr">QR से साझा करें</string>
<string name="cd_settings">सेटिंग्स</string>
<string name="cd_toggle_theme">थीम बदलें</string>
<string name="uptime_label">अपटाइम:</string>
</resources>
13 changes: 13 additions & 0 deletions controller/app/src/main/res/values-pt/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,4 +573,17 @@
<string name="setup_dns_hint">DNS personalizado para o servidor.</string>
<string name="tooltip_see_more">Ver mais</string>
<string name="tooltip_help_unavailable">O conteúdo de ajuda ainda não está instalado.</string>

<!-- ADFA-4537: externalized strings -->
<string name="adb_invalid_pin_length">Comprimento de PIN inválido. Deve ter 6 dígitos.</string>
<string name="securing_connection">Protegendo a conexão…</string>
<string name="storage_overload">SOBRECARGA</string>
<string name="gauge_projected">Projetado</string>
<string name="gauge_storage">Armazenamento</string>
<string name="gauge_error">Erro</string>
<string name="sync_transfer_eta">ETA: %1$s</string>
<string name="cd_share_via_qr">Compartilhar via QR</string>
<string name="cd_settings">Configurações</string>
<string name="cd_toggle_theme">Alternar tema</string>
<string name="uptime_label">Tempo ativo:</string>
</resources>
13 changes: 13 additions & 0 deletions controller/app/src/main/res/values-ru-rRU/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,4 +570,17 @@
<string name="setup_dns_hint">Пользовательский DNS для сервера.</string>
<string name="tooltip_see_more">Подробнее</string>
<string name="tooltip_help_unavailable">Справочные материалы ещё не установлены.</string>

<!-- ADFA-4537: externalized strings -->
<string name="adb_invalid_pin_length">Неверная длина PIN-кода. Должно быть 6 цифр.</string>
<string name="securing_connection">Установка защищённого соединения…</string>
<string name="storage_overload">ПЕРЕГРУЗКА</string>
<string name="gauge_projected">Прогноз</string>
<string name="gauge_storage">Хранилище</string>
<string name="gauge_error">Ошибка</string>
<string name="sync_transfer_eta">ETA: %1$s</string>
<string name="cd_share_via_qr">Поделиться через QR</string>
<string name="cd_settings">Настройки</string>
<string name="cd_toggle_theme">Сменить тему</string>
<string name="uptime_label">Время работы:</string>
</resources>
13 changes: 13 additions & 0 deletions controller/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,4 +587,17 @@
<string name="setup_dns_hint">Custom DNS for the server.</string>
<string name="tooltip_see_more">See more</string>
<string name="tooltip_help_unavailable">Help content is not installed yet.</string>

<!-- ADFA-4537: externalized strings -->
<string name="adb_invalid_pin_length">Invalid PIN length. Must be 6 digits.</string>
<string name="securing_connection">Securing connection…</string>
<string name="storage_overload">OVERLOAD</string>
<string name="gauge_projected">Projected</string>
<string name="gauge_storage">Storage</string>
<string name="gauge_error">Error</string>
<string name="sync_transfer_eta">ETA: %1$s</string>
<string name="cd_share_via_qr">Share via QR</string>
<string name="cd_settings">Settings</string>
<string name="cd_toggle_theme">Toggle Theme</string>
<string name="uptime_label">Uptime:</string>
</resources>