diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 13ed6938..3cfa25ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -127,6 +127,10 @@ jobs: db: "mysql:5.7" - php: '8.3' db: "mariadb:10.2" + - php: '8.4' + db: "mysql:8.0" + - php: '8.4' + db: "mariadb:10.3" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -264,6 +268,8 @@ jobs: db: "postgres:9.5" - php: '8.3' db: "postgres:9.5" + - php: '8.4' + db: "postgres:9.5" name: PHP ${{ matrix.php }} - ${{ matrix.db }} @@ -348,7 +354,7 @@ jobs: # START Other Tests Job (SQLite 3 and mssql) other-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved. strategy: matrix: include: @@ -358,17 +364,17 @@ jobs: db: "mcr.microsoft.com/mssql/server:2017-latest" db_alias: 'MSSQL 2017' - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2019-latest" + db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" db_alias: 'MSSQL 2019' - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2022-latest" + db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" db_alias: 'MSSQL 2022' name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -408,7 +414,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] then db='mssql' else diff --git a/README.md b/README.md index 5154a327..0991baa6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Tailor your custom BBCodes to perfection by arranging and sorting them in any de Install Advanced BBCode Box today and unlock a world of enhanced formatting possibilities for your phpBB3 forum. -[![Build Status](https://github.com/iMattPro/abbc3/workflows/Tests/badge.svg)](https://github.com/iMattPro/abbc3/actions) +[![Build Status](https://github.com/iMattPro/abbc3/actions/workflows/tests.yml/badge.svg)](https://github.com/iMattPro/abbc3/actions) [![Maintainability](https://api.codeclimate.com/v1/badges/8d41d4a3ec4e8a3e4e76/maintainability)](https://codeclimate.com/github/iMattPro/abbc3/maintainability) [![codecov](https://codecov.io/gh/iMattPro/abbc3/branch/master/graph/badge.svg?token=C5Big3OlKM)](https://codecov.io/gh/iMattPro/abbc3) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/iMattPro/abbc3/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/iMattPro/abbc3/?branch=master) diff --git a/adm/style/acp_abbc3.css b/adm/style/acp_abbc3.css index f3f5cb78..b729b14e 100644 --- a/adm/style/acp_abbc3.css +++ b/adm/style/acp_abbc3.css @@ -45,6 +45,14 @@ color: #333333; } +.toast.toast-dark { + background: hsl(0, 0%, 20%); +} + +.toast.toast-dark .toast-message .toast-text { + color: #ffffff; +} + #abbc3_icons_type { vertical-align: top; } diff --git a/adm/style/acp_abbc3_settings.html b/adm/style/acp_abbc3_settings.html index 03ac6f03..8b0d1f57 100644 --- a/adm/style/acp_abbc3_settings.html +++ b/adm/style/acp_abbc3_settings.html @@ -1,11 +1,26 @@ {% include 'overall_header.html' %} {% INCLUDECSS '@vse_abbc3/acp_abbc3.css' %} +{% set links = { + 'faq': { + 'url': 'https://www.phpbb.com/customise/db/extension/advanced_bbcode_box/faq/1551', + 'text': lang('FAQ') + }, + 'media_embed': { + 'url': 'https://www.phpbb.com/customise/db/extension/mediaembed/', + 'text': lang('DOWNLOAD') + } +} %} + +{% macro external_link(url, text) -%} + + Icon('font', 'arrow-up-right-from-square', '', true) + {{ text -}} + +{%- endmacro %} + {{ lang('ACP_ABBC3_MODULE') }} -{% set LINK_FAQ = '' %} -{% set LINK_ME_EXT = '' %} -{% set LINK_ICON = Icon('font', 'arrow-up-right-from-square', '', true) ~ '' %} -

{{ lang('ABBC3_SETTINGS_EXPLAIN', LINK_FAQ, LINK_ICON) }}

+

{{ lang('ABBC3_SETTINGS_EXPLAIN', _self.external_link(links.faq.url, links.faq.text)) }}

@@ -52,7 +67,7 @@

{{ lang('ABBC3_BBVIDEO_EXPLAIN') }}
-
{{ lang('ABBC3_MEDIA_EMBED_INSTALL', S_ABBC3_MEDIA_EMBED, LINK_ME_EXT, LINK_ICON) }}
+
{{ lang('ABBC3_MEDIA_EMBED_INSTALL', S_ABBC3_MEDIA_EMBED, _self.external_link(links.media_embed.url, links.media_embed.text)) }}

{{ lang('ABBC3_GOOGLE_FONTS_INFO') }}{% if not S_ALLOW_CDN %}

