testing feedback

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

diff --git a/upgrade/from-version-1.5.txt b/upgrade/from-version-1.5.txt
index 65517b8844b048faf5f800a2d02c88430c32a752..760da8d79fc7b159bd170002edc384afead16956 100644 (file)
--- a/upgrade/from-version-1.5.txt
+++ b/upgrade/from-version-1.5.txt
@@ -2,7 +2,7 @@
 As of version 1.6, the field 'Combined Search' provides a much better search base.
 How to change and use new field: Run the following sql query. Replace #REPLACEME# with the used DB prefix.
 ```
-INSERT INTO `bib_sys_fields` (`id`, `identifier`, `displayname`, `type`, `searchtype`, `createstring`, `inputValidation`, `value`, `apiinfo`, `created`, `modified`, `modificationuser`, `owner`, `group`, `rights`) VALUES (NULL, 'combSearch', 'Combined Search', 'hidden', 'entryText', '`combSearch` text NULL DEFAULT NULL, ADD FULLTEXT (`combSearch`)', '', NULL, 'mysql text - Content will be auto generated from other entry fields', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, '1', '1', 'rw-r--r--');
+INSERT INTO `#REPLACEME#_sys_fields` (`id`, `identifier`, `displayname`, `type`, `searchtype`, `createstring`, `inputValidation`, `value`, `apiinfo`, `created`, `modified`, `modificationuser`, `owner`, `group`, `rights`) VALUES (NULL, 'combSearch', 'Combined Search', 'hidden', 'entryText', '`combSearch` text NULL DEFAULT NULL, ADD FULLTEXT (`combSearch`)', '', NULL, 'mysql text - Content will be auto generated from other entry fields', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, '1', '1', 'rw-r--r--');
 ```
 Add the new field 'Combined Search' to a collection.
 Change the 'Default gloabal seach field' to 'Combined search' and save.

diff --git a/upgrade/from-version-1.6.txt b/upgrade/from-version-1.6.txt
index d81ca5b91dece1ffec49a9af40787dfc452ed63c..5dc7b31e0cffed6c0f2213352a1663866a46421f 100644 (file)
--- a/upgrade/from-version-1.6.txt
+++ b/upgrade/from-version-1.6.txt
@@ -13,7 +13,7 @@ Replace #REPLACEME# with your table prefix. Default is bib
 ```
 UPDATE `#REPLACEME#_sys_fields` SET `value` = 'DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11', `apiinfo` = 'One of DOS,Windows 1,Windows 2,Windows 3,Windows 95,Windows 98,Windows XP,Windows 2000,Windows ME,Windows Vista,Windows 7,Windows 8,Windows 10,Windows 11' WHERE `#REPLACEME#_sys_fields`.`id` = 17;
 UPDATE `#REPLACEME#_menu` SET `action` = 'dashboard' WHERE `#REPLACEME#_menu`.`id` = 1;
-UPDATE `#REPLACEME#_menu_menu` SET `text` = 'menu.show.dashboard' WHERE `#REPLACEME#_menu`.`id` = 1;
+UPDATE `#REPLACEME#_menu` SET `text` = 'menu.show.dashboard' WHERE `#REPLACEME#_menu`.`id` = 1;
 UPDATE `#REPLACEME#_menu` SET `text` = 'menu.show.collections' WHERE `#REPLACEME#_menu`.`id` = 2;
 UPDATE `#REPLACEME#_menu` SET `text` = 'menu.show.tags' WHERE `#REPLACEME#_menu`.`id` = 3;
 UPDATE `#REPLACEME#_menu` SET `text` = 'menu.show.sysinfo' WHERE `#REPLACEME#_menu`.`id` = 19;
@@ -28,7 +28,7 @@ UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.description' WHERE
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.content' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'content';
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.tag' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'tag';
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.category' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'category';
-UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.category' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'publisher';
+UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.publisher' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'publisher';
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.developer' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'developer';
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.platform' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'platform';
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.storage' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'storage';

diff --git a/webclient/i18n/deu.ini b/webclient/i18n/deu.ini
index 04a7e0aa26d4dd2ccf17a53397f703139cd277dc..3d5e753cc7b6874af5896831bd32dfbd07642dfb 100644 (file)
--- a/webclient/i18n/deu.ini
+++ b/webclient/i18n/deu.ini
@@ -173,8 +173,9 @@ managetags.message.executionError = "Ausgewählte Optionen können nicht durchge
 managetags.message.notTagsAvailable = "Es sind keine Tags vorhanden oder es liegt ein Fehler vor."
 managetags.moveorrename = "Verschieben nach (Umbenennen zu bestehenden)"
 managetags.rename = "Umbenennen"
+managetags.save = reuse.global.save
 managetags.tagfield = "Tagfeld"
