From 90c413f8fbe1a8e2132f21eb44ef94b15c978174 Mon Sep 17 00:00:00 2001
From: Pk11 <epicpkmn11@outlook.com>
Date: Tue, 9 Aug 2022 19:53:50 -0500
Subject: [PATCH] Fix clock using 12-hour and covering last character of the
 path (#189)

* Fix clock using 12-hour and covering last of path

* Simplify RetTime()
---
 arm9/source/date.cpp                      | 9 +--------
 arm9/source/file_browse.cpp               | 6 ++++--
 arm9/source/language.inl                  | 2 +-
 nitrofiles/languages/de-DE/language.ini   | 2 +-
 nitrofiles/languages/en-US/language.ini   | 2 +-
 nitrofiles/languages/es-ES/language.ini   | 2 +-
 nitrofiles/languages/fr-FR/language.ini   | 2 +-
 nitrofiles/languages/he-IL/language.ini   | 2 +-
 nitrofiles/languages/hu-HU/language.ini   | 2 +-
 nitrofiles/languages/it-IT/language.ini   | 2 +-
 nitrofiles/languages/ja-JP/language.ini   | 2 +-
 nitrofiles/languages/ja-KANA/language.ini | 2 +-
 nitrofiles/languages/nl-NL/language.ini   | 2 +-
 nitrofiles/languages/ro-RO/language.ini   | 2 +-
 nitrofiles/languages/ru-RU/language.ini   | 2 +-
 nitrofiles/languages/tr-TR/language.ini   | 2 +-
 nitrofiles/languages/uk-UA/language.ini   | 2 +-
 nitrofiles/languages/zh-CN/language.ini   | 2 +-
 18 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/arm9/source/date.cpp b/arm9/source/date.cpp
index b999778..cb58238 100644
--- a/arm9/source/date.cpp
+++ b/arm9/source/date.cpp
@@ -12,14 +12,7 @@
  */
 std::string RetTime()
 {
-	time_t raw;
-	time(&raw);
-	const struct tm *Time = localtime(&raw);
-
-	char tmp[8];
-	strftime(tmp, sizeof(tmp), STR_TIME_FORMAT.c_str(), Time);
-
-	return tmp;
+	return RetTime(STR_TIME_FORMAT.c_str());
 }
 
 /**
diff --git a/arm9/source/file_browse.cpp b/arm9/source/file_browse.cpp
index df936ee..7827a6b 100644
--- a/arm9/source/file_browse.cpp
+++ b/arm9/source/file_browse.cpp
@@ -123,14 +123,16 @@ void showDirectoryContents(std::vector<DirEntry> &dirContents, int fileOffset, i
 	// Top bar
 	font->printf(firstCol, 0, true, alignStart, Palette::blackGreen, "%*c", 256 / font->width(), ' ');
 
+	std::string time = RetTime();
+
 	// Print the path
 	if(font->calcWidth(path) > SCREEN_COLS - 6)
-		font->print(rtl ? -1 : -6, 0, true, path, Alignment::right, Palette::blackGreen, true);
+		font->print(rtl ? -1 : (-1 - time.size()), 0, true, path, Alignment::right, Palette::blackGreen, true);
 	else
 		font->print(firstCol, 0, true, path, alignStart, Palette::blackGreen);
 
 	// Print time
-	font->print(lastCol, 0, true, RetTime(), alignEnd, Palette::blackGreen);
+	font->print(lastCol, 0, true, time, alignEnd, Palette::blackGreen);
 
 	// Print directory listing
 	for (int i = 0; i < ((int)dirContents.size() - startRow) && i < ENTRIES_PER_SCREEN; i++) {
diff --git a/arm9/source/language.inl b/arm9/source/language.inl
index e1a0e40..e1e9a30 100644
--- a/arm9/source/language.inl
+++ b/arm9/source/language.inl
@@ -3,7 +3,7 @@ STRING(NO_DRIVES_FOUND, "No drives found!")
 STRING(UNTITLED, "UNTITLED")
 STRING(ROOT, "[root]")
 STRING(DIR, "(dir)")
-STRING(TIME_FORMAT, " %I:%M")
+STRING(TIME_FORMAT, " %H:%M")
 STRING(LOADING, "Loading...")
 STRING(CREATING_DIRECTORY, "Creating directory...")
 STRING(ENTERING_DIRECTORY, "Entering directory...")
diff --git a/nitrofiles/languages/de-DE/language.ini b/nitrofiles/languages/de-DE/language.ini
index 7b4e422..ed23bab 100644
--- a/nitrofiles/languages/de-DE/language.ini
+++ b/nitrofiles/languages/de-DE/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Keine Laufwerke gefunden!
 UNTITLED=UNBENANNT
 ROOT=[root]
 DIR=(dir)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Lädt...
 CREATING_DIRECTORY=Verzeichnis wird erstellt...
 ENTERING_DIRECTORY=Verzeichnis wird betreten...
diff --git a/nitrofiles/languages/en-US/language.ini b/nitrofiles/languages/en-US/language.ini
index 1d6692e..cd9aff3 100644
--- a/nitrofiles/languages/en-US/language.ini
+++ b/nitrofiles/languages/en-US/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=No drives found!
 UNTITLED=UNTITLED
 ROOT=[root]
 DIR=(dir)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Loading...
 CREATING_DIRECTORY=Creating directory...
 ENTERING_DIRECTORY=Entering directory...
diff --git a/nitrofiles/languages/es-ES/language.ini b/nitrofiles/languages/es-ES/language.ini
index d9a5ecd..4b5769c 100644
--- a/nitrofiles/languages/es-ES/language.ini
+++ b/nitrofiles/languages/es-ES/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=¡No se encontraron unidades!
 UNTITLED=SIN TÍTULO
 ROOT=[raíz]
 DIR=(dir)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Cargando...
 CREATING_DIRECTORY=Creando directorio...
 ENTERING_DIRECTORY=Ingresando al directorio...
diff --git a/nitrofiles/languages/fr-FR/language.ini b/nitrofiles/languages/fr-FR/language.ini
index 70f3677..8b3de4e 100644
--- a/nitrofiles/languages/fr-FR/language.ini
+++ b/nitrofiles/languages/fr-FR/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Aucun lecteur trouvé !
 UNTITLED=SANS TITRE
 ROOT=[racine]
 DIR=(dos)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Chargement…
 CREATING_DIRECTORY=Création du dossier…
 ENTERING_DIRECTORY=Entrée dans dossier…
diff --git a/nitrofiles/languages/he-IL/language.ini b/nitrofiles/languages/he-IL/language.ini
index df4ca2e..d0a0d04 100644
--- a/nitrofiles/languages/he-IL/language.ini
+++ b/nitrofiles/languages/he-IL/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=לא נמצאו כוננים!
 UNTITLED=UNTITLED
 ROOT=[root]
 DIR=(ספריה)
-TIME_FORMAT=%I:%M 
+TIME_FORMAT=%H:%M 
 LOADING=טוען...
 CREATING_DIRECTORY=יוצר ספריה...
 ENTERING_DIRECTORY=נכנס לספריה...
diff --git a/nitrofiles/languages/hu-HU/language.ini b/nitrofiles/languages/hu-HU/language.ini
index 7de8082..9c48316 100644
--- a/nitrofiles/languages/hu-HU/language.ini
+++ b/nitrofiles/languages/hu-HU/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Nem található meghajtó!
 UNTITLED=NÉVTELEN
 ROOT=[gyökér]
 DIR=(mappa)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Töltés...
 CREATING_DIRECTORY=Könyvtár létrehozása...
 ENTERING_DIRECTORY=Könyvtárba lépés...
diff --git a/nitrofiles/languages/it-IT/language.ini b/nitrofiles/languages/it-IT/language.ini
index 45a6df3..4af1273 100644
--- a/nitrofiles/languages/it-IT/language.ini
+++ b/nitrofiles/languages/it-IT/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Nessuna unità trovata!
 UNTITLED=SENZA TITOLO
 ROOT=[root]
 DIR=(cart)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Caricamento in corso...
 CREATING_DIRECTORY=Creazione cartella...
 ENTERING_DIRECTORY=Ingresso nella cartella...
diff --git a/nitrofiles/languages/ja-JP/language.ini b/nitrofiles/languages/ja-JP/language.ini
index b3b8ac7..3be9596 100644
--- a/nitrofiles/languages/ja-JP/language.ini
+++ b/nitrofiles/languages/ja-JP/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=ドライブが見つかりません!
 UNTITLED=無題
 ROOT=[ルート]
 DIR=(dir)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=ロード中…
 CREATING_DIRECTORY=ディレクトリを作成中…
 ENTERING_DIRECTORY=ディレクトリに入る
diff --git a/nitrofiles/languages/ja-KANA/language.ini b/nitrofiles/languages/ja-KANA/language.ini
index e13ec74..c7a0599 100644
--- a/nitrofiles/languages/ja-KANA/language.ini
+++ b/nitrofiles/languages/ja-KANA/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=ドライブが みつかりません！
 UNTITLED=むだい
 ROOT=[ルート]
 DIR=(dir)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=ロード ちゅう…
 CREATING_DIRECTORY=ディレクトリを さくせい ちゅう…
 ENTERING_DIRECTORY=ディレクトリに はいる
diff --git a/nitrofiles/languages/nl-NL/language.ini b/nitrofiles/languages/nl-NL/language.ini
index d617c5d..8021a45 100644
--- a/nitrofiles/languages/nl-NL/language.ini
+++ b/nitrofiles/languages/nl-NL/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Geen schijven gevonden!
 UNTITLED=Naamloos
 ROOT=[root]
 DIR=(map)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Laden...
 CREATING_DIRECTORY=Map aanmaken...
 ENTERING_DIRECTORY=Map ingaan...
diff --git a/nitrofiles/languages/ro-RO/language.ini b/nitrofiles/languages/ro-RO/language.ini
index 34fd75b..42d4d74 100644
--- a/nitrofiles/languages/ro-RO/language.ini
+++ b/nitrofiles/languages/ro-RO/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Nu s-au găsit unități!
 UNTITLED=FĂRĂ TITLU
 ROOT=[rădăcină]
 DIR=(dosar)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Se încarcă...
 CREATING_DIRECTORY=Se crează dosar...
 ENTERING_DIRECTORY=Se intră în dosar...
diff --git a/nitrofiles/languages/ru-RU/language.ini b/nitrofiles/languages/ru-RU/language.ini
index dc09857..a10ecab 100644
--- a/nitrofiles/languages/ru-RU/language.ini
+++ b/nitrofiles/languages/ru-RU/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Диски не найдены!
 UNTITLED=БЕЗ НАЗВАНИЯ
 ROOT=[root]
 DIR=(папка)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Загрузка...
 CREATING_DIRECTORY=Создание папки...
 ENTERING_DIRECTORY=Вход в папку...
diff --git a/nitrofiles/languages/tr-TR/language.ini b/nitrofiles/languages/tr-TR/language.ini
index d38b98b..0dec64e 100644
--- a/nitrofiles/languages/tr-TR/language.ini
+++ b/nitrofiles/languages/tr-TR/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Sürücü bulunamadı!
 UNTITLED=BAŞLIKSIZ
 ROOT=[kök]
 DIR=(dizin)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Yükleniyor...
 CREATING_DIRECTORY=Dizin oluşturuluyor...
 ENTERING_DIRECTORY=Dizine giriliyor...
diff --git a/nitrofiles/languages/uk-UA/language.ini b/nitrofiles/languages/uk-UA/language.ini
index 31914fd..3df700e 100644
--- a/nitrofiles/languages/uk-UA/language.ini
+++ b/nitrofiles/languages/uk-UA/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=Не вдалося знайти диски!
 UNTITLED=НЕ НАЗВАНО
 ROOT=[корінь]
 DIR=(папка)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=Завантаження...
 CREATING_DIRECTORY=Створення папки...
 ENTERING_DIRECTORY=Вхід у папку...
diff --git a/nitrofiles/languages/zh-CN/language.ini b/nitrofiles/languages/zh-CN/language.ini
index 0dd86c7..3d0ca39 100644
--- a/nitrofiles/languages/zh-CN/language.ini
+++ b/nitrofiles/languages/zh-CN/language.ini
@@ -6,7 +6,7 @@ NO_DRIVES_FOUND=没有找到存储设备！
 UNTITLED=无标题
 ROOT=[根目录]
 DIR=(目录)
-TIME_FORMAT= %I:%M
+TIME_FORMAT= %H:%M
 LOADING=正在加载...
 CREATING_DIRECTORY=正在创建目录...
 ENTERING_DIRECTORY=正在进入目录...