{{ lang('ABBC3_GOOGLE_FONTS_NOTE') }}{% endif %}
diff --git a/adm/style/event/acp_overall_footer_after.html b/adm/style/event/acp_overall_footer_after.html index bbf5f15f..8a16c887 100644 --- a/adm/style/event/acp_overall_footer_after.html +++ b/adm/style/event/acp_overall_footer_after.html @@ -49,6 +49,25 @@ }); }); })(jQuery); + + function darkToast() { + const toast = document.getElementById('abbc3-successbox'); + + if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) { + toast.classList.add("toast-dark"); + } else { + toast.classList.remove("toast-dark"); + } + } + + // Initial check + darkToast(); + + // Add event listener to detect changes + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => { + darkToast(); + }); + {% endif %} diff --git a/controller/acp_controller.php b/controller/acp_controller.php index 6d006044..1558c768 100644 --- a/controller/acp_controller.php +++ b/controller/acp_controller.php @@ -189,28 +189,42 @@ protected function get_google_fonts() protected function save_google_fonts() { $fonts = $this->request->variable('abbc3_google_fonts', ''); - $fonts = explode("\n", $fonts); - $this->validate_google_fonts($fonts); - $this->config_text->set('abbc3_google_fonts', json_encode($fonts)); + + if (!empty($fonts)) + { + $fonts = array_filter( + array_map('trim', explode("\n", $fonts)), + [$this, 'validate_google_fonts'] + ); + + $fonts = $fonts ? json_encode(array_values($fonts)) : ''; + } + + $this->config_text->set('abbc3_google_fonts', $fonts); } /** - * Validate Google Font names provided link to a CSS file + * Validate Google Font names link to an existing CSS file * - * @param array $fonts + * @param string $font + * @return bool */ - protected function validate_google_fonts(&$fonts) + protected function validate_google_fonts($font) { - foreach ($fonts as $key => $font) + if ($font === '') { - if (empty($font) || $this->valid_url('https://fonts.googleapis.com/css?family=' . urlencode($font))) - { - continue; - } + return false; + } + + $url = 'https://fonts.googleapis.com/css?family=' . urlencode($font); - $this->errors[] = $this->language->lang('ABBC3_INVALID_FONT', $font); - unset($fonts[$key]); + if ($this->valid_url($url)) + { + return true; } + + $this->errors[] = $this->language->lang('ABBC3_INVALID_FONT', $font); + return false; } /** diff --git a/language/ar/acp_abbc3.php b/language/ar/acp_abbc3.php index a3568f1e..003594c1 100644 --- a/language/ar/acp_abbc3.php +++ b/language/ar/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/bg/acp_abbc3.php b/language/bg/acp_abbc3.php index cf797054..a290d0c4 100644 --- a/language/bg/acp_abbc3.php +++ b/language/bg/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/cs/acp_abbc3.php b/language/cs/acp_abbc3.php index 4b4ec4a6..8fc922ed 100644 --- a/language/cs/acp_abbc3.php +++ b/language/cs/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/de/acp_abbc3.php b/language/de/acp_abbc3.php index a760c06e..0833cf62 100644 --- a/language/de/acp_abbc3.php +++ b/language/de/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Hier kannst du die Einstellungen für die Advanced BBCode Box verändern. Für weitere Informationen, wie du die Menüleiste verändern kannst, rufe bitte die %1$s ABBC3 FAQ %2$s auf.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Hier kannst du die Einstellungen für die Advanced BBCode Box verändern. Für weitere Informationen, wie du die Menüleiste verändern kannst, rufe bitte die %s auf.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Füge Google Fonts zum [font] BBCode hinzu. Achte auf genaue Schreibweise und Groß-/Kleinschreibung. Setze jeden Schriftartnamen in eine eigene Zeile.', 'ABBC3_GOOGLE_FONTS_NOTE' => '„Nutzung von Drittanbieter-Servern zulassen“ muss aktiviert sein unter den “Serverlast”-Einstellungen, um diese Funktion zu nutzen.', 'ABBC3_INVALID_FONT' => 'Ungültiger Schriftname „%s“', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Installiere die optionale Erweiterung „phpBB Media Embed“, um auf Einstellungen und Verwaltungsoptionen für eingebettete Rich Media-Inhalte zuzugreifen.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed-Erweiterung ist nicht installiert. %2$s Download %3$s.', + 0 => 'phpBB Media Embed-Erweiterung ist nicht installiert. %2$s.', 1 => 'phpBB Media Embed-Erweiterung ist installiert. Auf die Einstellungen kann über den Tab „Beiträge“ zugegriffen werden.' ], 'PNG' => 'PNG', diff --git a/language/en/acp_abbc3.php b/language/en/acp_abbc3.php index 6e697ad2..032f0ae1 100644 --- a/language/en/acp_abbc3.php +++ b/language/en/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/es/acp_abbc3.php b/language/es/acp_abbc3.php index 2ac13a1c..1a008ab9 100644 --- a/language/es/acp_abbc3.php +++ b/language/es/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Aquí puede configurar los ajustes para Advanced BBCode Box. Para obtener información sobre cómo personalizar la barra de iconos, visite el %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Aquí puede configurar los ajustes para Advanced BBCode Box. Para obtener información sobre cómo personalizar la barra de iconos, visite el %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Añada fuentes de Google Fonts al BBCode font. Utilice la ortografía exacta y la distinción entre mayúsculas y minúsculas. Coloque cada nombre de fuente en una línea separada. Por ejemplo: Droid Sans', 'ABBC3_GOOGLE_FONTS_NOTE' => 'Tenga en cuenta que “Permitir el uso de las redes de distribución de contenidos de terceros” debe estar habilitado en "Configuración de carga" para usar esta función.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/es_x_tu/acp_abbc3.php b/language/es_x_tu/acp_abbc3.php index 0ba9edb0..a4c9da6c 100644 --- a/language/es_x_tu/acp_abbc3.php +++ b/language/es_x_tu/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Aquí puedes configurar los ajustes para Advanced BBCode Box. Para obtener información sobre cómo personalizar la barra de iconos, visita el %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Aquí puedes configurar los ajustes para Advanced BBCode Box. Para obtener información sobre cómo personalizar la barra de iconos, visita el %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Añade fuentes de Google Fonts al BBCode font. Utiliza la ortografía exacta y la distinción entre mayúsculas y minúsculas. Coloca cada nombre de fuente en una línea separada. Por ejemplo: Droid Sans', 'ABBC3_GOOGLE_FONTS_NOTE' => 'Tenga en cuenta que “Permitir el uso de las redes de distribución de contenidos de terceros” debe estar habilitado en "Configuración de carga" para usar esta función.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/et/acp_abbc3.php b/language/et/acp_abbc3.php index 58b4c4de..f0c21ba0 100644 --- a/language/et/acp_abbc3.php +++ b/language/et/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/fa/acp_abbc3.php b/language/fa/acp_abbc3.php index 783343a7..33c2cd02 100644 --- a/language/fa/acp_abbc3.php +++ b/language/fa/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/fi/acp_abbc3.php b/language/fi/acp_abbc3.php index 096304ea..644f0d3e 100644 --- a/language/fi/acp_abbc3.php +++ b/language/fi/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/fr/acp_abbc3.php b/language/fr/acp_abbc3.php index c55fd0b7..07984993 100644 --- a/language/fr/acp_abbc3.php +++ b/language/fr/acp_abbc3.php @@ -23,8 +23,8 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Ici, vous pouvez configurer les paramètres de Advanced BBCode Box. Pour plus d’informations sur la personnalisation de la barre d’icônes, visitez le site %1$s ABBC3 FAQ %2$s.', - 'ABBC3_GOOGLE_FONTS_INFO' => 'Ajoutez Google Fonts à la [font] BBCode. Utilisez une orthographe exacte et respectez la casse. Placez chaque nom de police sur une ligne distincte.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Ici, vous pouvez configurer les paramètres de Advanced BBCode Box. Pour plus d’informations sur la personnalisation de la barre d’icônes, visitez le site %s.', + 'ABBC3_GOOGLE_FONTS_INFO' => 'Ajoutez Google Fonts à la [font] BBCode. Utilisez une orthographe exacte et respectez la casse. Placez chaque nom de police sur une ligne distincte.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Autoriser l‘utilisation de réseaux de diffusion de contenu tiers" doit être activé sous "Charger les paramètres" pour utiliser cette fonctionnalité.', 'ABBC3_INVALID_FONT' => 'Nom de police invalide pour “%s”', 'ABBC3_PIPES' => 'Activer le PlugIn Pipe Table', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Installez l‘extension facultative phpBB Media Embed pour accéder aux paramètres et aux options de gestion du contenu multimédia intégré.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'L‘extension phpBB Media Embed n‘est pas installée. %2$s Téléchargement %3$s.', + 0 => 'L‘extension phpBB Media Embed n‘est pas installée. %2$s.', 1 => 'L‘extension phpBB Media Embed est installée. Les paramètres sont accessibles sous l‘onglet Publication.' ], 'PNG' => 'PNG', diff --git a/language/gr/acp_abbc3.php b/language/gr/acp_abbc3.php index b968f2f5..d1dc2b2a 100644 --- a/language/gr/acp_abbc3.php +++ b/language/gr/acp_abbc3.php @@ -24,7 +24,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -43,7 +43,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/he/acp_abbc3.php b/language/he/acp_abbc3.php index 1148e500..994f24db 100644 --- a/language/he/acp_abbc3.php +++ b/language/he/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/hr/acp_abbc3.php b/language/hr/acp_abbc3.php index c90ca51b..f17f945d 100644 --- a/language/hr/acp_abbc3.php +++ b/language/hr/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/it/acp_abbc3.php b/language/it/acp_abbc3.php index a315cfed..3123af16 100644 --- a/language/it/acp_abbc3.php +++ b/language/it/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Qui puoi configurare le impostazioni per l\'Advanced BBCode Box. Per informazioni su come personalizzare la barra delle icone, visita le %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Qui puoi configurare le impostazioni per l\'Advanced BBCode Box. Per informazioni su come personalizzare la barra delle icone, visita le %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Aggiungi Google Fonts al [font] BBCode. Usa lo spelling esatto e contano maiuscole/minuscole. Piazza il nome di ogni font su una riga separata. Esempio: Droid Sans', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Consenti l’utilizzo delle reti di distribuzione per contenuti di terze parti:” deve essere abilitato in “Processi” per utilizzare questa caratteristica.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/nl/abbc3.php b/language/nl/abbc3.php index a5546151..a1701dae 100644 --- a/language/nl/abbc3.php +++ b/language/nl/abbc3.php @@ -25,27 +25,27 @@ $lang = array_merge($lang, array( // Hidden BBCode 'ABBC3_HIDDEN_ON' => 'Verborgen inhoud', - 'ABBC3_HIDDEN_OFF' => 'Verborgen inhoud (enkel voor leden)', - 'ABBC3_HIDDEN_EXPLAIN' => 'Je moet geregistreerd en ingelogd zijn om de verborgen inhoud te kunnen bekijken.', + 'ABBC3_HIDDEN_OFF' => 'Verborgen inhoud (Alleen voor leden)', + 'ABBC3_HIDDEN_EXPLAIN' => 'Je moet geregistreerd en aangemeld zijn om de verborgen inhoud te kunnen zien.', // Spoiler BBCode - 'ABBC3_SPOILER_SHOW' => '► Toon Spoiler', + 'ABBC3_SPOILER_SHOW' => '► Laat Spoiler zien', 'ABBC3_SPOILER_HIDE' => '▼ Verberg Spoiler', // Off Topic BBCode 'ABBC3_OFFTOPIC' => 'Off Topic', // Font BBCode - 'ABBC3_FONT_BBCODE' => 'Fonts', - 'ABBC3_FONT_SAFE' => 'Systeem Fonts', - 'ABBC3_GOOGLE_FONTS' => 'Google Fonts', + 'ABBC3_FONT_BBCODE' => 'Lettertype', + 'ABBC3_FONT_SAFE' => 'Safe lettertype', + 'ABBC3_GOOGLE_FONTS' => 'Google lettertype', // BBCode help lines 'ABBC3_ALIGN_HELPLINE' => 'Tekst uitlijnen: [align=center|left|right|justify]tekst[/align]', 'ABBC3_BBVIDEO_HELPLINE' => 'Video website link insluiten: [bbvideo]http://video_url[/bbvideo]', 'ABBC3_BLUR_HELPLINE' => 'Wazige tekst: [blur=color]tekst[/blur]', - 'ABBC3_DIR_HELPLINE' => 'Tekst richting (links naar rechts vs rechts naar links): [dir=ltr|rtl]tekst[/dir]', - 'ABBC3_DROPSHADOW_HELPLINE' => 'Slagschaduw tekst: [dropshadow=color]text[/dropshadow]', + 'ABBC3_DIR_HELPLINE' => 'Tekst volgorde (draait tekst om rechts naar links): [dir=ltr|rtl]tekst[/dir]', + 'ABBC3_DROPSHADOW_HELPLINE' => 'Drop shadow tekst: [dropshadow=color]text[/dropshadow]', 'ABBC3_FADE_HELPLINE' => 'Vervagende tekst: [fade]tekst[/fade]', 'ABBC3_FLOAT_HELPLINE' => 'Tekst uitlijnen: [float=left|right]tekst[/float]', 'ABBC3_FONT_HELPLINE' => 'Lettertype: [font=Comic Sans MS]tekst[/font]', @@ -59,17 +59,17 @@ 'ABBC3_PREFORMAT_HELPLINE' => 'Vooraf opgemaakte tekst: [pre]tekst[/pre]', 'ABBC3_SHADOW_HELPLINE' => 'Schaduw tekst: [shadow=color]tekst[/shadow]', 'ABBC3_SOUNDCLOUD_HELPLINE' => 'SoundCloud: [soundcloud]https://soundcloud.com/user-name/song-title[/soundcloud]', - 'ABBC3_SPOILER_HELPLINE' => 'Spoiler bericht (in- en uitklapbaar gedeelte): [spoil]tekst[/spoil]', + 'ABBC3_SPOILER_HELPLINE' => 'Spoiler (in- en uitklapbaar gedeelte): [spoil]tekst[/spoil]', 'ABBC3_STRIKE_HELPLINE' => 'Doorstreepte tekst: [s]tekst[/s]', - 'ABBC3_SUB_HELPLINE' => 'Subscript tekst: [sub]tekst[/sub]', - 'ABBC3_SUP_HELPLINE' => 'Superscript tekst: [sup]tekst[/sup]', + 'ABBC3_SUB_HELPLINE' => 'Subscript (kleine letters maken boven de basis regel van de tekst): [sub]tekst[/sub]', + 'ABBC3_SUP_HELPLINE' => 'Superscript (Kleine letters maken boven de tekst regel): [sup]tekst[/sup]', 'ABBC3_YOUTUBE_HELPLINE' => 'YouTube Video: [youtube]http://youtube_url[/youtube]', - 'ABBC3_AUTOVIDEO_HELPLINE' => 'Embed MP4/OGG/WEBM video bestanden: URL moet beginnen met https of http en eindigen met .mp4, .ogg of .webm (geen BBCode nodig). Merk op dat browser ondersteuning and GUI implementatie kan variëren.', + 'ABBC3_AUTOVIDEO_HELPLINE' => 'Embed MP4/OGG/WEBM videobestanden: URL moet beginnen met https of http en eindigen met .mp4, .ogg of .webm (geen BBCode nodig). Houd er rekening mee dat browserondersteuning en GUI-implementatie variëren.', // Utility BBCodes 'ABBC3_COPY_BBCODE' => 'Kopieer geselecteerde tekst', - 'ABBC3_PASTE_BBCODE' => 'Plak gekopieerde tekst', - 'ABBC3_PASTE_ERROR' => 'Je moet eerst een tekst selecteren en kopiëren, voordat je het kan plakken', + 'ABBC3_PASTE_BBCODE' => 'Plak geselecteerde tekst', + 'ABBC3_PASTE_ERROR' => 'Je moet eerst een tekst selecteren, voordat je het kan plakken', 'ABBC3_PLAIN_BBCODE' => 'Verwijder alle BBcode-tags van de geselecteerde tekst', 'ABBC3_NOSELECT_ERROR' => 'Er is geen tekst geselecteerd.', @@ -77,30 +77,30 @@ 'ABBC3_BBCODE_WIZ_SUBMIT' => 'Invoegen in bericht', 'ABBC3_BBCODE_WIZ_EXAMPLE' => 'Voorbeeld', 'ABBC3_BBVIDEO_SITES' => 'Toegestane websites', - 'ABBC3_URL_LINK' => 'Voeg een URL toe', + 'ABBC3_URL_LINK' => 'Voeg een URL', 'ABBC3_URL_DESCRIPTION' => 'Optionele beschrijving', 'ABBC3_URL_EXAMPLE' => 'https://www.phpbb.com', // Pipe tables 'ABBC3_PIPE_TABLES' => 'Maak tabellen', - 'ABBC3_PIPE_TABLES_EXPLAIN' => 'Maak tabellen met eender welke van deze ASCII-style formats.', - 'ABBC3_PIPE_DOCUMENTATION' => 'Gebruikers Handleiding', + 'ABBC3_PIPE_TABLES_EXPLAIN' => 'Maak tabellen met behulp van een van deze ASCII-stijl formaten.', + 'ABBC3_PIPE_DOCUMENTATION' => 'Gebruikershandleiding', 'ABBC3_PIPE_SIMPLE' => 'Eenvoudige tabel', - 'ABBC3_PIPE_COMPACT' => 'Compacte tabel', - 'ABBC3_PIPE_COMPACT_EXPLAIN'=> 'De buitenste sluistekens en spaties rond de sluistekens zijn optioneel.', - 'ABBC3_PIPE_ALIGNMENT' => 'Uitlijning van de tekst', + 'ABBC3_PIPE_COMPACT' => 'Compacte tabel', + 'ABBC3_PIPE_COMPACT_EXPLAIN' => 'De buitenste pipes en spaties rondom pipes zijn optioneel.', + 'ABBC3_PIPE_ALIGNMENT' => 'Tekstuitlijning', // Pipe Table Example Code: DO NOT NEED TO TRANSLATE THESE EXAMPLES - 'ABBC3_PIPE_SIMPLE_EX' => "| Header 1 | Header 2 |\n|----------|----------|\n| Cell 1 | Cell 2 |", + 'ABBC3_PIPE_SIMPLE_EX' => "| Header 1 | Header 2 |\n|----------|----------|\n| Cell 1 | Cell 2 |", 'ABBC3_PIPE_COMPACT_EX' => "Header 1|Header 2\n-|-\nCell 1|Cell 2", - 'ABBC3_PIPE_ALIGNMENT_EX' => "| Left | Center | Right |\n|:-----|:------:|------:|\n| x | x | x |", + 'ABBC3_PIPE_ALIGNMENT_EX' => "| Left | Center | Right |\n|:-----|:------:|------:|\n| x | x | x |", - // ACP Common - 'ABBC3_BBCODE_ORDERED' => 'De volgorde van de BBcodes is bijgewerkt.', - 'ABBC3_BBCODE_GROUP' => 'Beheer groepen die deze BBcode kunnen gebruiken', - 'ABBC3_BBCODE_GROUP_INFO' => 'Indien geen groepen geselecteerd zijn, dan kunnen alle groepen deze BBcode gebruiken. Gebruik CTRL+KLIK (of CMD+KLIK bij Mac) om meer dan één groep te selecteren/deselecteren.', + // ACP + 'ABBC3_BBCODE_ORDERED' => 'De volgorde van de BBcodes is bijgewerkt.', + 'ABBC3_BBCODE_GROUP' => 'Beheer groepen die deze BBcode kunnen gebruiken', + 'ABBC3_BBCODE_GROUP_INFO' => 'Als je geen groep hebt geselecteerd, kunnen alle groepen deze BBcode gebruiken. Gebruik CTRL+KLIK (of CMD+KLIK bij Mac) om meer dan één groep te selecteren/deselecteren.', // BBCode FAQ 'ABBC3_FAQ_TITLE' => 'Advanced BBCode Box BBCodes', - 'ABBC3_FAQ_SAMPLE_TEXT' => 'The quick brown fox jumps over the lazy dog', + 'ABBC3_FAQ_SAMPLE_TEXT' => 'De snelle bruine vos springt over de luie hond', 'ABBC3_FAQ_ANSWER' => '%1$s

