From 5ac9b28e0ce0713d951bc437e107fbff4a656937 Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Mon, 20 May 2024 00:24:41 +0200
Subject: [PATCH] some more final touches to i18n

Signed-off-by: Banana <mail@bananas-playground.net>
---
 CHANGELOG                                                   | 2 +-
 VERSION                                                     | 2 +-
 webclient/i18n/deu.ini                                      | 3 ++-
 webclient/i18n/eng.ini                                      | 1 +
 webclient/view/98/collections/collections.html              | 2 +-
 .../98/managecollectionfields/managecollectionfields.html   | 4 ++--
 webclient/view/98/managecolletions/managecolletions.html    | 6 +++---
 webclient/view/98/managetags/managetags.html                | 2 +-
 webclient/view/98/sysinfo/sysinfo.html                      | 2 +-
 webclient/view/98/system/menu.php                           | 2 +-
 webclient/view/98/system/message.php                        | 2 +-
 webclient/view/98/tags/tags.html                            | 2 +-
 webclient/view/compact/collections/collections.html         | 2 +-
 webclient/view/compact/managetags/managetags.html           | 2 +-
 webclient/view/compact/tags/tags.html                       | 2 +-
 webclient/view/default/collections/collections.html         | 2 +-
 .../managecollectionfields/managecollectionfields.html      | 4 ++--
 .../view/default/managecolletions/managecolletions.html     | 6 +++---
 webclient/view/default/managetags/managetags.html           | 2 +-
 webclient/view/default/sysinfo/sysinfo.html                 | 2 +-
 webclient/view/default/tags/tags.html                       | 2 +-
 21 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 710f80b..1301a2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.x - The Ceremonial Chambers
+1.7 - The Ceremonial Chambers yyyy-mm-dd
     * Added i18n. Please read the upgrade file for more information. English and german are available
     * Added group infos to profile view.
     * Added compact theme. Based on default, but with less space.
diff --git a/VERSION b/VERSION
index 8583d01..504030c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.x - The Ceremonial Chambers
+1.7 - The Ceremonial Chambers
diff --git a/webclient/i18n/deu.ini b/webclient/i18n/deu.ini
index 5aec1bd..04a7e0a 100644
--- a/webclient/i18n/deu.ini
+++ b/webclient/i18n/deu.ini
@@ -66,6 +66,7 @@ global.title = "Titel"
 global.user = "Benutzer"
 global.username = "Benutzername"
 global.view = "Anzeigen"
+global.writeenter = "Eingeben und mit Enter hinzufügen"
 
 advsearch.explain.fields = "Verfügbare Felder in <b>%s</b> sind:"
 advsearch.headline.syntax = "Syntax"
@@ -203,7 +204,7 @@ menu.manage = "Verwalten"
 menu.manage.add = reuse.global.add
 menu.manage.collections = reuse.global.collections
 menu.manage.groups = "Gruppen"
-menu.manage.profile = "Profile"
+menu.manage.profile = "Profil"
 menu.manage.tags = reuse.global.tags
 menu.manage.users = "Benutzer"
 menu.search = reuse.global.search
diff --git a/webclient/i18n/eng.ini b/webclient/i18n/eng.ini
index 6d143ed..4b6d674 100644
--- a/webclient/i18n/eng.ini
+++ b/webclient/i18n/eng.ini
@@ -66,6 +66,7 @@ global.title = "Title"
 global.user = "User"
 global.username = "Username"
 global.view = "View"
+global.writeenter = "Input and press enter to add"
 
 advsearch.explain.fields = "Available fields in <b>%s</b> are:"
 advsearch.headline.syntax = "Syntax"
diff --git a/webclient/view/98/collections/collections.html b/webclient/view/98/collections/collections.html
index b7b9acb..e655957 100644
--- a/webclient/view/98/collections/collections.html
+++ b/webclient/view/98/collections/collections.html
@@ -19,7 +19,7 @@
 				if(!empty($TemplateData['simpleSearchFields'])) {
 					foreach($TemplateData['simpleSearchFields'] as $k=>$v) {
 			?>
-			<option value="<?php echo $k; ?>" <?php if(isset($v['selected'])) echo 'selected' ?> ><?php echo $v['displayname']; ?></option>
+			<option value="<?php echo $k; ?>" <?php if(isset($v['selected'])) echo 'selected' ?> ><?php echo $I18n->t($v['displayname']); ?></option>
 			<?php
 					}
 				}
