From e625a29b96df22dae4720b87b56a6fdbfb4f2220 Mon Sep 17 00:00:00 2001 From: Banana Date: Mon, 20 May 2024 20:26:52 +0200 Subject: [PATCH] more testing fixes Signed-off-by: Banana --- upgrade/from-version-1.6.txt | 1 + webclient/i18n/deu.ini | 7 ++++--- webclient/i18n/eng.ini | 5 +++-- webclient/lib/managecollectionfields.class.php | 4 ++-- webclient/lib/trite.class.php | 11 ++++++----- webclient/view/default/tool/tool-googlebooks.html | 2 +- webclient/view/default/tool/tool-googlebooks.php | 2 +- webclient/view/default/tool/tool-imdbweb.html | 3 ++- webclient/view/default/tool/tool-imdbweb.php | 2 +- webclient/view/default/tool/tool-musicbrainz.html | 2 +- webclient/view/default/tool/tool-musicbrainz.php | 2 +- 11 files changed, 23 insertions(+), 18 deletions(-) diff --git a/upgrade/from-version-1.6.txt b/upgrade/from-version-1.6.txt index 5dc7b31..50b70d0 100644 --- a/upgrade/from-version-1.6.txt +++ b/upgrade/from-version-1.6.txt @@ -54,4 +54,5 @@ UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.artist' WHERE `#RE UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.artists' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'artists'; UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.isbn' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'isbn'; ALTER TABLE `#REPLACEME#_sys_fields` CHANGE `displayname` `displayname` VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL; +UPDATE `#REPLACEME#_tool` SET `name` = 'IMDB' WHERE `#REPLACEME#_tool`.`id` = 1; ``` diff --git a/webclient/i18n/deu.ini b/webclient/i18n/deu.ini index 3d5e753..32161e1 100644 --- a/webclient/i18n/deu.ini +++ b/webclient/i18n/deu.ini @@ -43,7 +43,6 @@ global.login = "Login" global.message.couldNotBeSaved = "Daten konnten nicht gespeichert werden. Mehr dazu in den Logdateien." global.message.couldNotLoadCollection = "Angegebene Sammlung konnte nicht geladen werden." global.message.dataSaved = "Daten erfolgreich gespeichert" -global.message.here = "Hier" global.message.invalidSearchTerm = "Invalider Suchbegriff" global.message.missingQueryParams = "Fehlende benötigte query Paramenter." global.message.nothingFound = "Nichts gefunden." @@ -175,7 +174,7 @@ managetags.moveorrename = "Verschieben nach (Umbenennen zu bestehenden)" managetags.rename = "Umbenennen" managetags.save = reuse.global.save managetags.tagfield = "Tagfeld" -managetags.use = "Nutze" +managetags.use = "Verwende" manageuser.addormodify = "Benutzer bearbeiten oder hinzufügen" manageuser.availableusers = "Verfügbare Benutzer" @@ -249,6 +248,7 @@ sysfield.category = "Kategorie" sysfield.content = "Haupttext" sysfield.countries = "Länder" sysfield.coverimage = "Titelbild" +sysfield.created = "Erstellt" sysfield.description = "Beschreibung" sysfield.developer = "Entwickler" sysfield.directors = "Directoren" @@ -258,6 +258,8 @@ sysfield.imdbrating = "IMDB Wertung" sysfield.isbn = "ISBN" sysfield.languages = "Sprachen" sysfield.localizedTitle = "Lokalisierter Titel" +sysfield.missingtemplate = "Fehlende Feldvorlage:" +sysfield.modified = "Bearbeitet" sysfield.os = "Betriebssystem und Version" sysfield.platform = "Platform" sysfield.publisher = "Verlag" @@ -271,7 +273,6 @@ sysfield.view = "Ansicht" sysfield.viewcount = "Anzeigezähler" sysfield.writers = "Autoren" sysfield.year = "Jahr" -sysfield.missingtemplate = "Fehlende Feldvorlage:" tags.headline.tagsfor = "Tags für:" diff --git a/webclient/i18n/eng.ini b/webclient/i18n/eng.ini index e605be7..40f7f66 100644 --- a/webclient/i18n/eng.ini +++ b/webclient/i18n/eng.ini @@ -43,7 +43,6 @@ global.login = "Login" global.message.couldNotBeSaved = "Data could not be saved. See logs for more." global.message.couldNotLoadCollection = "Can not load given collection." global.message.dataSaved = "Data saved successfully" -global.message.here = "Here" global.message.invalidSearchTerm = "Invalid search term" global.message.missingQueryParams = "Missing required query parameters." global.message.nothingFound = "Nothing found." @@ -249,6 +248,7 @@ sysfield.category = "Category" sysfield.content = "Main Content" sysfield.countries = "Countries" sysfield.coverimage = "Cover image" +sysfield.created = "Created" sysfield.description = "Description" sysfield.developer = "Developer" sysfield.directors = "Directors" @@ -258,6 +258,8 @@ sysfield.imdbrating = "IMDB rating" sysfield.isbn = "ISBN" sysfield.languages = "Languages" sysfield.localizedTitle = "Localized title" +sysfield.missingtemplate = "Missing template for:" +sysfield.modified = "Modified" sysfield.os = "Operating system and version" sysfield.platform = "Platform" sysfield.publisher = "Publisher" @@ -271,7 +273,6 @@ sysfield.view = "View" sysfield.viewcount = "View counter" sysfield.writers = "Writers" sysfield.year = "Year" -sysfield.missingtemplate = "Missing template for:" tags.headline.tagsfor = "Tags for:" diff --git a/webclient/lib/managecollectionfields.class.php b/webclient/lib/managecollectionfields.class.php index eaaafff..9709e30 100644 --- a/webclient/lib/managecollectionfields.class.php +++ b/webclient/lib/managecollectionfields.class.php @@ -312,8 +312,8 @@ class ManageCollectionFields { } // add systemfields - $def['created'] = array('identifier' => 'created', 'displayname' => 'Created', 'type' => 'systemfield'); - $def['modified'] = array('identifier' => 'modified', 'displayname' => 'Modified', 'type' => 'systemfield'); + $def['created'] = array('identifier' => 'created', 'displayname' => 'sysfield.created', 'type' => 'systemfield'); + $def['modified'] = array('identifier' => 'modified', 'displayname' => 'sysfield.modified', 'type' => 'systemfield'); return $def + $ret; } diff --git a/webclient/lib/trite.class.php b/webclient/lib/trite.class.php index 31d4d24..e7cb7ec 100644 --- a/webclient/lib/trite.class.php +++ b/webclient/lib/trite.class.php @@ -233,8 +233,8 @@ class Trite { /** * return the simple search fields for loaded collection - * Every field witch has a column in the entry table is a simple search field. - * Name starts with entry + * Every field whitch has a column in the entry table is a simple search field. + * Name starts with entry. But no hidden fields * * @see ManageCollectionFields->getSimpleSearchFields() * @@ -246,15 +246,16 @@ class Trite { $fields = $this->getCollectionFields(); if(!empty($fields)) { foreach($fields as $k=>$v) { - if(isset($v['searchtype']) && strpos($v['searchtype'],'entry') !== false) { + if(isset($v['searchtype']) && strpos($v['searchtype'],'entry') !== false + && $v['type'] !== 'hidden') { $ret[$k] = $v; } } } // add systemfields - $def['created'] = array('identifier' => 'created', 'displayname' => 'Created', 'type' => 'systemfield'); - $def['modified'] = array('identifier' => 'modified', 'displayname' => 'Modified', 'type' => 'systemfield'); + $def['created'] = array('identifier' => 'created', 'displayname' => 'sysfield.created', 'type' => 'systemfield'); + $def['modified'] = array('identifier' => 'modified', 'displayname' => 'sysfield.modified', 'type' => 'systemfield'); return $def + $ret; } diff --git a/webclient/view/default/tool/tool-googlebooks.html b/webclient/view/default/tool/tool-googlebooks.html index a465e5f..04f20ee 100644 --- a/webclient/view/default/tool/tool-googlebooks.html +++ b/webclient/view/default/tool/tool-googlebooks.html @@ -1,4 +1,4 @@ -