-managetags.user = "Nutze"
+managetags.use = "Nutze"
 
 manageuser.addormodify = "Benutzer bearbeiten oder hinzufügen"
 manageuser.availableusers = "Verfügbare Benutzer"
@@ -256,7 +257,7 @@ sysfield.genres = "Genres"
 sysfield.imdbrating = "IMDB Wertung"
 sysfield.isbn = "ISBN"
 sysfield.languages = "Sprachen"
-sysfield.localizedTitle = "Lokalisierter Title"
+sysfield.localizedTitle = "Lokalisierter Titel"
 sysfield.os = "Betriebssystem und Version"
 sysfield.platform = "Platform"
 sysfield.publisher = "Verlag"

diff --git a/webclient/i18n/eng.ini b/webclient/i18n/eng.ini
index 4b6d674c42898e162b2c22156de1636c22e710bc..e605be78a3d94104505d9d8fb7aa48a336a01404 100644 (file)
--- a/webclient/i18n/eng.ini
+++ b/webclient/i18n/eng.ini
@@ -173,8 +173,9 @@ managetags.message.executionError = "Can not execute given options. See logs for
 managetags.message.notTagsAvailable = "No tags available or something went wrong."
 managetags.moveorrename = "Move to (rename to existig)"
 managetags.rename = "Rename"
+managetags.save = reuse.global.save
 managetags.tagfield = "Tagfield"
-managetags.user = "Use"
+managetags.use = "Use"
 
 manageuser.addormodify = "Add or modify a user"
 manageuser.availableusers = "Available users"

diff --git a/webclient/lib/imdbwebparser.class.php b/webclient/lib/imdbwebparser.class.php
index 2feca7e946f92ada6cd22f8d92ef900e2aa2d259..bae9e908154cdc81637afcbffd01b6bba570a4e9 100644 (file)
--- a/webclient/lib/imdbwebparser.class.php
+++ b/webclient/lib/imdbwebparser.class.php
@@ -339,7 +339,7 @@ class IMDB
                }
 
                // Was the movie found?
