arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-12-22 22:58:29 +00:00
Code Issues Releases Wiki Activity

Sync interval setting: use the same string for current as selector.

Browse Source 
Before this commit the texts were different, and odd.
For example, the text in the selector would be:
Every 4 hours
and the text in the preview would be:
Every 240 minutes
This commit is contained in:
Tom Hacohen 2017-03-01 18:16:16 +00:00
parent 17216ede25
commit cf9ee98ead
19 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.java
View File

@ -116,7 +116,7 @@ public class AccountSettingsActivity extends AppCompatActivity {
if (syncIntervalContacts == AccountSettings.SYNC_INTERVAL_MANUALLY)
prefSyncContacts.setSummary(R.string.settings_sync_summary_manually);
else
prefSyncContacts.setSummary(getString(R.string.settings_sync_summary_periodically, syncIntervalContacts / 60));
prefSyncContacts.setSummary(getString(R.string.settings_sync_summary_periodically, prefSyncContacts.getEntry()));
prefSyncContacts.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@ -136,7 +136,7 @@ public class AccountSettingsActivity extends AppCompatActivity {
if (syncIntervalCalendars == AccountSettings.SYNC_INTERVAL_MANUALLY)
prefSyncCalendars.setSummary(R.string.settings_sync_summary_manually);
else
prefSyncCalendars.setSummary(getString(R.string.settings_sync_summary_periodically, syncIntervalCalendars / 60));
prefSyncCalendars.setSummary(getString(R.string.settings_sync_summary_periodically, prefSyncCalendars.getEntry()));
prefSyncCalendars.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {

2
app/src/main/res/values-cs/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Synchronizace</string>
<string name="settings_sync_interval_contacts">Interval synchronizace kontaktů</string>
<string name="settings_sync_summary_manually">Pouze manuálně</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Každých %d minut a ihned při lokálních změnách</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s a ihned při lokálních změnách</string>
<string name="settings_sync_summary_not_available">Nedostupný</string>
<string name="settings_sync_interval_calendars">Interval synchronizace kalendáře</string>
<string name="settings_sync_interval_tasks">Interval synchronizace úkolů</string>

2
app/src/main/res/values-da/strings.xml
View File

@ -99,7 +99,7 @@
<string name="settings_sync">Synkronisering</string>
<string name="settings_sync_interval_contacts">Synkroniseringsinterval for kontakter</string>
<string name="settings_sync_summary_manually">Kun manuelt</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Hver %d minutter + øjeblikkeligt ved lokale ændringer</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + øjeblikkeligt ved lokale ændringer</string>
<string name="settings_sync_summary_not_available">Ikke tilgængeligt</string>
<string name="settings_sync_interval_calendars">Synkroniseringsinterval for kalender</string>
<string name="settings_sync_interval_tasks">Synkroniseringsinterval for opgaver</string>

2
app/src/main/res/values-de/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Synchronisierung</string>
<string name="settings_sync_interval_contacts">Häufigkeit der Kontakte-Synchronisierung</string>
<string name="settings_sync_summary_manually">Nur manuell</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Alle %d Minuten + sofort bei lokalen Änderungen</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + sofort bei lokalen Änderungen</string>
<string name="settings_sync_summary_not_available">Nicht verfügbar</string>
<string name="settings_sync_interval_calendars">Häufigkeit der Kalender-Synchronisierung</string>
<string name="settings_sync_interval_tasks">Häufigkeit der Aufgaben-Synchronisierung</string>

2
app/src/main/res/values-es/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Sincronización</string>
<string name="settings_sync_interval_contacts">Intervalo de sincronización de contactos</string>
<string name="settings_sync_summary_manually">Solo manualmente</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Cada %d minutos + inmediatamente con cambios locales</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + inmediatamente con cambios locales</string>
<string name="settings_sync_summary_not_available">No disponible</string>
<string name="settings_sync_interval_calendars">Intervalo de sincronización de calendarios</string>
<string name="settings_sync_interval_tasks">Intervalo de sincronizacion de Tasks</string>

2
app/src/main/res/values-fr/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Synchronisation</string>
<string name="settings_sync_interval_contacts">Interval de synchronisation des carnets d\'adresses</string>
<string name="settings_sync_summary_manually">Manuellement</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Toutes les %d minutes et immédiatement après un changement local</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s et immédiatement après un changement local</string>
<string name="settings_sync_summary_not_available">Indisponible</string>
<string name="settings_sync_interval_calendars">Interval de synchronisation des agendas</string>
<string name="settings_sync_interval_tasks">Interval de synchronisation des tâches</string>

2
app/src/main/res/values-hu/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Szinkronizálás</string>
<string name="settings_sync_interval_contacts">Névjegyszinkronizálás sűrűsége</string>
<string name="settings_sync_summary_manually">Manuális</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Minden %d percben + az eszközön történt módosítás után</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + az eszközön történt módosítás után</string>
<string name="settings_sync_summary_not_available">Nem elérhető</string>
<string name="settings_sync_interval_calendars">Naptárszinkronizálás sűrűsége</string>
<string name="settings_sync_interval_tasks">Feladatlisták szinkronizálásának sűrűsége</string>

2
app/src/main/res/values-it/strings.xml
View File

@ -110,7 +110,7 @@
<string name="settings_sync">Sincronizzazione</string>
<string name="settings_sync_interval_contacts">Intervallo sincr. Contatti</string>
<string name="settings_sync_summary_manually">Solo manualmente</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Ogni %d minuti e a seguito di ogni cambiamento locale</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s e a seguito di ogni cambiamento locale</string>
<string name="settings_sync_summary_not_available">Non disponile</string>
<string name="settings_sync_interval_calendars">Intervallo sincr. calendari</string>
<string name="settings_sync_interval_tasks">Intervallo sincr. attività</string>

2
app/src/main/res/values-ja/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">同期</string>
<string name="settings_sync_interval_contacts">連絡先同期間隔</string>
<string name="settings_sync_summary_manually">手動のみ</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%d 分ごと + ローカルの変更時はすぐに</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + ローカルの変更時はすぐに</string>
<string name="settings_sync_summary_not_available">利用不可</string>
<string name="settings_sync_interval_calendars">カレンダー同期間隔</string>
<string name="settings_sync_interval_tasks">タスク同期間隔</string>

2
app/src/main/res/values-nl/strings.xml
View File

@ -106,7 +106,7 @@
<string name="settings_sync">Synchronisatie</string>
<string name="settings_sync_interval_contacts">Contacten verversen</string>
<string name="settings_sync_summary_manually">Alleen handmatig</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Elke %d minuten + meteen na wijziging</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + meteen na wijziging</string>
<string name="settings_sync_summary_not_available">Niet beschikbaar</string>
<string name="settings_sync_interval_calendars">Agenda\'s verversen</string>
<string name="settings_sync_interval_tasks">Taak sync. tussentijd</string>

2
app/src/main/res/values-pl/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Synchronizacja</string>
<string name="settings_sync_interval_contacts">Okres synchronizacji kontktów</string>
<string name="settings_sync_summary_manually">Tylko ręcznie</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Co %d minut oraz natychmiast przy zmianach lokalnych</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s oraz natychmiast przy zmianach lokalnych</string>
<string name="settings_sync_summary_not_available">Niedostępne</string>
<string name="settings_sync_interval_calendars">Okres synchronizacji kalendarzy</string>
<string name="settings_sync_interval_tasks">Okres synchronizacji list zadań</string>

2
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Sincronização</string>
<string name="settings_sync_interval_contacts">Intervalo sinc. de contatos</string>
<string name="settings_sync_summary_manually">Apenas manualmente</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">A cada %d minutos + imediatamente nas alterações locais</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + imediatamente nas alterações locais</string>
<string name="settings_sync_summary_not_available">Indisponível</string>
<string name="settings_sync_interval_calendars">Intervalo sinc. de calendários</string>
<string name="settings_sync_interval_tasks">Intervalo sinc. de tarefas</string>

2
app/src/main/res/values-pt/strings.xml
View File

@ -22,7 +22,7 @@
<string name="settings_sync">Sincronização</string>
<string name="settings_sync_interval_contacts">Intervalo de sincronização dos contatos</string>
<string name="settings_sync_summary_manually">Manualmente apenas</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">A cada %d minutos + imediatamente em alterações locais</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + imediatamente em alterações locais</string>
<string name="settings_sync_summary_not_available">Não avaliado</string>
<string name="settings_sync_interval_calendars">Intervalo de sincronização do calendário</string>
<string-array name="settings_sync_interval_seconds">

2
app/src/main/res/values-ru/strings.xml
View File

@ -23,7 +23,7 @@
<string name="settings_sync">Синхронизация</string>
<string name="settings_sync_interval_contacts">Интервал синхронизации контактов</string>
<string name="settings_sync_summary_manually">Вручную</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Каждые %d минут и немедленно при локальных изменениях</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s и немедленно при локальных изменениях</string>
<string name="settings_sync_summary_not_available">Недоступно</string>
<string name="settings_sync_interval_calendars">Период синхронизации календарей</string>
<string name="settings_sync_interval_tasks">Период синхронизации задач</string>

2
app/src/main/res/values-sr/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">Синхронизација</string>
<string name="settings_sync_interval_contacts">Интервал синх. контаката</string>
<string name="settings_sync_summary_manually">Само ручно</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Сваких %d минута + одмах по локалним изменама</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + одмах по локалним изменама</string>
<string name="settings_sync_summary_not_available">Није доступно</string>
<string name="settings_sync_interval_calendars">Интервал синх. календара</string>
<string name="settings_sync_interval_tasks">Интервал синх. задатака</string>

2
app/src/main/res/values-tr-rTR/strings.xml
View File

@ -98,7 +98,7 @@
<string name="settings_sync">Senkronizasyon</string>
<string name="settings_sync_interval_contacts">Kişiler senk. aralığı</string>
<string name="settings_sync_summary_manually">Sadece elle</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Her %d dakika + yerel değişikliklerde hemen</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s + yerel değişikliklerde hemen</string>
<string name="settings_sync_summary_not_available">Mevcut değil</string>
<string name="settings_sync_interval_calendars">Takvimler senk. aralığı</string>
<string name="settings_sync_interval_tasks">İşler senk. aralığı</string>

2
app/src/main/res/values-uk/strings.xml
View File

@ -22,7 +22,7 @@
<string name="settings_sync">Синхронізація</string>
<string name="settings_sync_interval_contacts">Інтервал синхронізації контактів</string>
<string name="settings_sync_summary_manually">Лише вручну</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Кожних %d хвилин, а також негайно при внесенні локальних змін</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s, а також негайно при внесенні локальних змін</string>
<string name="settings_sync_summary_not_available">Не доступно</string>
<string name="settings_sync_interval_calendars">Інтервал синхронізації календарів</string>
<string name="settings_sync_interval_tasks">Інтервал синхронізації завдань</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -115,7 +115,7 @@
<string name="settings_sync">同步</string>
<string name="settings_sync_interval_contacts">通讯录自动同步间隔</string>
<string name="settings_sync_summary_manually">手动同步</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">每 %d 分钟或本地修改后</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s 钟或本地修改后</string>
<string name="settings_sync_summary_not_available">不可用</string>
<string name="settings_sync_interval_calendars">日历自动同步间隔</string>
<string name="settings_sync_interval_tasks">任务自动同步间隔</string>

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

@ -176,7 +176,7 @@
<string name="settings_sync">Synchronization</string>
<string name="settings_sync_interval_contacts">Contacts sync. interval</string>
<string name="settings_sync_summary_manually">Only manually</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">Every %d minutes + immediately on local changes</string>
<string name="settings_sync_summary_periodically" tools:ignore="PluralsCandidate">%s and immediately on local changes</string>
<string name="settings_sync_summary_not_available">Not available</string>
<string name="settings_sync_interval_calendars">Calendars sync. interval</string>
<string name="settings_sync_interval_tasks">Tasks sync. interval</string>