From 8db71b9d5685b73fec4bfabecee5c3e6e755eda8 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sat, 5 Oct 2019 13:06:51 +0900
Subject: [PATCH] update trend_tag_desc string resource

---
 app/src/main/java/jp/juggler/subwaytooter/Column.kt     | 7 -------
 app/src/main/java/jp/juggler/subwaytooter/ColumnType.kt | 5 +----
 app/src/main/res/values-fr/strings.xml                  | 2 +-
 app/src/main/res/values-ja/strings.xml                  | 2 +-
 app/src/main/res/values-ko/strings.xml                  | 2 +-
 app/src/main/res/values-nb-rNO/strings.xml              | 2 +-
 app/src/main/res/values/strings.xml                     | 2 +-
 7 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index b710cd6d..6b4c3f49 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -243,13 +243,6 @@ class Column(
 		
 		val COLUMN_REGEX_FILTER_DEFAULT : (CharSequence?) -> Boolean = { false }
 		
-		private val time_format_hhmm = SimpleDateFormat("HH:mm", Locale.JAPAN)
-		
-		internal fun getResetTimeString() : String {
-			time_format_hhmm.timeZone = TimeZone.getDefault()
-			return time_format_hhmm.format(Date(0L))
-		}
-		
 		fun onFiltersChanged(context : Context, access_info : SavedAccount) {
 			
 			TootTaskRunner(context, progress_style = TootTaskRunner.PROGRESS_NONE).run(access_info,
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnType.kt b/app/src/main/java/jp/juggler/subwaytooter/ColumnType.kt
index 60f0f9a4..cf04aba2 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ColumnType.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnType.kt
@@ -1277,10 +1277,7 @@ enum class ColumnType(
 			this.list_tmp = addAll(this.list_tmp, src)
 			this.list_tmp = addOne(
 				this.list_tmp, TootMessageHolder(
-					context.getString(
-						R.string.trend_tag_desc,
-						Column.getResetTimeString()
-					),
+					context.getString(R.string.trend_tag_desc),
 					gravity = Gravity.END
 				)
 			)
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4207c7b9..79c9d65d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -666,7 +666,7 @@
     <string name="follow_follower_list_may_restrict">Si l’utilisateur·rice distant·e choisit de masquer le graph social, seul·e·s les abonné·e·s/abonnements sur cette instance seront affichés.</string>
     <string name="trend_tag">Les tendances des tags</string>
     <string name="people_talking">%1$d (%2$d) personnes en parlent</string>
-    <string name="trend_tag_desc">The numbers indicate \'daily(weekly)\'. Daily numbers are reset at %1$s.</string>
+    <string name="trend_tag_desc">The numbers indicate \'daily(weekly)\'.</string>
     <string name="redraft_and_delete">Supprimer et reformuler</string>
     <string name="cant_sync_toot">Impossible de synchroniser le pouet.</string>
     <string name="cant_change_account_when_redraft">Impossible de changer de compte lors de la reformulation.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 686d5f07..c898ffd6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -709,7 +709,7 @@
     <string name="toot_search_ts_of">トゥート検索(ts) \"%1$s\"</string>
     <string name="tootsearch">tootsearch</string>
     <string name="trend_tag">トレンドタグ</string>
-    <string name="trend_tag_desc">数字は「日毎（週毎）」を示します。 日毎の数字は%1$sにリセットされます。</string>
+    <string name="trend_tag_desc">数字は「日毎（週毎）」を示します。</string>
     <string name="ui_theme">UIテーマ(アプリ再起動が必要)</string>
     <string name="unblock">ブロック解除</string>
     <string name="unblock_succeeded">ブロック解除できました</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a65b5bc1..790968fc 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -680,7 +680,7 @@
     <string name="follow_follower_list_may_restrict">타 서버 사용자가 소셜 그래프를 숨기기를 선택하면 이 서버의 팔로우/팔로워만 표시될 것입니다.</string>
     <string name="trend_tag">경향 태그들</string>
     <string name="people_talking">%1$d(%2$d) 명의 사람들이 얘기 중</string>
-    <string name="trend_tag_desc">숫자들은 \'일간(주간)\'을 나타냅니다. 일간 숫자는 %1$s에 초기화됩니다.</string>
+    <string name="trend_tag_desc">숫자들은 \'일간(주간)\'을 나타냅니다.</string>
     <string name="redraft_and_delete">삭제하고 다시 편집</string>
     <string name="cant_sync_toot">툿을 동기화할 수 없음.</string>
     <string name="cant_change_account_when_redraft">재편집 중에는 계정을 변경할 수 없음.</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 0f163682..7cb0abf0 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -688,7 +688,7 @@
     <string name="token_exported">Som følge av eksport av programdata eller gjenoppretting fra sikkerhetskopi, brukes dette tilgangssymbolet også av andre enheter. Fordi tilgangssymboler som ikke brukes av andre enheter kreves for å bruke push-merknader, anbefales oppdatering av tilgangssymbolet.</string>
     <string name="missing_push_api">Instansen har inget API for push-merknader.</string>
     <string name="follow_follower_list_may_restrict">Hvis en bruker annensteds hen velger å skjule den sosiale grafen, vil kun følgende/følgere på denne instansen vises.</string>
-    <string name="trend_tag_desc">Nummer indikerer \'daglig(ukentlig)\'. Daglige nummer tilbakestilles %1$s.</string>
+    <string name="trend_tag_desc">Nummer indikerer \'daglig(ukentlig)\'.</string>
     <string name="post_button_tapped_repeatly">Postingsknapp ble trykket gjentatte ganger</string>
     <string name="regex_filter_matches_empty_string">Filtersøk med regulært uttrykk samsvarer med tom streng.</string>
     <string name="filter_irreversible_long">Kan ikke angres. Dropp istedenfor å skjule. Filtrerte tutinger vil fjernes for godt, som om filteret fjernes senere.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d72af48..a48229b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -677,7 +677,7 @@
     <string name="follow_follower_list_may_restrict">If the remote user choose to hide the social graph, only the followings/followers on this server will be displayed.</string>
     <string name="trend_tag">Trending tags</string>
     <string name="people_talking">%1$d(%2$d) people talking</string>
-    <string name="trend_tag_desc">The numbers indicate \'daily(weekly)\'. Daily numbers are reset at %1$s.</string>
+    <string name="trend_tag_desc">The numbers indicate \'daily(weekly)\'.</string>
     <string name="redraft_and_delete">Redraft and delete</string>
     <string name="cant_sync_toot">Can\'t synchronize toot.</string>
     <string name="cant_change_account_when_redraft">Can\'t change account while using redraft.</string>