diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 4b16f597e..35450e2cf 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -2,11 +2,11 @@ github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username +open_collective: smw ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +custom: ['https://www.semantic-mediawiki.org/wiki/Sponsorship'] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6bde4ffc..16e149f7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: matrix: include: - mediawiki_version: '1.35' - smw_version: '4.1.2' + smw_version: '4.1.3' php_version: 7.4 database_type: mysql database_image: "mysql:5.7" @@ -35,14 +35,14 @@ jobs: smw_version: dev-master php_version: 8.1 database_type: mysql - database_image: "mariadb:latest" + database_image: "mariadb:10" coverage: false experimental: true # - mediawiki_version: '1.40' # smw_version: dev-master # php_version: 8.1 # database_type: mysql -# database_image: "mariadb:latest" +# database_image: "mariadb:10" # coverage: false # experimental: true @@ -72,7 +72,7 @@ jobs: if: matrix.coverage == true - name: Upload code coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: coverage/php/coverage.xml if: matrix.coverage == true diff --git a/Makefile b/Makefile index 72e38bcc3..edf9bbb8b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ DB_TYPE?=sqlite DB_IMAGE?="" # extensions -SMW_VERSION?=4.1.2 +SMW_VERSION?=4.1.3 PF_VERSION ?= 5.5.1 SFS_VERSION ?= 4.0.0-beta MM_VERSION ?= 3.1.0 diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index f01716404..abddd2741 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,15 @@ These are the release notes for the [Semantic Result Formats](https://www.semantic-mediawiki.org/wiki/Extension:Semantic_Result_Formats) (a.k.a SRF) MediaWiki extension. +## SRF 4.2.1 + +Released on March 13, 2024. +* [815](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/815) Document graphfields parameter to the graph format (by @alex-mashin) +* [806](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/806) Added required resources for the bubble chare to the jqplotchart format (by@YOUR1) +* [805](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/805) Fixed issue creating a lot of log spam (by @sophivorus) +* [793](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/793) Fixed issue with the slidesToShow paramter to the carousel format (by @thomas-topway-it) +* Further improvements and fixes to the Continuous Integration (CI) (by [gesinn.it](https://gesinn.it)) +* Updated translations (by translatewiki.net community) + ## SRF 4.2.0 Released on December 7, 2023. @@ -14,6 +24,7 @@ Released on December 7, 2023. * Further improvements of datatables format: [775](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/775), [774](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/774), [773](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/773) (by @thomas-topway-it for ([KM-A](https://km-a.net)) * Fixed NONCEs on inline scripts in order to support CSP-Header * Fixed GraphViz extension support in the Graph format (by [Professional Wiki](https://professional.wiki)) +* Updated translations (by translatewiki.net community) ## SRF 4.1.0 @@ -22,6 +33,7 @@ Released on October 12, 2023. * [Complete rewrite of datatables format](https://www.semantic-mediawiki.org/w/index.php?title=Help:Datatables_format) (by @thomas-topway-it, [KM-A](https://knowledge.wiki)). [761](https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/761), [750](https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/750), [725](https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/725), [571](https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/571), [721](https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/721)... * Fixed jqplotchart label error (by @thomas-topway-it) * Fixed preferred label issue in eventcalendar (by @thomas-topway-it) +* Updated translations (by translatewiki.net community) ## SRF 4.0.2 @@ -36,6 +48,7 @@ Released on March 9, 2023. * Solved potential `symfony/css-selector` package conflict (by @rvogel) * Bump moment from 2.24.0 to 2.29.2 in /formats/filtered * Bump tar from 4.4.8 to 4.4.19 in /formats/filtered +* Updated translations (by translatewiki.net community) ## SRF 4.0.1 @@ -52,6 +65,7 @@ Released on January 25, 2022. * [Filtered] added "list view userparam" (by [gesinn.it](https://gesinn.it)) * [Gallery] added "captiontemplate" parameter to allow wrapping of image captions with a template * [GraphViz] fields of data type other than 'page' are now displayed not as separate nodes connected by edges but as parts of labels of nodes of the type 'record' and similar +* Updated translations (by translatewiki.net community) ## SRF 3.2.0 diff --git a/Resources.php b/Resources.php index d1e99e97f..8fa5a6638 100644 --- a/Resources.php +++ b/Resources.php @@ -456,6 +456,7 @@ // Chart specific declarations 'ext.srf.jqplot.chart' => $formatModule + [ 'scripts' => [ + 'jqplot/resources/ext.srf.jqplot.chart.bubble.js', 'jqplot/resources/ext.srf.jqplot.chart.bar.js', 'jqplot/resources/ext.srf.jqplot.chart.pie.js', 'jqplot/resources/ext.srf.jqplot.chart.js', diff --git a/SemanticResultFormats.php b/SemanticResultFormats.php index be0cdd279..4b3a380bb 100644 --- a/SemanticResultFormats.php +++ b/SemanticResultFormats.php @@ -45,8 +45,6 @@ public static function initExtension( $credits = [] ) { $GLOBALS['srfgIP'] = __DIR__; $GLOBALS['wgResourceModules'] = array_merge( $GLOBALS['wgResourceModules'], include __DIR__ . "/Resources.php" ); - - self::registerHooks(); } /** @@ -93,6 +91,8 @@ public static function onExtensionFunction() { ); } } + self::registerHooks(); + $hookContainer = MediaWikiServices::getInstance()->getHookContainer(); // Admin Links hook needs to be called in a delayed way so that it diff --git a/build b/build index 91d00523e..9eb0faa27 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 91d00523e3a9e5b7b334562d6a7aed5a300c3787 +Subproject commit 9eb0faa2760621cd548362d354566815fd3f089b diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index b33fb581d..e4188bcfe 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -17,12 +17,26 @@ minimum requirements are indicated in bold. Semantic MediaWiki Release status + + 4.2.x + 7.3.0 - 8.0.x+ + 1.35 - 1.37+ + 3.2.x - 4.0+ + Stable release + + + 4.1.x + 7.3.0 - 8.0.x+ + 1.35 - 1.37+ + 3.2.x - 4.0+ + Obsolete release, no support + 4.0.x 7.3.0 - 8.0.x+ 1.35 - 1.37+ 3.2.x - 4.0+ - Stable release + Obsolete release, no support 3.2.x diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 7cba71ecb..ec111501c 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -20,7 +20,7 @@ create one and add the following content to it: ``` { "require": { - "mediawiki/semantic-result-formats": "~4.0" + "mediawiki/semantic-result-formats": "~4.2" } } ``` @@ -28,7 +28,7 @@ create one and add the following content to it: If you already have a "composer.local.json" file add the following line to the end of the "require" section in your file: - "mediawiki/semantic-result-formats": "~4.0" + "mediawiki/semantic-result-formats": "~4.2" Remember to add a comma to the end of the preceding line in this section. diff --git a/extension.json b/extension.json index 5490e2269..a242981c9 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "SemanticResultFormats", - "version": "4.2.0", + "version": "4.2.1", "author": [ "James Hong Kong", "Stephan Gambke", diff --git a/formats/carousel/Carousel.php b/formats/carousel/Carousel.php index f7cd1e084..c17c3419b 100644 --- a/formats/carousel/Carousel.php +++ b/formats/carousel/Carousel.php @@ -4,7 +4,7 @@ * * @license GPL-2.0-or-later * - * @author thomas-topway-it + * @author thomas-topway-it for KM-A */ namespace SRF; @@ -261,10 +261,12 @@ public function getParamDefinitions( array $definitions ) { 'default' => "window", ]; - $params['slick-responsive'] = [ - 'message' => 'srf-paramdesc-carousel-slick-option', - 'default' => null, - ]; + // @see https://github.com/kenwheeler/slick/#responsive-option-example + // $params['slick-responsive'] = [ + // 'type' => 'string', + // 'message' => 'srf-paramdesc-carousel-slick-option', + // 'default' => null, + // ]; $params['slick-rows'] = [ 'type' => 'integer', @@ -398,16 +400,12 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) { $this->isHTML = true; + // SMWOutputs::requireResource( 'ext.srf.carousel' ); $resourceFormatter->registerResources( [ 'ext.srf.carousel', 'ext.srf.carousel.module' ] ); - // or ... - // SMWOutputs::requireResource( 'ext.srf.carousel' ); - - // print_r($data); - /* * first retrieve explicitly set properties: * titleproperty, captionproperty, imageproperty, linkproperty @@ -422,25 +420,7 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) { $printReqLabels[ $value['label'] ] = $value['typeid']; } - $styleAttr = [ 'width', 'height' ]; - $style = []; - foreach( $styleAttr as $attr ) { - if ( !empty( $this->params[$attr] ) ) { - $style[ $attr ] = "$attr: " . $this->params[$attr]; - } - } - - if ( !array_key_exists( 'width', $style ) ) { - $style[ 'width' ] = 'width: 100%'; - } - - $styleImg = array_map( static function ( $value ) { - // return 'max-' . $value; - return $value; - }, $style ); - - $styleImg[] = 'object-fit: cover'; - $styleImg = implode( '; ', $styleImg ); + $inlineStyles = $this->getInlineStyles(); $parser = MediaWikiServices::getInstance()->getParser(); $items = []; @@ -526,12 +506,17 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) { $captionValue = $parser->recursiveTagParse( $captionValue ); } - $innerContent = Html::rawElement( 'img', [ - 'src' => $imageValue, - 'alt' => ( $titleValue ?? $captionValue ? strip_tags( $captionValue ) : $title_->getText() ), - 'style' => $styleImg, - 'class' => "slick-slide-content img" - ] ); + $imgAttr = [ + 'src' => $imageValue, + 'alt' => ( $titleValue ?? $captionValue ? strip_tags( $captionValue ) : $title_->getText() ), + 'class' => "slick-slide-content img" + ]; + + if ( !empty( $inlineStyles['img'] ) ) { + $imgAttr['style'] = $inlineStyles['img']; + } + + $innerContent = Html::rawElement( 'img', $imgAttr ); if ( $titleValue || $captionValue ) { $innerContent .= Html::rawElement( 'div', [ 'class' => 'slick-slide-content caption' ], @@ -552,9 +537,9 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) { } // loop through pages $attr = [ 'class' => 'slick-slider' . ( empty( $this->params['class'] ) ? '' : ' ' . $this->params['class'] ) ]; - - if ( count( $style ) ) { - $attr['style'] = implode( '; ', $style ); + + if ( !empty( $inlineStyles['div'] ) ) { + $attr['style'] = $inlineStyles['div']; } $slick_attr = []; @@ -572,7 +557,47 @@ protected function getResultText( SMWQueryResult $results, $outputmode ) { implode( $items ) ); } + + /** + * @return array + */ + private function getInlineStyles() { + if ( empty( $this->params['width'] ) ) { + $this->params['width'] = '100%'; + } + preg_match( '/^(\d+)(.+)?$/', $this->params['width'], $match ); + $styleImg = [ 'object-fit: cover' ]; + + $absoluteUnits = [ 'cm', 'mm', 'in', 'px', 'pt', 'pc' ]; + $slidestoshow = $this->params['slick-slidestoshow']; + + // @see https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/784 + if ( !empty( $slidestoshow ) && is_int( $slidestoshow ) && !empty( $match[1] ) ) { + if ( empty( $match[2] ) ) { + $match[2] = 'px'; + } + $styleImg[] = 'max-width:' . ( in_array( $match[2], $absoluteUnits ) ? + ( $match[1] / $slidestoshow ) . $match[2] + : '100%' ); + } + + $styleAttr = [ 'width', 'height' ]; + $style = []; + foreach( $styleAttr as $attr ) { + if ( !empty( $this->params[$attr] ) ) { + $style[ $attr ] = "$attr: " . $this->params[$attr]; + } + } + + return [ 'div' => implode( '; ', $style ), + 'img' => implode( '; ', $styleImg ) ]; + } + + /** + * @param array $array + * @return string|null + */ protected function getFirstValid( $array ) { // *** or use array_filter with no arguments, then // retrieve the first entry @@ -584,6 +609,10 @@ protected function getFirstValid( $array ) { return null; } + /** + * @param array $value + * @return string|null + */ protected function getImage( $value ) { if ( !is_array( $value ) || !array_key_exists( 'fullurl', $value ) || $value['namespace'] !== NS_FILE ) { return null; @@ -601,4 +630,3 @@ protected function getImage( $value ) { } } - diff --git a/formats/carousel/resources/ext.srf.formats.carousel.css b/formats/carousel/resources/ext.srf.formats.carousel.css index 86d514965..3a0d6a5b2 100644 --- a/formats/carousel/resources/ext.srf.formats.carousel.css +++ b/formats/carousel/resources/ext.srf.formats.carousel.css @@ -1,7 +1,7 @@ .slick-prev:before, .slick-next:before { - color: white; + color: #3498db; font-size: 30px; } @@ -26,6 +26,7 @@ background: rgba(0,0,0,.65); color: white; font-size: smaller; + width: 100%; } .slick-slide .slick-slide-content.caption-title { diff --git a/i18n/bn.json b/i18n/bn.json index 052c92ca8..4226fbad6 100644 --- a/i18n/bn.json +++ b/i18n/bn.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Aishik Rehman", "Bellayet", "Mohammed Galib Hasan", "Tahmid", @@ -12,7 +13,7 @@ "srf-module-loading": "লোড হচ্ছে...", "srf-paramdesc-height": "উচ্চতা", "srf-paramdesc-width": "প্রস্থ", - "srf-module-nomatch": "কোন মিল খুঁজে পাওয়া যায়নি", + "srf-module-nomatch": "কোনো মিল খুঁজে পাওয়া যায়নি", "srf-navigation-previous": "পূর্ববর্তী", "srf-ui-navigation-prev": "পূর্ব", "srf-ui-navigation-next": "পরবর্তী", diff --git a/i18n/ce.json b/i18n/ce.json index 3e1b4a301..33e31f2ee 100644 --- a/i18n/ce.json +++ b/i18n/ce.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Исмаил Садуев", "Умар" ] }, @@ -8,7 +9,7 @@ "srf-module-loading": "Чуйолуш...", "srf-paramdesc-height": "Локхалла", "srf-paramdesc-width": "Шоралла", - "srf-module-nomatch": "ХӀума цакарина", + "srf-module-nomatch": "Хӏумма а ца карийна", "srf-ui-common-label-source": "Хьост", "srf-ui-tooltip-title-options": "Параметраш", "srf-ui-tooltip-title-legend": "Легенда", diff --git a/i18n/fr.json b/i18n/fr.json index 2c76cbc74..cdccabbca 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -370,7 +370,7 @@ "srf-ui-mediaplayer-label-pause": "Pause", "srf-ui-mediaplayer-label-next": "Suivant", "srf-ui-mediaplayer-label-stop": "Arrêt", - "srf-ui-mediaplayer-label-mute": "Muet", + "srf-ui-mediaplayer-label-mute": "Mettre en sourdine", "srf-ui-mediaplayer-label-unmute": "Non muet", "srf-ui-mediaplayer-label-volume-max": "Volume max", "srf-ui-mediaplayer-label-shuffle": "Lecture aléatoire", diff --git a/i18n/he.json b/i18n/he.json index 1d75c466d..2b9f9e7e8 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -91,8 +91,8 @@ "srf_paramdesc_timelinestart": "שם המאפיין להגדרה בתור נקודת הזמן הראשונה", "srf_paramdesc_timelineend": "שם המאפיין להגדרת נקודת זמן שנייה", "srf_paramdesc_timelinesize": "גובה ציר הזמן", - "srf-timeline-allresults": "תוצאות נוספות עבור שאילתה זו.", - "srf-timeline-nojs": "יש לאפשר את JavaScript כדי לצפות בציר זמן אינטראקטיבי.", + "srf-timeline-allresults": "תוצאות נוספות עבור השאילתה הזאת.", + "srf-timeline-nojs": "יש להפעיל את JavaScript כדי לצפות בציר זמן אינטראקטיבי.", "srf_paramdesc_views": "התצוגות להצגה", "srf_paramdesc_facets": "קבוצת מאפיינים להצגה בראש כל דף", "srf_paramdesc_lens": "שם התבנית שמאפייני הדף יוצגו באמצעותה", @@ -153,7 +153,7 @@ "srf_paramdesc_fileextensions": "בעת שימוש בשם הקובץ ככיתוב, להציג גם את סיומת הקובץ", "srf_paramdesc_captionproperty": "השם של מאפיין סמנטי קיים בדפי השאילתה כדי לשמש ככיתוב", "srf-paramdesc-captiontemplate": "התבנית שתשמש לעיצוב גלריית כיתובי התמונה. היא מספקת ארגומנטים בעלי שם כמו 'imageraw', 'imagecaption' ו־'imageredirect'", - "srf_paramdesc_imageproperty": "שם של מאפיין סמנטי בדפי השאילתה המצביע על תמונות לשימוש. כאשר אפשרות זו מוגדרת, דפי השאילתה עצמם לא יוצגו כתמונות", + "srf_paramdesc_imageproperty": "שם של מאפיין סמנטי בדפי השאילתה המצביע על תמונות לשימוש. כאשר האפשרות הזאת מוגדרת, דפי השאילתה עצמם לא יוצגו כתמונות", "srf-paramdesc-redirects": "השם של מאפיין סמנטי קיים בדפי השאילתה שמכילים את היעד של ההפניה", "srf-paramdesc-navigation": "פריסת הבקרה של הניווט", "srf-paramdesc-overlay": "להפעיל כיסוי תמונה", diff --git a/i18n/mk.json b/i18n/mk.json index 421f40b32..45f00a90b 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -19,7 +19,7 @@ "srf-paramdesc-layout": "Распоред на располагање", "srf-paramdesc-height": "Висина", "srf-paramdesc-width": "Ширина", - "srf-paramdesc-class": "Укажување на дополнителна класа на каскадни стилски страници", + "srf-paramdesc-class": "Укажување на дополнителна класа на каскадни стилски табели", "srf-module-nomatch": "Нема совпаѓања", "srf-paramdesc-charttype": "Расположлив тип на дијаграм", "srf-navigation-previous": "Претходно", diff --git a/i18n/ru.json b/i18n/ru.json index d5414e6ef..98c0e4aaf 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -35,7 +35,7 @@ "prefs-srf-datatables-options": "Настройки DataTables", "srf-prefs-datatables-options-update-default": "Включить [https://www.semantic-mediawiki.org/wiki/Help:User_preferences#Automatic_updates автоматическое обновление] содержания при обновлении страницы", "srf-prefs-datatables-options-cache-default": "Включить [https://www.semantic-mediawiki.org/wiki/Help:User_preferences#Local_storage локальный том хранения], чтобы улучшить время отклика", - "srf-module-loading": "Загрузка...", + "srf-module-loading": "Загружается…", "srf-paramdesc-layout": "Доступен макет", "srf-paramdesc-height": "Высота", "srf-paramdesc-width": "Ширина", diff --git a/i18n/sl.json b/i18n/sl.json index 46b26cdeb..6fba0f53d 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -128,7 +128,7 @@ "srf-paramdesc-hidezeroes": "Na grafikonu skrij ničelne vrednosti", "srf-paramdesc-clicktarget": "Določite stran ali poizvedbeni niz kot cilj pri kliku koledarskega datuma.", "srf-paramdesc-includeend": "V večdnevne dogodke vključi končni datum", - "srf-ui-gridview-label-item": "Podatkovni element", + "srf-ui-gridview-label-item": "Podatkovni predmet", "srf-ui-gridview-label-value": "Podatkovna vrednost", "srf-ui-gridview-label-series": "Podatkovna serija", "srf-ui-gridview-label-chart-tab": "Grafikon", diff --git a/i18n/ta.json b/i18n/ta.json index d82916b6c..4d86443a9 100644 --- a/i18n/ta.json +++ b/i18n/ta.json @@ -13,18 +13,18 @@ "srf-paramdesc-width": "அகலம்", "srf-module-nomatch": "பொருத்தமானவைகள் ஒன்றும் காணப்படவில்லை.", "srf-paramdesc-charttype": "கிடைக்கும் வரைபட வகை", - "srf-navigation-previous": "முந்தைய", - "srf-ui-navigation-prev": "முந்தைய", + "srf-navigation-previous": "முந்திய", + "srf-ui-navigation-prev": "முந்திய", "srf-ui-navigation-next": "அடுத்தது", "srf-ui-common-label-source": "மூலம்", "srf-ui-common-label-datasource": "தரவு மூலம்", "srf-ui-common-label-request-object": "பொருளைக் கோரவும்", "srf-ui-common-label-help-section": "உதவிப் பகுதி", - "srf-ui-tooltip-title-options": "விருப்பத்தேர்வுகள்", + "srf-ui-tooltip-title-options": "தெரிவுகள்", "srf-ui-tooltip-title-scope": "நோக்கம்", "srf-ui-tooltip-title-filter": "வடிகட்டி", "srf-ui-common-label-paneview": "பக்க நோக்கு", - "srf-error-option-mix": "விருப்பத்தேர்வு ($1) இல்லை", + "srf-error-option-mix": "தெரிவு ($1) கிடையாது", "srfc_previousmonth": "கடந்த மாதம்", "srfc_nextmonth": "அடுத்த மாதம்", "srfc_today": "இன்று", @@ -53,7 +53,7 @@ "srf_paramdesc_perrow": "நெடுவரிசை ஒன்றிற்கு படங்களின் எண்ணிக்கை", "srf_paramdesc_widths": "படங்களின் அகலம்", "srf_paramdesc_heights": "படங்களின் உயரம்", - "srf-gallery-navigation-previous": "முந்தைய", + "srf-gallery-navigation-previous": "முந்திய", "srf-gallery-navigation-next": "அடுத்தது", "srf-paramdesc-graphname": "தலைப்பு", "srf-ui-datatables-label-conditions": "கட்டுப்பாடுகள்", @@ -64,7 +64,7 @@ "srf-ui-datatables-label-oPaginate-sFirst": "முதல்", "srf-ui-datatables-label-oPaginate-sLast": "இறுதி", "srf-ui-datatables-label-oPaginate-sNext": "அடுத்து", - "srf-ui-datatables-label-oPaginate-sPrevious": "முந்தைய", + "srf-ui-datatables-label-oPaginate-sPrevious": "முந்திய", "srf-paramdesc-listtype": "பட்டியல் வகையை குறிப்பிடவும்", "srf-ui-eventcalendar-label-today": "இன்று", "srf-ui-eventcalendar-label-month": "மாதம்", @@ -73,7 +73,7 @@ "srf-ui-eventcalendar-label-allday": "அனைத்து நாட்களும்", "srf-paramdesc-unit": "பகுதி", "srf-printername-media": "ஊடக இயக்கி", - "srf-ui-mediaplayer-label-previous": "முந்தைய", + "srf-ui-mediaplayer-label-previous": "முந்திய", "srf-ui-mediaplayer-label-play": "இயக்கு", "srf-ui-mediaplayer-label-pause": "இடைநிறுத்து", "srf-ui-mediaplayer-label-next": "அடுத்தது", diff --git a/src/Graph/GraphPrinter.php b/src/Graph/GraphPrinter.php index fc24eb782..b6453d425 100644 --- a/src/Graph/GraphPrinter.php +++ b/src/Graph/GraphPrinter.php @@ -341,14 +341,7 @@ public function getParamDefinitions( array $definitions ) { $params['graphfields'] = [ 'default' => false, - 'message' => 'srf-paramdesc-graph-fields', - 'manipluatedefault' => false, - 'type' => 'boolean' - ]; - - $params['graphfields'] = [ - 'default' => false, - 'message' => 'srf-paramdesc-graph-fields', + 'message' => 'srf-paramdesc-graphfields', 'manipluatedefault' => false, 'type' => 'boolean' ]; diff --git a/tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json b/tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json index c35802884..294cb0194 100644 --- a/tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json +++ b/tests/phpunit/Integration/JSONScript/TestCases/carousel-01.json @@ -52,7 +52,7 @@ "subject": "Test/Carousel/T.1", "assert-output": { "to-contain": [ - "
\"caption
title a
caption a
" + "
\"caption
title a
caption a
" ] } @@ -63,7 +63,7 @@ "subject": "Test/Carousel/T.2", "assert-output": { "to-contain": [ - "
\"abc\"
Carousel test
abc
" + "
\"abc\".*
Carousel test
abc
" ] } } diff --git a/tests/phpunit/Integration/JSONScript/TestCases/gallery-03.json b/tests/phpunit/Integration/JSONScript/TestCases/gallery-03.json index 67433ff7e..15624810f 100644 --- a/tests/phpunit/Integration/JSONScript/TestCases/gallery-03.json +++ b/tests/phpunit/Integration/JSONScript/TestCases/gallery-03.json @@ -50,7 +50,13 @@ "subject": "Example/Gallery-03/Q.1", "assert-output": { "to-contain": [ - "
" + "
1.35", + "redirect type is '_txt'" ] } }, @@ -60,7 +66,13 @@ "subject": "Example/Gallery-03/Q.2", "assert-output": { "to-contain": [ - "
" + "
1.35", + "redirect type is '_txt'" ] } }, @@ -70,7 +82,7 @@ "subject": "Example/Gallery-03/Q.3", "assert-output": { "to-contain": [ - "
" + "