diff --git a/phpmyfaq/admin/assets/src/content/faqs.overview.js b/phpmyfaq/admin/assets/src/content/faqs.overview.js index 61221b1d9d..d9355553c9 100644 --- a/phpmyfaq/admin/assets/src/content/faqs.overview.js +++ b/phpmyfaq/admin/assets/src/content/faqs.overview.js @@ -175,7 +175,7 @@ const populateCategoryTable = async (catgoryId, faqs) => { addElement('td', { classList: 'align-middle text-center' }, [ addElement('a', { classList: 'text-decoration-none', - href: `?action=editentry&id=${faq.id}&lang=${faq.language}`, + href: `./faq/edit/${faq.id}/${faq.language}`, innerText: faq.id, }), ]) @@ -185,7 +185,7 @@ const populateCategoryTable = async (catgoryId, faqs) => { addElement('td', { classList: 'align-middle text-center' }, [ addElement('a', { classList: 'text-decoration-none', - href: `?action=editentry&id=${faq.id}&lang=${faq.language}`, + href: `./faq/edit/${faq.id}/${faq.language}`, innerText: faq.solution_id, }), ]) @@ -194,7 +194,7 @@ const populateCategoryTable = async (catgoryId, faqs) => { addElement('td', {}, [ addElement('a', { classList: 'text-decoration-none', - href: `?action=editentry&id=${faq.id}&lang=${faq.language}`, + href: `./faq/edit/${faq.id}/${faq.language}`, innerText: faq.question, }), ]) @@ -230,14 +230,14 @@ const populateCategoryTable = async (catgoryId, faqs) => { ); row.append( addElement('td', { classList: 'align-middle text-center' }, [ - addElement('a', { classList: 'btn btn-primary', href: `?action=editentry&id=${faq.id}&lang=${faq.language}` }, [ + addElement('a', { classList: 'btn btn-primary', href: `./faq/edit/${faq.id}/${faq.language}` }, [ addElement('i', { classList: 'bi bi-pencil', 'aria-hidden': 'true' }), ]), ]) ); row.append( addElement('td', { classList: 'align-middle text-center' }, [ - addElement('a', { classList: 'btn btn-info', href: `?action=copyentry&id=${faq.id}&lang=${faq.language}` }, [ + addElement('a', { classList: 'btn btn-info', href: `./faq/copy/${faq.id}/${faq.language}` }, [ addElement('i', { classList: 'bi bi-copy', 'aria-hidden': 'true' }), ]), ]) diff --git a/phpmyfaq/admin/faqs.editor.php b/phpmyfaq/admin/faqs.editor.php index aa9757ffab..f234d29326 100644 --- a/phpmyfaq/admin/faqs.editor.php +++ b/phpmyfaq/admin/faqs.editor.php @@ -238,9 +238,9 @@ } $templateVars = [ - 'ad_record_faq' => Translation::get('ad_record_faq'), - 'ad_menu_faq_meta' => Translation::get('ad_menu_faq_meta'), - 'ad_record_permissions' => Translation::get('ad_record_permissions'), + 'msgQuestionAnswer' => Translation::get('msgQuestionAnswer'), + 'msgFAQMetaData' => Translation::get('msgFAQMetaData'), + 'msgPermissions' => Translation::get('msgPermissions'), 'ad_admin_notes' => Translation::get('ad_admin_notes'), 'ad_entry_changelog' => Translation::get('ad_entry_changelog'), ]; @@ -262,7 +262,7 @@ $templateVars = [ ...$templateVars, - 'adminFaqEditorHeader' => Translation::get('ad_entry_edit_1') . ' ' . Translation::get('ad_entry_edit_2'), + 'msgAddFAQ' => Translation::get('ad_entry_edit_1') . ' ' . Translation::get('ad_entry_edit_2'), 'editExistingFaq' => true, 'currentRevision' => $currentRevision, 'faqUrl' => $link->toString(), @@ -271,7 +271,7 @@ } else { $templateVars = [ ...$templateVars, - 'adminFaqEditorHeader' => Translation::get('ad_entry_add'), + 'msgAddFAQ' => Translation::get('msgAddFAQ'), 'editExistingFaq' => false, ]; } @@ -337,10 +337,10 @@ 'msgQuestion' => Translation::get('msgQuestion'), 'msgNoHashAllowed' => Translation::get('msgNoHashAllowed'), 'msgShowHelp' => Translation::get('msgShowHelp'), - 'ad_entry_content' => Translation::get('ad_entry_content'), - 'ad_entry_category' => Translation::get('ad_entry_category'), + 'msgAnswer' => Translation::get('msgAnswer'), + 'msgCategory' => Translation::get('msgCategory'), 'categoryOptions' => $categoryHelper->renderOptions($categories), - 'ad_entry_locale' => Translation::get('ad_entry_locale'), + 'msgLanguage' => Translation::get('msgLanguage'), 'languageOptions' => LanguageHelper::renderSelectLanguage($faqData['lang'], false, [], 'lang'), 'hasPermissionForAddAttachments' => $user->perm->hasPermission( $currentUserId, @@ -350,15 +350,15 @@ $currentUserId, PermissionType::ATTACHMENT_DELETE->value ), - 'ad_menu_attachments' => Translation::get('ad_menu_attachments'), + 'msgAttachments' => Translation::get('msgAttachments'), 'csrfTokenDeleteAttachment' => Token::getInstance($container->get('session'))->getTokenString('delete-attachment'), 'attachments' => $attList, - 'ad_att_add' => Translation::get('ad_att_add'), - 'ad_entry_tags' => Translation::get('ad_entry_tags'), + 'msgAddAttachment' => Translation::get('msgAddAttachment'), + 'msgTags' => Translation::get('msgTags'), 'ad_entry_keywords' => Translation::get('ad_entry_keywords'), 'ad_entry_author' => Translation::get('ad_entry_author'), 'msgEmail' => Translation::get('msgEmail'), - 'msgSeoCenter' => Translation::get('seoCenter'), + 'msgSeoCenter' => Translation::get('msgSeoCenter'), 'msgSerp' => Translation::get('msgSerp'), 'msgSerpTitle' => Translation::get('msgSerpTitle'), 'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'), @@ -386,7 +386,7 @@ 'ad_entry_save' => Translation::get('ad_entry_save'), 'msgUpdateFaqDate' => Translation::get('msgUpdateFaqDate'), 'msgKeepFaqDate' => Translation::get('msgKeepFaqDate'), - 'msgEditFaqDat' => Translation::get('msgEditFaqDat'), + 'msgEditFaqDate' => Translation::get('msgEditFaqDate'), 'ad_entry_status' => Translation::get('ad_entry_status'), 'hasPermissionForApprove' => $user->perm->hasPermission($currentUserId, PermissionType::FAQ_APPROVE->value), 'isActive' => $isActive, diff --git a/phpmyfaq/admin/forms.translations.php b/phpmyfaq/admin/forms.translations.php index ac7e7de312..fca0e5c6d4 100644 --- a/phpmyfaq/admin/forms.translations.php +++ b/phpmyfaq/admin/forms.translations.php @@ -58,7 +58,7 @@ $templateVars = [ 'translations' => $forms->getTranslations($formId, $inputId), - 'ad_entry_locale' => Translation::get('ad_entry_locale'), + 'msgLanguage' => Translation::get('msgLanguage'), 'msgInputLabel' => Translation::get('msgInputLabel'), 'ad_sess_pageviews' => Translation::get('ad_sess_pageviews'), 'msgFormsEditTranslations' => Translation::get('msgFormsEditTranslations'), diff --git a/phpmyfaq/admin/header.php b/phpmyfaq/admin/header.php index bc079e03b3..39164ae11d 100644 --- a/phpmyfaq/admin/header.php +++ b/phpmyfaq/admin/header.php @@ -68,7 +68,7 @@ $secLevelEntries['content'] .= $adminHelper->addMenuEntry( PermissionType::FAQ_ADD->value, 'editentry', - 'ad_entry_add', + 'msgAddFAQ', 'faq/add' ); $secLevelEntries['content'] .= $adminHelper->addMenuEntry( @@ -88,13 +88,13 @@ $secLevelEntries['content'] .= $adminHelper->addMenuEntry( 'addattachment+editattachment+delattachment', 'attachments', - 'ad_menu_attachments', + 'msgAttachments', 'attachments' ); $secLevelEntries['content'] .= $adminHelper->addMenuEntry( PermissionType::FAQ_EDIT->value, 'tags', - 'ad_entry_tags', + 'msgTags', 'tags' ); $secLevelEntries['content'] .= $adminHelper->addMenuEntry( diff --git a/phpmyfaq/admin/import.csv.php b/phpmyfaq/admin/import.csv.php index 55eb02cb5d..8c46d868e7 100644 --- a/phpmyfaq/admin/import.csv.php +++ b/phpmyfaq/admin/import.csv.php @@ -43,13 +43,13 @@ 'adminHeaderCSVImportColumns' => Translation::get('msgColumnStructure'), 'categoryId' => Translation::get('ad_categ_categ'), 'question' => Translation::get('ad_entry_topic'), - 'answer' => Translation::get('ad_entry_content'), + 'answer' => Translation::get('msgAnswer'), 'keywords' => Translation::get('ad_entry_keywords'), 'author' => Translation::get('ad_entry_author'), 'email' => Translation::get('msgEmail'), 'languageCode' => Translation::get('msgLanguageCode'), 'seperateWithCommas' => Translation::get('msgSeperateWithCommas'), - 'tags' => Translation::get('ad_entry_tags'), + 'tags' => Translation::get('msgTags'), 'msgImportRecordsColumnStructure' => Translation::get('msgImportRecordsColumnStructure'), 'csrfToken' => Token::getInstance($container->get('session'))->getTokenString('importfaqs'), 'is_active' => Translation::get('ad_entry_active'), diff --git a/phpmyfaq/assets/templates/admin/configuration/forms.translations.twig b/phpmyfaq/assets/templates/admin/configuration/forms.translations.twig index 1b208efdc1..d7ffb5a9bc 100644 --- a/phpmyfaq/assets/templates/admin/configuration/forms.translations.twig +++ b/phpmyfaq/assets/templates/admin/configuration/forms.translations.twig @@ -16,7 +16,7 @@
{{ ad_entry_locale }} | +{{ msgLanguage }} | {{ msgInputLabel }} | {{ ad_sess_pageviews }} |
---|