diff --git a/webclient/view/98/managecollectionfields/managecollectionfields.html b/webclient/view/98/managecollectionfields/managecollectionfields.html
index 78c41bb..4dcd93a 100644
--- a/webclient/view/98/managecollectionfields/managecollectionfields.html
+++ b/webclient/view/98/managecollectionfields/managecollectionfields.html
@@ -12,7 +12,7 @@
 			<div id="collectionFields">
 				<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
 				<div class="sortitem" data-field-id="<?php echo $k; ?>">
-					<?php echo $v['displayname']; ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
+					<?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
 				</div>
 				<?php } ?>
 			</div>
@@ -26,7 +26,7 @@
 			<div id="availableFields">
 				<?php foreach($TemplateData['availableFields'] as $k=>$v) { ?>
 				<div class="sortitem" data-field-id="<?php echo $k; ?>">
-					<?php echo $v['displayname']; ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
+					<?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
 				</div>
 				<?php } ?>
 			</div>
diff --git a/webclient/view/98/managecolletions/managecolletions.html b/webclient/view/98/managecolletions/managecolletions.html
index 0f80ff4..f879750 100644
--- a/webclient/view/98/managecolletions/managecolletions.html
+++ b/webclient/view/98/managecolletions/managecolletions.html
@@ -55,7 +55,7 @@
 			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['identifier']; ?>"
 				<?php echo ($TemplateData['editData']['defaultSearchField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
-			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+			><?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
 	</div>
@@ -74,7 +74,7 @@
 			<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['identifier']; ?>"
 				<?php echo ($TemplateData['editData']['defaultSortField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
-			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+			><?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
 	</div>
@@ -91,7 +91,7 @@
 			<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
 			<option value="<?php echo $v['id']; ?>"
 			<?php if(isset($TemplateData['editData']['advancedSearchTableFields'][$v['id']])) echo 'selected'; ?>
-			><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+			><?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type']; ?>)</option>
 			<?php } ?>
 		</select>
 	</div>
diff --git a/webclient/view/98/managetags/managetags.html b/webclient/view/98/managetags/managetags.html
index 203808e..86bcff6 100644
--- a/webclient/view/98/managetags/managetags.html
+++ b/webclient/view/98/managetags/managetags.html
@@ -19,7 +19,7 @@
 					<tbody>
 				<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
 						<tr>
-							<td><?php echo $v['displayname']; ?></td>
+							<td><?php echo $I18n->t($v['displayname']); ?></td>
 							<td>
 								<select name="fdata[<?php echo $v['id']; ?>][use]">
 									<option value="">Please select</option>
diff --git a/webclient/view/98/sysinfo/sysinfo.html b/webclient/view/98/sysinfo/sysinfo.html
index a570aea..1c47284 100644
--- a/webclient/view/98/sysinfo/sysinfo.html
+++ b/webclient/view/98/sysinfo/sysinfo.html
@@ -58,7 +58,7 @@
 				<td><?php echo $TemplateData['overallTableSize']; ?></td>
 			</tr>
 			<tr>
-				<td>Storage usage</td>
+				<td><?php echo $I18n->t('sysinfo.th.diskusage'); ?></td>
 				<td><?php echo $TemplateData['overallStorageSize']; ?></td>
 			</tr>
 		</tbody>
diff --git a/webclient/view/98/system/menu.php b/webclient/view/98/system/menu.php
index 093b015..87d04da 100644
--- a/webclient/view/98/system/menu.php
+++ b/webclient/view/98/system/menu.php
@@ -2,7 +2,7 @@
 /**
  * Bibliotheca
  *
- * Copyright 2018-2023 Johannes Keßler
+ * Copyright 2018-2024 Johannes Keßler
  *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/webclient/view/98/system/message.php b/webclient/view/98/system/message.php
index f3588e0..f47b9ff 100644
--- a/webclient/view/98/system/message.php
+++ b/webclient/view/98/system/message.php
@@ -2,7 +2,7 @@
 /**
  * Bibliotheca
  *
- * Copyright 2018-2023 Johannes Keßler
+ * Copyright 2018-2024 Johannes Keßler
  *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/webclient/view/98/tags/tags.html b/webclient/view/98/tags/tags.html
index 9eba97f..406875f 100644
--- a/webclient/view/98/tags/tags.html
+++ b/webclient/view/98/tags/tags.html
@@ -22,7 +22,7 @@
 	<h3><?php echo $I18n->t('tags.headline.tagsfor'); ?> <a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>"><?php echo $TemplateData['loadedCollection']['name'] ?? ''; ?></a></h3>
 
 	<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
-	<h4><?php echo $v['displayname']; ?></h4>
+	<h4><?php echo $I18n->t($v['displayname']); ?></h4>
 	<p>
 		<?php foreach($v['entries'] as $ek=>$ev) { ?>
 		<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $v['identifier']; ?>&fv=<?php echo urlencode($ev); ?>"><?php echo $ev; ?></a>,
diff --git a/webclient/view/compact/collections/collections.html b/webclient/view/compact/collections/collections.html
index d7b463a..c1de870 100644
--- a/webclient/view/compact/collections/collections.html
+++ b/webclient/view/compact/collections/collections.html
@@ -21,7 +21,7 @@
 					if(!empty($TemplateData['simpleSearchFields'])) {
 						foreach($TemplateData['simpleSearchFields'] as $k=>$v) {
 					?>
-					<li class="<?php if(isset($v['selected'])) echo 'uk-active' ?>"><a href="index.php?<?php echo Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('s'=>$k,'sd'=>'ASC')); ?>"><?php echo $v['displayname']; ?></a></li>
+					<li class="<?php if(isset($v['selected'])) echo 'uk-active' ?>"><a href="index.php?<?php echo Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('s'=>$k,'sd'=>'ASC')); ?>"><?php echo $I18n->t($v['displayname']); ?></a></li>
 					<?php
 						}
 					}
diff --git a/webclient/view/compact/managetags/managetags.html b/webclient/view/compact/managetags/managetags.html
index 9b93cec..61a40e5 100644
--- a/webclient/view/compact/managetags/managetags.html
+++ b/webclient/view/compact/managetags/managetags.html
@@ -8,7 +8,7 @@
 		<form class="uk-form-horizontal uk-margin-small" method="post">
 
 		<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
-			<h4 class="uk-heading-line"><?php echo $v['displayname']; ?></h4>
+			<h4 class="uk-heading-line"><?php echo $I18n->t($v['displayname']); ?></h4>
 
 			<div class="uk-margin">
 				<label class="uk-form-label"><?php echo $I18n->t('managetags.user'); ?></label>
diff --git a/webclient/view/compact/tags/tags.html b/webclient/view/compact/tags/tags.html
index 9c5b10f..ac1855d 100644
--- a/webclient/view/compact/tags/tags.html
+++ b/webclient/view/compact/tags/tags.html
@@ -16,7 +16,7 @@
 		<?php } ?>
 
 		<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
-		<h4 class="uk-heading-line"><span><a uk-toggle="target: #toggle-<?php echo $k; ?>"><?php echo $v['displayname']; ?></a></span></h4>
+		<h4 class="uk-heading-line"><span><a uk-toggle="target: #toggle-<?php echo $k; ?>"><?php echo $I18n->t($v['displayname']); ?></a></span></h4>
 		<div id="toggle-<?php echo $k; ?>">
 			<?php foreach($v['entries'] as $ek=>$ev) { ?>
 			<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $v['identifier']; ?>&fv=<?php echo urlencode($ev); ?>"><?php echo $ev; ?></a>,
diff --git a/webclient/view/default/collections/collections.html b/webclient/view/default/collections/collections.html
index 47a6afc..6047d6a 100644
--- a/webclient/view/default/collections/collections.html
+++ b/webclient/view/default/collections/collections.html
@@ -21,7 +21,7 @@
 					if(!empty($TemplateData['simpleSearchFields'])) {
 						foreach($TemplateData['simpleSearchFields'] as $k=>$v) {
 					?>
-					<li class="<?php if(isset($v['selected'])) echo 'uk-active' ?>"><a href="index.php?<?php echo Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('s'=>$k,'sd'=>'ASC')); ?>"><?php echo $v['displayname']; ?></a></li>
+					<li class="<?php if(isset($v['selected'])) echo 'uk-active' ?>"><a href="index.php?<?php echo Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('s'=>$k,'sd'=>'ASC')); ?>"><?php echo $I18n->t($v['displayname']); ?></a></li>
 					<?php
 						}
 					}
diff --git a/webclient/view/default/managecollectionfields/managecollectionfields.html b/webclient/view/default/managecollectionfields/managecollectionfields.html
index 5139fff..d5aa30b 100644
--- a/webclient/view/default/managecollectionfields/managecollectionfields.html
+++ b/webclient/view/default/managecollectionfields/managecollectionfields.html
@@ -8,7 +8,7 @@
 			<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
 			<div data-field-id="<?php echo $k; ?>">
 				<span class="uk-sortable-handle uk-margin-small-right" uk-icon="icon: table"></span>
-				<?php echo $v['displayname']; ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
+				<?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
 			</div>
 			<?php } ?>
 		</div>
@@ -29,7 +29,7 @@
 			<?php foreach($TemplateData['availableFields'] as $k=>$v) { ?>
 			<div data-field-id="<?php echo $k; ?>">
 				<span class="uk-sortable-handle uk-margin-small-right" uk-icon="icon: table"></span>
-				<?php echo $v['displayname']; ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
+				<?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type'],'; ',$v['identifier']; ?>)
 			</div>
 			<?php } ?>
 		</div>
diff --git a/webclient/view/default/managecolletions/managecolletions.html b/webclient/view/default/managecolletions/managecolletions.html
index ec5e5a0..2a8ce72 100644
--- a/webclient/view/default/managecolletions/managecolletions.html
+++ b/webclient/view/default/managecolletions/managecolletions.html
@@ -29,7 +29,7 @@
 						<option value="<?php echo $v['identifier']; ?>"
 							<?php echo ($TemplateData['editData']['defaultSearchField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
 						>
-						<?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+						<?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type']; ?>)</option>
 						<?php } ?>
 					</select>
 					<small><?php echo $I18n->t('managecol.globalsearchhowto'); ?></small><br />
@@ -54,7 +54,7 @@
 						<?php foreach($TemplateData['simpleSearchFields'] as $k=>$v) { ?>
 						<option value="<?php echo $v['identifier']; ?>"
 						<?php echo ($TemplateData['editData']['defaultSortField'] ?? '') == $v['identifier'] ? 'selected' : ''; ?>
-						><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+						><?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type']; ?>)</option>
 						<?php } ?>
 					</select>
 				</div>
@@ -75,7 +75,7 @@
 						<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
 						<option value="<?php echo $v['id']; ?>"
 						<?php if(isset($TemplateData['editData']['advancedSearchTableFields'][$v['id']])) echo 'selected'; ?>
-						><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+						><?php echo $I18n->t($v['displayname']); ?> (<?php echo $v['type']; ?>)</option>
 						<?php } ?>
 					</select>
 					<small><?php echo $I18n->t('managecol.input.advancedtablesearchfields.howto'); ?></small>
diff --git a/webclient/view/default/managetags/managetags.html b/webclient/view/default/managetags/managetags.html
index c01f9ed..ab37a3c 100644
--- a/webclient/view/default/managetags/managetags.html
+++ b/webclient/view/default/managetags/managetags.html
@@ -8,7 +8,7 @@
 		<form class="uk-form-horizontal uk-margin-small" method="post">
 
 		<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
-			<h4 class="uk-heading-line"><?php echo $v['displayname']; ?></h4>
+			<h4 class="uk-heading-line"><?php echo $I18n->t($v['displayname']); ?></h4>
 
 			<div class="uk-margin">
 				<label class="uk-form-label"><?php echo $I18n->t('managetags.use'); ?></label>
diff --git a/webclient/view/default/sysinfo/sysinfo.html b/webclient/view/default/sysinfo/sysinfo.html
index 19341b7..b4fdcdd 100644
--- a/webclient/view/default/sysinfo/sysinfo.html
+++ b/webclient/view/default/sysinfo/sysinfo.html
@@ -28,7 +28,7 @@
 			<li>PHP: <code><?php echo $TemplateData['phpVersion']; ?></code></li>
 			<li>MySQL server: <code><?php echo $TemplateData['mysqlVersion']; ?></code></li>
 			<li>MySQL data usage: <code><?php echo $TemplateData['overallTableSize']; ?></code></li>
-			<li>Storage usage: <code><?php echo $TemplateData['overallStorageSize']; ?></code></li>
+			<li><?php echo $I18n->t('sysinfo.th.diskusage'); ?>: <code><?php echo $TemplateData['overallStorageSize']; ?></code></li>
 		</ul>
 	</div>
 </div>
diff --git a/webclient/view/default/tags/tags.html b/webclient/view/default/tags/tags.html
index b0c1560..ac7e182 100644
--- a/webclient/view/default/tags/tags.html
+++ b/webclient/view/default/tags/tags.html
@@ -16,7 +16,7 @@
 		<?php } ?>
 
 		<?php foreach($TemplateData['tags'] as $k=>$v) { ?>
-		<h4 class="uk-heading-line"><span><a uk-toggle="target: #toggle-<?php echo $k; ?>"><?php echo $v['displayname']; ?></a></span></h4>
+		<h4 class="uk-heading-line"><span><a uk-toggle="target: #toggle-<?php echo $k; ?>"><?php echo $I18n->t($v['displayname']); ?></a></span></h4>
 		<div id="toggle-<?php echo $k; ?>">
 			<?php foreach($v['entries'] as $ek=>$ev) { ?>
 			<a href="index.php?p=collections&collection=<?php echo $TemplateData['loadedCollection']['id']; ?>&fid=<?php echo $v['identifier']; ?>&fv=<?php echo urlencode($ev); ?>"><?php echo $ev; ?></a>,
-- 
2.39.5