-               $sMatch = $this->matchRegex($sSource, self::IMDB_SEARCH, "1");
+               $sMatch = $this->matchRegex($sSource, self::IMDB_SEARCH_ADV, "1");
                if (false !== $sMatch) {
                        $sUrl = 'https://www.imdb.com/title/' . $sMatch . '/reference';
                        if ($this->IMDB_DEBUG) {
@@ -351,7 +351,7 @@ class IMDB
 
                        return true;
                }
-               $sMatch = $this->matchRegex($sSource, self::IMDB_NOT_FOUND, "0");
+               $sMatch = $this->matchRegex($sSource, self::IMDB_NOT_FOUND_ADV, "0");
                if (false !== $sMatch) {
                        if ($this->IMDB_DEBUG) {
                                echo '<pre><b>Movie not found:</b> ' . $sSearch . '</pre>';
@@ -890,7 +890,7 @@ class IMDB
        public function getDescription()
        {
                if (true === $this->isReady) {
-                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_DESCRIPTION, "1");
+                       $sMatch = $this->matchRegex($this->sSource, self::IMDB_MOVIE_DESC, "1");
                        if (false !== $sMatch) {
                                return $this->cleanString($sMatch);
                        }

diff --git a/webclient/view/98/collections/collections.html b/webclient/view/98/collections/collections.html
index e655957f11624289f0fba1b18f0ced28f207404d..0acc9a9a2b570f2f6b12f3c32ef776415ce8972a 100644 (file)
--- a/webclient/view/98/collections/collections.html
+++ b/webclient/view/98/collections/collections.html
@@ -74,7 +74,7 @@
                                        <?php if(isset($entry['fields']['coverimage'])) { ?>
                                        <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>">
                                                <img src="<?php echo $TemplateData['storagePath'].'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
-                                                    alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>"
+                                                    alt="<?php echo $I18n->t($entry['fields']['coverimage']['displayname']); ?>"
                                                     width="50px">
                                        </a>
                                        <?php } ?>

diff --git a/webclient/view/98/collections/collections_pagination.html b/webclient/view/98/collections/collections_pagination.html
index 6ba86834ab5cbb986ed3d022a3229f41713b70ee..7c2fe4d412a8f187875a2ac735448f92dbfa08c0 100644 (file)
--- a/webclient/view/98/collections/collections_pagination.html
+++ b/webclient/view/98/collections/collections_pagination.html
@@ -12,7 +12,7 @@ for($i=1;$i<=$TemplateData['pagination']['pages'];$i++) {
 
        if(in_array($i,$TemplateData['pagination']['visibleRange'])) {
                echo '<a class="'.$active.'" href="index.php?'.Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('page'=>$i)).'"
-                                                       title="'.$I18n->t('pagination.previous') $i.'">'.$i.'</a>';
+                                                       title="'.$I18n->t('pagination.gotopage').' '.$i.'">'.$i.'</a>';
        }
        else {
                if($i < $TemplateData['pagination']['currentRangeStart'] && $ellipsisShown == 0) {

diff --git a/webclient/view/98/managecolletions/managecolletions.html b/webclient/view/98/managecolletions/managecolletions.html
index f879750eb1ae7656b082856bfaa86437a92c3ed6..b71d8905329f241ec129a4578e1b7092a901d15f 100644 (file)
--- a/webclient/view/98/managecolletions/managecolletions.html
+++ b/webclient/view/98/managecolletions/managecolletions.html
@@ -137,7 +137,7 @@
                <table>
                        <thead>
                                <tr>
-                                       <th><?php echo $I18n->t('global.user ?></th>
+                                       <th><?php echo $I18n->t('global.user'); ?></th>
                                        <th><?php echo $I18n->t('global.group'); ?></th>
                                        <th><?php echo $I18n->t('global.other'); ?></th>
                                </tr>

diff --git a/webclient/view/compact/collections/collections.html b/webclient/view/compact/collections/collections.html
index c1de870302ed73fabe549a14b84b836a6e56fabe..79acda58fbe0bbd6d6e7a9ee071407b5896bdc01 100644 (file)
--- a/webclient/view/compact/collections/collections.html
+++ b/webclient/view/compact/collections/collections.html
@@ -61,7 +61,7 @@
                        <?php if(isset($entry['fields']['coverimage'])) { ?>
                        <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>">
                                <img src="<?php echo $TemplateData['storagePath'].'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
-                                alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>" uk-cover>
+                                alt="<?php echo $I18n->t($entry['fields']['coverimage']['displayname']); ?>" uk-cover>
                                <canvas width="400" height="200"></canvas>
                        </a>
                        <?php } ?>

diff --git a/webclient/view/compact/collections/collections_pagination.html b/webclient/view/compact/collections/collections_pagination.html
index 3ba8aba42555f94c6ce5d6c7aa84627c2a48dd5d..134db6018785f238feeda240eb2b712171c5b40d 100644 (file)
--- a/webclient/view/compact/collections/collections_pagination.html
+++ b/webclient/view/compact/collections/collections_pagination.html
@@ -13,7 +13,7 @@ for($i=1;$i<=$TemplateData['pagination']['pages'];$i++) {
 
        if(in_array($i,$TemplateData['pagination']['visibleRange'])) {
                echo '<li class="'.$active.'"><a href="index.php?'.Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('page'=>$i)).'"
-                                                       title="Goto page '.$i.'">'.$i.'</a></li>';
+                                                       title="'.$I18n->t('pagination.gotopage').' '.$i.'">'.$i.'</a></li>';
        }
        else {
                if($i < $TemplateData['pagination']['currentRangeStart'] && $ellipsisShown == 0) {

diff --git a/webclient/view/default/collections/collections.html b/webclient/view/default/collections/collections.html
index 6047d6a27201a0919183ed00d6540ec2ce56334e..b06e015225be3563a20e4aa67ad0e5ae9b2e2ce3 100644 (file)
--- a/webclient/view/default/collections/collections.html
+++ b/webclient/view/default/collections/collections.html
@@ -60,7 +60,7 @@
                                <?php if(isset($entry['fields']['coverimage'])) { ?>
                                <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>">
                                <img src="<?php echo $TemplateData['storagePath'].'/'.$entryK.'/'.$entry['fields']['coverimage']['value']; ?>"
-                                        alt="<?php echo $entry['fields']['coverimage']['displayname']; ?>">
+                                        alt="<?php echo $I18n->t($entry['fields']['coverimage']['displayname']); ?>">
                                </a>
                                <?php } ?>
                        </div>
@@ -74,7 +74,7 @@
                                <?php } ?>
                        </div>
                        <div class="uk-card-footer">
-                               <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>" class="uk-button uk-button-text"><?php echo $I18n->t('global.View'); ?></a>
+                               <a href="<?php echo $TemplateData['entryLinkPrefix']; ?>&id=<?php echo $entryK; ?>" class="uk-button uk-button-text"><?php echo $I18n->t('global.view'); ?></a>
                        </div>
                </div>
        </div>

diff --git a/webclient/view/default/collections/collections_pagination.html b/webclient/view/default/collections/collections_pagination.html
index 633990cfded5c20e7f9f2955b7ee927a5338cc2c..76d31b36251d47b1e35add7a2afa21f54031b2d2 100644 (file)
--- a/webclient/view/default/collections/collections_pagination.html
+++ b/webclient/view/default/collections/collections_pagination.html
@@ -11,7 +11,7 @@ for($i=1;$i<=$TemplateData['pagination']['pages'];$i++) {
 
        if(in_array($i,$TemplateData['pagination']['visibleRange'])) {
                echo '<li class="'.$active.'"><a href="index.php?'.Summoner::createFromParameterLinkQuery($TemplateData['pagination']['currentGetParameters'],array('page'=>$i)).'"
-                                                       title="Goto page '.$i.'">'.$i.'</a></li>';
+                                                       title="'.$I18n->t('pagination.gotopage').' '.$i.'">'.$i.'</a></li>';
        }
        else {
                if($i < $TemplateData['pagination']['currentRangeStart'] && $ellipsisShown == 0) {

diff --git a/webclient/view/default/entry/entry.html b/webclient/view/default/entry/entry.html
index ac3229fde31ab99b2f80a2a2a0cacd81cb8a435e..79d3293b3346f33031403f4898d7903766af49cc 100644 (file)
--- a/webclient/view/default/entry/entry.html
+++ b/webclient/view/default/entry/entry.html
@@ -3,7 +3,7 @@
        <div class="uk-width-1-2@l">
                <article class="uk-article">
                        <?php if($TemplateData['showEdit'] === true) { ?>
-                       <p class="uk-article-meta"><a href="index.php?p=manageentry&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>&id=<?php echo $TemplateData['entry']['id']; ?>"><?php echo $I18n->t('global.search'); ?></a></p>
+                       <p class="uk-article-meta"><a href="index.php?p=manageentry&collection=<?php echo $TemplateData['loadedCollection']['id'] ?? ''; ?>&id=<?php echo $TemplateData['entry']['id']; ?>"><?php echo $I18n->t('global.edit'); ?></a></p>
                        <?php
                        }
 

diff --git a/webclient/view/default/tool/tool-googlebooks.php b/webclient/view/default/tool/tool-googlebooks.php
index f358261414e3b3df953f486f82efde6c5546d9c6..7657c8c273aafd8586776603b868fb808ed9b282 100644 (file)
--- a/webclient/view/default/tool/tool-googlebooks.php
+++ b/webclient/view/default/tool/tool-googlebooks.php
@@ -44,7 +44,7 @@ $TemplateData['showMatchingForm'] = false;
 $collectionFields = $ManangeCollectionsFields->getExistingFields(false, true);
 if(!empty($collectionFields)) {
        foreach ($collectionFields as $k=>$v) {
-               $TemplateData['saveToSelection'] .= "<option value='".$k."' sel_".$v['identifier'].">".$v['displayname']."</option>\n";
+               $TemplateData['saveToSelection'] .= "<option value='".$k."' sel_".$v['identifier'].">".$I18n->t($v['displayname'])."</option>\n";
        }
 }
 

diff --git a/webclient/view/default/tool/tool-imdbweb.php b/webclient/view/default/tool/tool-imdbweb.php
index 5b407453813a9dea62ceeea8c28b0bc8ae409a2a..dd46dc8481478ce3a2d9d51ea9c7322f13087402 100644 (file)
--- a/webclient/view/default/tool/tool-imdbweb.php
+++ b/webclient/view/default/tool/tool-imdbweb.php
@@ -48,7 +48,7 @@ $TemplateData['showMatchingForm'] = false;
 $collectionFields = $ManangeCollectionsFields->getExistingFields(false, true);
 if(!empty($collectionFields)) {
        foreach ($collectionFields as $k=>$v) {
-               $TemplateData['saveToSelection'] .= "<option value='".$k."' sel_".$v['identifier'].">".$v['displayname']."</option>\n";
+               $TemplateData['saveToSelection'] .= "<option value='".$k."' sel_".$v['identifier'].">".$I18n->t($v['displayname'])."</option>\n";
        }
 }
 

diff --git a/webclient/view/default/tool/tool-musicbrainz.php b/webclient/view/default/tool/tool-musicbrainz.php
index 10d99b25062cb2b4b3ce13a0b5d96995c86439e3..7092eabca3c6c3388eb8a511a967bd1a35ee75d0 100644 (file)
--- a/webclient/view/default/tool/tool-musicbrainz.php
+++ b/webclient/view/default/tool/tool-musicbrainz.php
@@ -49,7 +49,7 @@ $TemplateData['saveToSelection'] = '';
 $collectionFields = $ManangeCollectionsFields->getExistingFields(false, true);
 if(!empty($collectionFields)) {
        foreach ($collectionFields as $k=>$v) {
-               $TemplateData['saveToSelection'] .= "<option value='".$k."' sel_".$v['identifier'].">".$v['displayname']."</option>\n";
+               $TemplateData['saveToSelection'] .= "<option value='".$k."' sel_".$v['identifier'].">".$I18n->t($v['displayname'])."</option>\n";
        }
 }