Voorbeeld:
%2$s

Resultaat:
%3$s
', )); diff --git a/language/nl/acp_abbc3.php b/language/nl/acp_abbc3.php index 027ccb6f..608d57bd 100644 --- a/language/nl/acp_abbc3.php +++ b/language/nl/acp_abbc3.php @@ -23,27 +23,27 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Hier kan je de instellingen voor Advanced BBCode Box aanpassen. Voor informatie over het aanpassen van de balk met de ikoontjes, zie %1$s ABBC3 FAQ %2$s.', - 'ABBC3_GOOGLE_FONTS_INFO' => 'Voeg Google Fonts toe aan [font] de BBCodes. Gebruik de exacte spelling en let op de hoofdletters. Plaats elke fontnaam op een nieuwe regel.', - 'ABBC3_GOOGLE_FONTS_NOTE' => '“Gebruik van derde partij inhoud leveringsnetwerken toestaan” moet ingeschakeld zijn in “Laadinstellingen” om dit te kunnen gebruiken.', - 'ABBC3_INVALID_FONT' => 'Ongeldige naam van de font voor “%s”', - 'ABBC3_PIPES' => 'Pipe Table PlugIn inschakelen', - 'ABBC3_PIPES_EXPLAIN' => 'De Pipe Table PlugIn laat gebruikers toe tabellen aan te maken in het forum en in privé-berichten, gebruik makend van markdown syntax.', - 'ABBC3_BBCODE_BAR' => 'Schakel de BBCode ikoonbalk in', - 'ABBC3_BBCODE_BAR_EXPLAIN' => 'Hierdoor wordt ABBC3’s ikoon gebaseerde BBCode werkbalk getoond. Schakel dit uit om phpBB’s eigen BBCode ikoonknoppen te gebruiken.', - 'ABBC3_QR_BBCODES' => 'Laat BBCodes toe in Snelle reactie', - 'ABBC3_QR_BBCODES_EXPLAIN' => 'Dit voegt BBCode knoppen toe aan Snelle reactie.', - 'ABBC3_ICONS_TYPE' => 'Ikoonbalk afbeeldingstype', - 'ABBC3_ICONS_TYPE_EXPLAIN' => 'Selecteer het te gebruiken afbeeldingstype voor ABBC ikonen. Merk op dat in de ikoonbalk slechts 1 type gebruikt kan worden', - 'ABBC3_LEGEND_ICON_BAR' => 'BBCode Ikoon balk', + 'ABBC3_SETTINGS_EXPLAIN' => 'Hier kunt u de instellingen voor Advanced BBCode Box configureren. Voor informatie over het aanpassen van de werkbalk met pictogrammen, bezoek de %s.', + 'ABBC3_GOOGLE_FONTS_INFO' => 'Voeg Google Fonts toe aan de [font] BBCode. Gebruik exacte spelling en hoofdlettergevoeligheid. Plaats elke lettertype naam op een aparte regel.', + 'ABBC3_GOOGLE_FONTS_NOTE' => '“Gebruik van externe content delivery networks toestaan” moet ingeschakeld zijn onder “Laadinstellingen” om deze functie te gebruiken.', + 'ABBC3_INVALID_FONT' => 'Ongeldige lettertype naam voor “%s”', + 'ABBC3_PIPES' => 'Schakel Pipe Table PlugIn in', + 'ABBC3_PIPES_EXPLAIN' => 'De Pipe Table PlugIn stelt gebruikers in staat om tabellen te maken in hun berichten en privéberichten met behulp van markdown-syntaxis.', + 'ABBC3_BBCODE_BAR' => 'Schakel BBCode werkbalk in', + 'ABBC3_BBCODE_BAR_EXPLAIN' => 'Dit toont ABBC3’s werkbalk met BBCode-pictogrammen. Schakel dit uit om de standaard BBCode-knoppen van phpBB weer te geven.', + 'ABBC3_QR_BBCODES' => 'Schakel BBCodes in Snelle Reactie in', + 'ABBC3_QR_BBCODES_EXPLAIN' => 'Dit voegt BBCode-knoppen toe aan Snelle Reactie.', + 'ABBC3_ICONS_TYPE' => 'Beeldformaat van werkbalkpictogrammen', + 'ABBC3_ICONS_TYPE_EXPLAIN' => 'Kies het beeldformaat voor de ABBC3-pictogrammen. Houd er rekening mee dat u slechts één formaat voor al uw pictogrammen kunt kiezen.', + 'ABBC3_LEGEND_ICON_BAR' => 'BBCode Werkbalk', 'ABBC3_LEGEND_ADD_ONS' => 'Add Ons', 'ABBC3_AUTO_VIDEO' => 'Schakel Auto Video PlugIn in', - 'ABBC3_AUTO_VIDEO_EXPLAIN' => 'Deze plugin converteert video bestand URLs (tekst) naar afspeelbare videos. Enkel URLs beginnend met http:// or https:// en eindigend op .mp4, .ogg of .webm worden geconverteerd.', + 'ABBC3_AUTO_VIDEO_EXPLAIN' => 'Deze plugin converteert platte tekst videobestands-URL’s naar afspeelbare video’s. Alleen URL’s die beginnen met http:// of https:// en eindigen met .mp4, .ogg of .webm worden geconverteerd.', 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Installeer de optionele phpBB Media Embed extensie om toegang te krijgen tot de instellings-en beheeropties voor embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extensie is niet geïnstalleerd. %2$s Download %3$s.', - 1 => 'phpBB Media Embed extensie is geïnstalleerd. Instellingen zijn beschikbaar in de tab Berichten (ACP).' + 0 => 'phpBB Media Embed-extensie is niet geïnstalleerd. %2$s.', + 1 => 'phpBB Media Embed-extensie is geïnstalleerd. Instellingen zijn toegankelijk onder het tabblad Plaatsen.' ], 'PNG' => 'PNG', 'SVG' => 'SVG', diff --git a/language/nl/info_acp_abbc3.php b/language/nl/info_acp_abbc3.php index c071c7b7..abe479be 100644 --- a/language/nl/info_acp_abbc3.php +++ b/language/nl/info_acp_abbc3.php @@ -19,7 +19,7 @@ } $lang = array_merge($lang, [ - 'ACP_ABBC3_MODULE' => 'Advanced BBCode Box', + 'ACP_ABBC3_MODULE' => 'Geavanceerde BBCode Box', 'ACP_ABBC3_SETTINGS' => 'Instellingen', - 'LOG_ABBC3_ENABLE_FAIL' => 'Advanced BBCode Box kon de map niet aanmaken:
%s', + 'LOG_ABBC3_ENABLE_FAIL' => 'Geavanceerde BBCode Box kon de map niet aanmaken:
%s', ]); diff --git a/language/pl/acp_abbc3.php b/language/pl/acp_abbc3.php index 9fc7fe5d..463502c4 100644 --- a/language/pl/acp_abbc3.php +++ b/language/pl/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/pt_br/acp_abbc3.php b/language/pt_br/acp_abbc3.php index 0118f1b5..06903cb6 100644 --- a/language/pt_br/acp_abbc3.php +++ b/language/pt_br/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/pt_pt/acp_abbc3.php b/language/pt_pt/acp_abbc3.php index 75b7406f..e74843e4 100644 --- a/language/pt_pt/acp_abbc3.php +++ b/language/pt_pt/acp_abbc3.php @@ -24,7 +24,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Aqui pode alterar as configurações do «Advanced BBCode Box». Para mais informações (em inglês) sobre a customização da barra de ícones, visite %1$s a FAQ do ABBC3 %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Aqui pode alterar as configurações do «Advanced BBCode Box». Para mais informações (em inglês) sobre a customização da barra de ícones, visite %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -43,7 +43,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/ru/acp_abbc3.php b/language/ru/acp_abbc3.php index 26de315a..09b80333 100644 --- a/language/ru/acp_abbc3.php +++ b/language/ru/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Здесь можно изменить настройки расширения «Advanced BBCode Box». Для получения дополнительной информации о настройке панели с иконками, откройте %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Здесь можно изменить настройки расширения «Advanced BBCode Box». Для получения дополнительной информации о настройке панели с иконками, откройте %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/sk/acp_abbc3.php b/language/sk/acp_abbc3.php index bae6a5bb..328f84f0 100644 --- a/language/sk/acp_abbc3.php +++ b/language/sk/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/sl/acp_abbc3.php b/language/sl/acp_abbc3.php index 39aab919..ce7fc154 100644 --- a/language/sl/acp_abbc3.php +++ b/language/sl/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Tukaj lahko konfigurirate nastavitve za napredno polje BBKode. Za informacije o prilagajanju vrstice z ikonami obiščite %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Tukaj lahko konfigurirate nastavitve za napredno polje BBKode. Za informacije o prilagajanju vrstice z ikonami obiščite %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Dodajte Googlove pisave v font BBKode. Uporabite natančno črkovanje in razlikovanje med velikimi in malimi črkami. Vsako ime pisave postavite v ločeno vrstico. Primer: Droid Sans', 'ABBC3_GOOGLE_FONTS_NOTE' => 'Upoštevajte, da mora biti za uporabo te funkcije v razdelku Nastavitve nalaganja omogočeno Dovoli uporabo tretjeosebnih omrežij.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/sv/acp_abbc3.php b/language/sv/acp_abbc3.php index 2638eb59..c5637eb7 100644 --- a/language/sv/acp_abbc3.php +++ b/language/sv/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/tr/acp_abbc3.php b/language/tr/acp_abbc3.php index c47b18ba..dd8155ae 100644 --- a/language/tr/acp_abbc3.php +++ b/language/tr/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Buradan Advanced BBCode Box için ayarları yapılandırabilirsiniz. Simge çubuğunu özelleştirme hakkında bilgi almak için, %1$s ABBC3 FAQ %2$s sayfasını ziyaret edin.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Buradan Advanced BBCode Box için ayarları yapılandırabilirsiniz. Simge çubuğunu özelleştirme hakkında bilgi almak için, %s sayfasını ziyaret edin.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/uk/acp_abbc3.php b/language/uk/acp_abbc3.php index e6187af1..f84f1cda 100644 --- a/language/uk/acp_abbc3.php +++ b/language/uk/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/vn/acp_abbc3.php b/language/vn/acp_abbc3.php index f6ab1ea5..f7400f38 100644 --- a/language/vn/acp_abbc3.php +++ b/language/vn/acp_abbc3.php @@ -24,7 +24,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -43,7 +43,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/language/zh_cmn_hans/acp_abbc3.php b/language/zh_cmn_hans/acp_abbc3.php index 49a274cf..856b7c7d 100644 --- a/language/zh_cmn_hans/acp_abbc3.php +++ b/language/zh_cmn_hans/acp_abbc3.php @@ -23,7 +23,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => '在此您可以修改 Advanced BBCode Box 的设置。 要了解有关定制图标栏的信息,请访问 %1$s ABBC3 FAQ %2$s。', + 'ABBC3_SETTINGS_EXPLAIN' => '在此您可以修改 Advanced BBCode Box 的设置。 要了解有关定制图标栏的信息,请访问 %s。', 'ABBC3_GOOGLE_FONTS_INFO' => '添加 Google Fontsfont BBCode 中。使用完全一致的大小写和拼写。每行写一个字体名称。 例如: Droid Sans', 'ABBC3_GOOGLE_FONTS_NOTE' => '要使用此特性,请在‘负载设置’页面,设置“允许使用第三方内容分发网络”。', 'ABBC3_INVALID_FONT' => '无效的字体名称 “%s”', @@ -42,7 +42,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => '安装可选的 phpBB Media Embed 扩展,以访问内嵌富媒体内容的设置和管理选项。', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed 扩展没有安装。 %2$s Download %3$s。', + 0 => 'phpBB Media Embed 扩展没有安装。 %2$s。', 1 => 'phpBB Media Embed 扩展已安装。 在帖子选项卡下设置。' ], 'PNG' => 'PNG', diff --git a/language/zh_cmn_hant/acp_abbc3.php b/language/zh_cmn_hant/acp_abbc3.php index 8dcf960f..025a4654 100644 --- a/language/zh_cmn_hant/acp_abbc3.php +++ b/language/zh_cmn_hant/acp_abbc3.php @@ -22,7 +22,7 @@ } $lang = array_merge($lang, array( - 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %1$s ABBC3 FAQ %2$s.', + 'ABBC3_SETTINGS_EXPLAIN' => 'Here you can configure settings for Advanced BBCode Box. For information about customizing the icon bar, visit the %s.', 'ABBC3_GOOGLE_FONTS_INFO' => 'Add Google Fonts to the [font] BBCode. Use exact spelling and case sensitivity. Place each font name on a separate line.', 'ABBC3_GOOGLE_FONTS_NOTE' => '“Allow usage of third party content delivery networks” must be enabled under “Load settings” to use this feature.', 'ABBC3_INVALID_FONT' => 'Invalid font name for “%s”', @@ -41,7 +41,7 @@ 'ABBC3_BBVIDEO' => 'BBVideo', 'ABBC3_BBVIDEO_EXPLAIN' => 'Install the optional phpBB Media Embed extension to access settings and management options for embedded rich media content.', 'ABBC3_MEDIA_EMBED_INSTALL' => [ - 0 => 'phpBB Media Embed extension is not installed. %2$s Download %3$s.', + 0 => 'phpBB Media Embed extension is not installed. %2$s.', 1 => 'phpBB Media Embed extension is installed. Settings are accessible under the Posting tab.' ], 'PNG' => 'PNG', diff --git a/package-lock.json b/package-lock.json index fbfac0e4..9c852bed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,40 +4,42 @@ "requires": true, "packages": { "": { - "name": "abbc3", "license": "GPL-2.0", "dependencies": { "tablednd": "^1.0.5" }, "devDependencies": { "copyfiles": "^2.4.1", - "eslint": "^8.1.0", + "eslint": "^8.57.1", "jshint": "^2.13.1", "jshint-stylish": "^2.0.1", "npm-run-all": "^4.1.5", - "npm-watch": "^0.11.0", + "npm-watch": "^0.13.0", "uglify-js": "^3.14.3" } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "dev": true, "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -67,21 +69,22 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -106,6 +109,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -150,9 +154,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -320,12 +324,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -494,9 +498,9 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -565,12 +569,12 @@ "dev": true }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -835,9 +839,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, "engines": { "node": ">=6" @@ -856,16 +860,17 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -956,9 +961,9 @@ } }, "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -1046,9 +1051,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -1207,6 +1212,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -1412,9 +1418,9 @@ } }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "engines": { "node": ">= 4" @@ -1455,6 +1461,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, "dependencies": { "once": "^1.3.0", @@ -1565,12 +1572,15 @@ } }, "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "dev": true, "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2114,9 +2124,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "node_modules/natural-compare": { @@ -2132,18 +2142,18 @@ "dev": true }, "node_modules/nodemon": { - "version": "2.0.22", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", - "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz", + "integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==", "dev": true, "dependencies": { "chokidar": "^3.5.2", - "debug": "^3.2.7", + "debug": "^4", "ignore-by-default": "^1.0.1", "minimatch": "^3.1.2", "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", "supports-color": "^5.5.0", "touch": "^3.1.0", "undefsafe": "^2.0.5" @@ -2152,22 +2162,13 @@ "nodemon": "bin/nodemon.js" }, "engines": { - "node": ">=8.10.0" + "node": ">=10" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/nodemon" } }, - "node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, "node_modules/nodemon/node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -2177,6 +2178,18 @@ "node": ">=4" } }, + "node_modules/nodemon/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/nodemon/node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -2387,12 +2400,12 @@ } }, "node_modules/npm-watch": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.11.0.tgz", - "integrity": "sha512-wAOd0moNX2kSA2FNvt8+7ORwYaJpQ1ZoWjUYdb1bBCxq4nkWuU0IiJa9VpVxrj5Ks+FGXQd62OC/Bjk0aSr+dg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.13.0.tgz", + "integrity": "sha512-MYcgocqCzYA44feZhFoYj69FfSaO0EeRE1gcRcmPaXIpNhUMAhNJ1pwic2C4Hn0OPOQmZKSl90CPgmwvOsVhTg==", "dev": true, "dependencies": { - "nodemon": "^2.0.7", + "nodemon": "^3.0.1", "through2": "^4.0.2" }, "bin": { @@ -2432,10 +2445,13 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2736,15 +2752,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -2802,6 +2818,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { "glob": "^7.1.3" @@ -2987,24 +3004,27 @@ } }, "node_modules/simple-update-notifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", - "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", "dev": true, "dependencies": { - "semver": "~7.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8.10.0" + "node": ">=10" } }, "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "bin": { "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/spdx-correct": { @@ -3034,9 +3054,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", - "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", "dev": true }, "node_modules/string_decoder": { @@ -3392,9 +3412,9 @@ } }, "node_modules/uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "dev": true, "bin": { "uglifyjs": "bin/uglifyjs" diff --git a/package.json b/package.json index 76fe0d81..dc70c117 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ }, "devDependencies": { "copyfiles": "^2.4.1", - "eslint": "^8.1.0", + "eslint": "^8.57.1", "jshint": "^2.13.1", "jshint-stylish": "^2.0.1", "npm-run-all": "^4.1.5", - "npm-watch": "^0.11.0", + "npm-watch": "^0.13.0", "uglify-js": "^3.14.3" }, "watch": { diff --git a/tests/acp/acp_test.php b/tests/acp/acp_test.php index 9a32ba9e..32506e45 100644 --- a/tests/acp/acp_test.php +++ b/tests/acp/acp_test.php @@ -180,11 +180,12 @@ public function test_main_save_error() public function save_google_fonts_data() { return [ - ['', '[]', E_USER_NOTICE, 'CONFIG_UPDATED'], + ['', '', E_USER_NOTICE, 'CONFIG_UPDATED'], ['Droid Sans', '["Droid Sans"]', E_USER_NOTICE, 'CONFIG_UPDATED'], ["Droid Sans\nRoboto", '["Droid Sans","Roboto"]', E_USER_NOTICE, 'CONFIG_UPDATED'], + ["\n\nDroid Sans\n\nRoboto\n\n", '["Droid Sans","Roboto"]', E_USER_NOTICE, 'CONFIG_UPDATED'], ["Droid Sans\nRoboto\nMac Donald", '["Droid Sans","Roboto"]', E_USER_WARNING, 'ABBC3_INVALID_FONT'], - ['Mac Donald', '[]', E_USER_WARNING, 'ABBC3_INVALID_FONT'], + ['Mac Donald', '', E_USER_WARNING, 'ABBC3_INVALID_FONT'], ]; } @@ -214,13 +215,13 @@ public function test_save_google_fonts($input, $expected, $error, $error_message ['abbc3_google_fonts', '', false, \phpbb\request\request_interface::REQUEST, $input], ]); - $this->expectException('\RuntimeException'); - $this->expectExceptionCode($error); - $this->expectExceptionMessage($error_message); - - $this->acp_controller->handle(); - - $this->assertSame($expected, $this->config_text->get('abbc3_google_fonts')); + try { + $this->acp_controller->handle(); + } catch (\RuntimeException $e) { + $this->assertSame($expected, $this->config_text->get('abbc3_google_fonts')); + $this->assertEquals($error, $e->getCode()); + $this->assertEquals($error_message, $e->getMessage()); + } } public function test_info()