From 666188f538a8f7e0f1a71a30cc5c07daa0f2f240 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Sun, 3 Oct 2010 04:15:16 +0100 Subject: Use DateUtils.getRelativeTimeSpanString Closes #2 --- res/values/strings.xml | 6 ------ src/org/connectbot/HostListActivity.java | 16 +++------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 49c3af4..5f2d78a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -321,12 +321,6 @@ "Never connected" - - "%1$s minutes ago" - - "%1$s hours ago" - - "%1$s days ago" "Copied %1$d bytes to clipboard" diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index de2b5f1..265dd08 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -45,6 +45,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.preference.PreferenceManager; +import android.text.format.DateUtils; import android.util.Log; import android.view.ContextMenu; import android.view.KeyEvent; @@ -558,20 +559,9 @@ public class HostListActivity extends ListActivity { holder.caption.setTextAppearance(context, android.R.attr.textAppearanceSmall); } - long now = System.currentTimeMillis() / 1000; - - String nice = context.getString(R.string.bind_never); + CharSequence nice = context.getString(R.string.bind_never); if (host.getLastConnect() > 0) { - int minutes = (int)((now - host.getLastConnect()) / 60); - if (minutes >= 60) { - int hours = (minutes / 60); - if (hours >= 24) { - int days = (hours / 24); - nice = context.getString(R.string.bind_days, days); - } else - nice = context.getString(R.string.bind_hours, hours); - } else - nice = context.getString(R.string.bind_minutes, minutes); + nice = DateUtils.getRelativeTimeSpanString(host.getLastConnect() * 1000); } holder.caption.setText(nice); -- cgit v1.2.3 From 5ac8a6140a9dc7634cc5e01b89cc6e84bbea6ed5 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 14 Apr 2015 17:32:03 -0700 Subject: Update translations Remove unused bind_{minutes,seconds,days} from other languages. --- res/values-ca/strings.xml | 3 --- res/values-cs/strings.xml | 3 --- res/values-da/strings.xml | 3 --- res/values-de/strings.xml | 3 --- res/values-es/strings.xml | 3 --- res/values-eu/strings.xml | 3 --- res/values-fi/strings.xml | 3 --- res/values-fr/strings.xml | 3 --- res/values-gl/strings.xml | 3 --- res/values-he/strings.xml | 3 --- res/values-hu/strings.xml | 3 --- res/values-id/strings.xml | 3 --- res/values-is/strings.xml | 3 --- res/values-it/strings.xml | 3 --- res/values-ja/strings.xml | 3 --- res/values-ko/strings.xml | 3 --- res/values-nb/strings.xml | 3 --- res/values-nl/strings.xml | 3 --- res/values-pl/strings.xml | 3 --- res/values-pt-rBR/strings.xml | 3 --- res/values-pt/strings.xml | 3 --- res/values-ru/strings.xml | 3 --- res/values-sk/strings.xml | 3 --- res/values-sl/strings.xml | 3 --- res/values-sr/strings.xml | 3 --- res/values-sv/strings.xml | 3 --- res/values-tr/strings.xml | 3 --- res/values-zh-rCN/strings.xml | 3 --- res/values-zh-rTW/strings.xml | 3 --- 29 files changed, 87 deletions(-) diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index f7233e9..7b3baa4 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -126,9 +126,6 @@ Servidor Port Mai connectat - Fa %1$s minuts - Fa %1$s hores - Fa %1$s dies Copiats %1$d bytes al porta-retalls Toca i arrosega\no fes servir les tecles de direcció\nper escollir l\'àrea a copiar Tanca diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 6bc0b87..e210502 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -122,9 +122,6 @@ Nastavení připojení Uživatelské jméno Nikdy nepřipojen - Před %1$s minutami - Před %1$s hodinami - Před %1$s dny Zkopírováno %1$d bajtů do schránky Stiskněte a táhněte\nnebo použijte směrový ovladač\npro výběr oblasti ke zkopírování Zavřít diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 5e72bcb..d66550a 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -124,9 +124,6 @@ Vært Port Aldrig forbundet - %1$s minutter siden - %1$s timer siden - %1$s dage siden Kopier %1$d byte til udklipsholder Berør og flyt\neller brug piletasterne\nfor at vælge område at kopiere Luk diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index a9422d7..eadad3b 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -126,9 +126,6 @@ Host Port Nie verbunden - vor %1$s Minuten - vor %1$s Stunden - vor %1$s Tagen %1$d Byte in die Zwischenablage kopiert Berühren und ziehen\noder Trackball verwenden\num zu kopierenden Bereich auszuwählen Schließen diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 87bb50f..d8066a1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -124,9 +124,6 @@ Host (equipo anfitrión) Puerto Nunca fué conectado - Hace %1$s minutos - Hace %1$s horas - Hace %1$s días %1$d bytes copiados al portapaleles Toque y arrastre\no use la almohadilla direccional\npara seleccionar la zona a copiar Cerrar diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 6cf248b..0a5ab9b 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -124,9 +124,6 @@ Ostalaria Ataka Inoiz ez da konexiorik ezarri - Duela %1$s minutu - Duela %1$s ordu - Duela %1$s egun %1$d byte kopiatuta arbelera Ukitu eta arrastatu\nedo erabili norabide kuxina\nkopiatu beharreko eremua hautatzeko Itxi diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 1e35e66..39d2e66 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -123,9 +123,6 @@ Palvelin Portti Ei koskaan yhdistetty - %1$s minuuttia sitten - %1$s tuntia sitten - %1$s päivää sitten %1$d tavua kopioitu leikepöydälle Maalaa koskettamalla\ntai käytä nuolinäppäimiä\nvalitaksesi kopioitavan alueen Sulje diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 05a4049..efc4f96 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -134,9 +134,6 @@ Serveur Port Jamais connecté - Il y a %1$s minutes - Il y a %1$s heures - Il y a %1$s jours %1$d octets copiés dans le presse-papier Touchez et tirez, ou utilisez\nles touches directionnelles\npour sélectionner la région\nà copier Fermer diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index c88fe6b..75b4769 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -101,9 +101,6 @@ Máquina Porto Nunca conectado - Hai %1$s minutos - Hai %1$s horas - Hai %1$s días Copiados %1$d bytes ao portapapeis Tocar e arrastrar\nou usar o cursor direccional\npara seleccionar a área a copiar Pechar diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 9e55f47..429146e 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -125,9 +125,6 @@ מארח פתחה לא חובר מעולם - לפני %1$s דקות - לפני %1$s שעות - לפני %1$s ימים הועתקו %1$d בתים ללוח הגזירים יש לגעת ולגרור\nאו להשתמש בלוח כיוונים\nכדי לבחור אזור להעתקה סגירה diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 5a41a02..66c9947 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -124,9 +124,6 @@ Kiszolgáló Port Még nem csatlakozott - %1$s perce - %1$s órája - %1$s napja %1$d bájt a vágólapra másolva Érintéssel és húzással\nvagy a hanyattegér használatával\njelölje ki a másolandó területet. Bezárás diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index 4e98a79..4a9407d 100644 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -124,9 +124,6 @@ Host Port Tidak pernah terhubung - %1$s menit yang lalu - %1$s jam yang lalu - %1$s hari yang lalu Tersalin %1$d byte ke papan-klip Sentuh dan tarik\natau gunakan tombol panah\nuntuk memilih area yang akan disalin Tutup diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index a5fc71f..4558633 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -110,9 +110,6 @@ Þjónn Port Aldrei tengt - Fyrir %1$s mínútum síðan - Fyrir %1$s tímum síðan - Fyrir %1$s dögum síðan Afritaði %1$d bæti Loka Afrita diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 0b4e29b..22a4715 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -126,9 +126,6 @@ Host Porta Mai connesso - %1$s minuti fa - %1$s ore fa - %1$s giorni fa %1$d byte copiati Tocca e trascina\noppure usa il pad direzionale\nper selezionare un\'area da copiare Chiudi diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index ea357f8..f4f06dd 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -139,9 +139,6 @@ ホスト ポート 未接続 - %1$s 分前 - %1$s 時間前 - %1$s 日前 クリップボードに %1$d バイトコピーしました． タッチしてドラッグ\nまたは方向パッドで\nコピー領域を選択 切断 diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 83313ef..ae84a1a 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -117,9 +117,6 @@ 호스트 포트 연결된 적 없음 - %1$s 분 전 - %1$s 시간 전 - %1$s 일 전 클립 보드에 %1$d 바이트가 복사되었습니다. 터치 후 드래그 또는\n방향 키로\n복사 영역을 선택 닫기 diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 81025dc..f29fca6 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -124,9 +124,6 @@ Vert Port Aldri tilkoblet - %1$s minutt siden - %1$s timer siden - %1$s dager siden Kopierte %1$d bytes til utklippstavle Trykk og dra, eller\nbruk styrekule for å\nvelge område å\nkopiere fra Lukk diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 7d3af43..ac9125b 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -124,9 +124,6 @@ Host Poort Nooit verbonden - %1$s minuten geleden - %1$s uren geleden - %1$s dagen geleden %1$d bytes gekopieerd naar het klembord Tik en sleep\nof gebruik directioneel pad\nom velden te selecteren omte kopiëren Sluit diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 7f320b0..f370ad5 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -126,9 +126,6 @@ Host Port Nigdy nie połączono - %1$s minut temu - %1$s godzin temu - %1$s dni temu Skopiowano %1$d bajtów do schowka Dotknij i przeciągnij\nlub użyj trackball\'a\naby zaznaczyć obszar do skopiowania Zamknij diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 79f5620..de8ed75 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -126,9 +126,6 @@ Anfitrião (host) Porta Nunca usado - %1$s minutos atrás - %1$s horas atrás - %1$s dias atrás %1$d bytes copiados para a área de tranferência Toque e arraste\nou use o trackball\npara selecionar uma área para copiar Fechar diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 4aeb1a2..0f372c9 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -124,9 +124,6 @@ Anfitrião Porto Nunca ligado - %1$s minutos atrás - %1$s horas atrás - %1$s dias atrás Copiados %1$d bytes para a área de transferência Toque e arraste\nou use as teclas direcionais\npara selecionar a área a copiar Fechar diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 61e19c3..e759607 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -127,9 +127,6 @@ Узел Порт Не подключен - %1$s минут назад - %1$s час(ов) назад - %1$s дней назад Скопировано %1$d байт в буфер обмена Для выделения области на экране используйте Touch and Drag или Directional Pad Закрыть diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index aa5e226..7b91870 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -124,9 +124,6 @@ Hostiteľ Port Nikdy nepripojený - Pred %1$s minútami - Pred %1$s hodinami - Pred %1$s dňami %1$d bajtov skopírovaných do schránky Pre výber kopírovanej oblasti \nsa dotknite a ťahajte\nalebo použite smerové tlačidlo Zatvoriť diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 8552716..107cfcd 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -118,9 +118,6 @@ Gostitelj Vrata Nikoli povezani - %1$s minut nazaj - %1$s ur nazaj - %1$s dni nazaj Zapri Kopiraj Prilepi diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 6435472..d499a5d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -139,9 +139,6 @@ Домаћин Порт Никад повезиван - пре %1$s минут(а) - пре %1$s сата(и) - пре %1$s дан(а) Копирано %1$d бајта на клипборд Додирните и превуците\nили користите дирекциони контролер\nда изаберете површину за копирање Затвори diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 73e73da..063d586 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -124,9 +124,6 @@ Värd Port Aldrig ansluten - %1$s minuter sedan - %1$s timmar sedan - %1$s dagar sedan Kopierade %1$d bytes till urklippshanteraren. Tryck och drag\neller använd bollen\nför att markera en yta för kopiering Stäng diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 6e1527b..22e2f48 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -126,9 +126,6 @@ Sunucu Port Daha önce bağlanılmadı - %1$s dakika önce - %1$s saat önce - %1$s gün önce %1$d byte panoya kopyalandı Kopyalanacak alanı seçmek için dokun ve sürükle ya da pad kullan Kapat diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 61fc9f5..4420982 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -132,9 +132,6 @@ 主机 端口 尚未连接 - 已连接 %1$s 分钟 - 已连接 %1$s 小时 - 已连接 %1$s 天 已复制%1$d位 点击拖动\n或使用触摸板\n来选择要复制的区域 关闭 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index bbfd6f0..59d0e6e 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -135,9 +135,6 @@ 主機 連接埠 從未連線 - %1$s 分鐘前連線 - %1$s 小時前連線 - %1$s 天前連線 複製 %1$d 位元組到剪貼簿 滑動手指\n或使用軌跡球\n選擇要複製的區域 關閉 -- cgit v1.2.3