t('tool.lomitations'); ?>

+

t('tool.limitations'); ?>

t('tool.limitations.override'); ?>

diff --git a/webclient/view/default/tool/tool-googlebooks.php b/webclient/view/default/tool/tool-googlebooks.php index 7657c8c..0491e96 100644 --- a/webclient/view/default/tool/tool-googlebooks.php +++ b/webclient/view/default/tool/tool-googlebooks.php @@ -127,7 +127,7 @@ if(isset($_POST['submitFormSave'])) { $_r['group'], $_r['rights'] ); - $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." ".$I18n->t('global.message.here').""; + $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." ".$I18n->t('global.view').""; } if(!empty($do)) { diff --git a/webclient/view/default/tool/tool-imdbweb.html b/webclient/view/default/tool/tool-imdbweb.html index c780ebd..8ab9c63 100644 --- a/webclient/view/default/tool/tool-imdbweb.html +++ b/webclient/view/default/tool/tool-imdbweb.html @@ -1,5 +1,6 @@ -

t('tool.lomitations'); ?>

+

t('tool.limitations'); ?>

t('tool.limitations.override'); ?>

+

Movie posters

diff --git a/webclient/view/default/tool/tool-imdbweb.php b/webclient/view/default/tool/tool-imdbweb.php index dd46dc8..2189542 100644 --- a/webclient/view/default/tool/tool-imdbweb.php +++ b/webclient/view/default/tool/tool-imdbweb.php @@ -137,7 +137,7 @@ if(isset($_POST['submitFormSave'])) { $_r['group'], $_r['rights'] ); - $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." ".$I18n->t('global.message.here').""; + $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." ".$I18n->t('global.view').""; } if(!empty($do)) { diff --git a/webclient/view/default/tool/tool-musicbrainz.html b/webclient/view/default/tool/tool-musicbrainz.html index 08d4967..a8157a9 100644 --- a/webclient/view/default/tool/tool-musicbrainz.html +++ b/webclient/view/default/tool/tool-musicbrainz.html @@ -1,4 +1,4 @@ -

t('tool.lomitations'); ?>

+

t('tool.limitations'); ?>

t('tool.music.limitations.override'); ?>

diff --git a/webclient/view/default/tool/tool-musicbrainz.php b/webclient/view/default/tool/tool-musicbrainz.php index 7092eab..268203f 100644 --- a/webclient/view/default/tool/tool-musicbrainz.php +++ b/webclient/view/default/tool/tool-musicbrainz.php @@ -156,7 +156,7 @@ if(isset($_POST['submitFormSave'])) { $_r['group'], $_r['rights'] ); - $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." ".$I18n->t('global.message.here').""; + $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." ".$I18n->t('global.view').""; } if(!empty($do)) { -- 2.39.5