some more final touches to i18n

Signed-off-by: Banana <mail@bananas-playground.net>

diff --git a/CHANGELOG b/CHANGELOG
index 710f80b209148a64bcee6a3f88658745be677638..1301a2b2050d23df1b188fd87a066f2243d20816 100644 (file)
--- 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 8583d013e1b85683c9d1a5ec41f7d7bb824c5450..504030cee9b9d15dcf2e5dac404f177c9e294927 100644 (file)
--- 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 5aec1bd6935f9cb5670eb451e0092e43ebcea8f5..04a7e0aa26d4dd2ccf17a53397f703139cd277dc 100644 (file)
--- 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 6d143ed7a782f54ebe88d33c7fb41906814ab524..4b6d674c42898e162b2c22156de1636c22e710bc 100644 (file)
--- 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 b7b9acb79f26f4de785a274432f9049380fa38f8..e655957f11624289f0fba1b18f0ced28f207404d 100644 (file)
--- 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 78c41bbd23438d2a8ddfbeb1ff38bad88ff155ab..4dcd93a20f5f2e5059ff16795f2cec35c8bef646 100644 (file)
--- 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 0f80ff4f7e2067e61bb4d44dfea350a8997492d9..f879750eb1ae7656b082856bfaa86437a92c3ed6 100644 (file)
--- 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 203808e9d755a83bead9b39511f53ef957b8cef3..86bcff6f90a273a7383196e025f9e1967cb6c4a5 100644 (file)
--- 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 a570aea78946fde11564c79646cb0da72a4accea..1c472843a4f83e55fd2defd8a24ea1fd53f89cd1 100644 (file)
--- 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 093b015468b147612573e5c5ae947d208f320ab7..87d04da3b92c5f2fd06b1b008d4c14fd0600aebf 100644 (file)
--- 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 f3588e0a87d24e211e3d963338b2a860f2a19d6b..f47b9ff9ab83902f9f6e6db8d1c5708a39973bea 100644 (file)
--- 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 9eba97f05015e0862ddfc349d28229a9db0ebfff..406875f71591b2610e6db82bd3040c2668701abe 100644 (file)
--- 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 d7b463afdf8974596a4705399821c4da87a5852d..c1de870302ed73fabe549a14b84b836a6e56fabe 100644 (file)
--- 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 9b93ceccb06fa4c8d2249f17e0056dbee515a3ea..61a40e57772bd3660ddb361d2fa717115319569c 100644 (file)
--- 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 9c5b10f5d615a34486e6110cf6e21802e411df4e..ac1855df1369739d8dc1dabf66b5014858847514 100644 (file)
--- 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 47a6afcc37a7d5a05aa8557d9c18da8d4b1a5a6e..6047d6a27201a0919183ed00d6540ec2ce56334e 100644 (file)
--- 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 5139fff6af57bc55632f84e0a185a9121418b21b..d5aa30b0061e7b6ab63f501e915b584dc2e36fb0 100644 (file)
--- 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 ec5e5a08d34801f7b20540781478d129bfd5dbf6..2a8ce72a2c6179dd68c85bd677ba7e6823950b29 100644 (file)
--- 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 c01f9ed1c855b819df9a660a01ccf85141af4e98..ab37a3c57a3c0e25f4d747ca328d8bbd99fd6c6c 100644 (file)
--- 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 19341b7a2f18fe8994934d4641f8f250ad17af99..b4fdcdded43d0cad1753e6a83478d6fa23320df0 100644 (file)
--- 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 b0c15601eca5ee5aff1d68fde4db8a3498821762..ac7e1821b1044cc8cbdcdb9493ef001068f6ce10 100644 (file)
--- 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>,