Skip to content

Commit

Permalink
Merge branch '3.0' into 3
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Mar 30, 2023
2 parents e5372b1 + 8fb73e8 commit ece5a9e
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 6 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Monday at 12:20pm UTC
schedule:
- cron: '20 12 * * 1'

jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
16 changes: 16 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 12:20 PM UTC, only on Monday and Tuesday
schedule:
- cron: '20 12 * * 1,2'

jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1
15 changes: 15 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[main]
host = https://www.transifex.com

[o:silverstripe:p:silverstripe-cwp-agency-extensions:r:master]
file_filter = lang/<lang>.yml
source_file = lang/en.yml
source_lang = en
type = YML

[o:silverstripe:p:silverstripe-cwp-agency-extensions:r:master-js]
file_filter = client/lang/src/<lang>.json
source_file = client/lang/src/en.json
source_lang = en
type = KEYVALUEJSON

15 changes: 15 additions & 0 deletions client/lang/en.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// This file was generated by silverstripe/tx-translator from client/lang/src/en.json.
// See https://github.com/silverstripe/silverstripe-tx-translator for details
if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
if (typeof(console) !== 'undefined') { // eslint-disable-line no-console
console.error('Class ss.i18n not defined'); // eslint-disable-line no-console
}
} else {
ss.i18n.addDictionary('en', {
"ColorPickerField.EMPTY_TITLE": "None",
"ColorPickerField.SEARCH_BLOCKS": "Search colours",
"FontPickerField.EMPTY_TITLE": "None",
"FontPickerField.PREVIEW_FONT_SENTENCE": "The quick brown fox jumps over the lazy dog.",
"FontPickerField.PREVIEW_FONT_ALPHABET": "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz 0123456789 - = _ + < > ? / . , : \""
});
}
7 changes: 7 additions & 0 deletions client/lang/src/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ColorPickerField.EMPTY_TITLE": "None",
"ColorPickerField.SEARCH_BLOCKS": "Search colours",
"FontPickerField.EMPTY_TITLE": "None",
"FontPickerField.PREVIEW_FONT_SENTENCE": "The quick brown fox jumps over the lazy dog.",
"FontPickerField.PREVIEW_FONT_ALPHABET": "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz 0123456789 - = _ + < > ? / . , : \""
}
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
},
"extra": {
"expose": [
"client/dist"
"thirdparty/TinyMCE-FontAwesome-Plugin/fontawesome",
"client/dist",
"client/lang"
]
},
"minimum-stability": "dev",
Expand Down
1 change: 1 addition & 0 deletions lang/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ en:
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionADDNEW: 'Add new'
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionNOTE: 'NOTE: Carousel functionality will automatically be loaded when 2 or more items are added below'
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE: Hero/Carousel
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE_NOTE: 'Used by screen readers'
CwpConfig:
AppleIconField144: 'Apple Touch Web Clip and Windows 8 Tile Icon (dimensions of 144x144, PNG format)'
FooterLogoLinkDesc: 'Please include the protocol (ie, http:// or https://) unless it is an internal link.'
Expand Down
33 changes: 33 additions & 0 deletions lang/eo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ eo:
CWP\AgencyExtensions\Model\CarouselItem:
PLURALNAME: 'Karuselaj elementoj'
SINGULARNAME: 'Karusela elemento'
CONTENT_HELPTIP: 'Rekomendo: Uzu malpli ol 50 vortojn. Por karuselaj lumbildoj, uzu similan kvanton da enhavo kiel aliaj elementoj, por certigi, ke la karusela alto ne variu.'
IMAGE_HELPTIP: 'Rekomendo: Uzu altdistingivajn bildojn kun pli ol 1600x900 bilderoj.'
PLURALS:
one: 'Unu karusela elemento'
other: '{count} karuselaj elementoj'
PRIMARYCALLTOACTION: 'Unuaranga agvoka ligilo'
SECONDARYCALLTOACTION: 'Duaranga agvoka ligilo'
CwpCarousel:
ArchivedField: 'Ĉu enarkivigi ĉi tiun karuselan elementon?'
LinkField: Ligilo
Expand All @@ -22,3 +29,29 @@ eo:
LogoRetinaUploadField: 'Tredistingiva bildsimbolo, aperonta ĉe la maldekstra supro (rekomeninda dufoje la alton kaj larĝon de la normala bildsimbolo)'
LogoUploadField: 'Bildsimbolo, aperonta ĉe la maldekstra supro'
LogosIconsTab: Bildsimboloj
AccentColor: 'Emfaza koloro'
AccentColorDescription: 'Influas la koloron de butonoj, aktualaj navigan elementoj, ktp. Bonvolu certigi sufiĉan kontraston kun fonaj koloroj.'
CarouselBackground: 'Karusela fono'
CarouselBackgroundDescription: 'La fona koloro de la karuselo kiam bildo ne agordita.'
FooterBackground: 'Paĝopieda fono'
FooterLogoSecondaryDescField: 'Priskribo de duaranga paĝopieda emblemo'
FooterLogoSecondaryField: 'Duaranga paĝopieda emblemo, aperota en la paĝopiedo.'
FooterLogoSecondaryLinkField: 'Ligilo al duaranga paĝopieda emblemo'
HeaderBackground: 'Paĝokapa fono'
MainFontFamily: 'Ĉefa tipara familio'
NavigationBarBackground: 'Fono de naviga breto'
TextLinkColor: 'Koloro de teksta ligilo'
CWP:
SITECONFIG.EmptySearch: 'Teksto vidigota kiam mankas serĉpeto'
SITECONFIG.NoResult: 'Teksto vidigota kiam mankas rezultoj'
CarouselPageExtension:
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionADDNEW: 'Aldoni novan'
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionNOTE: 'NOTU: Karusela funkciado aŭtomate ŝarĝiĝos kiam 2 aŭ pliaj elementoj aldoniĝos sube'
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE: Heroo/Karuselo
php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE_NOTE: 'Uzota de ekranlegiloj'
CwpConfig:
AppleIconField144: 'Apple Touch Web Clip kaj Windows 8 Tile emblemo (dimensioj 144x144, PNG formato)'
FooterLogoLinkDesc: 'Bonvolu inkludi la protokolon (t.e. http:// aŭ https://) krom se ĝi estas interna ligilo.'
FooterLogoRetinaField: 'Altdistingiva paĝopieda emblemo (rekomendite duoble la alton kaj larĝon de la ordinara paĝopieda emblemo)'
FooterLogoSecondaryLinkDesc: 'Bonvolu inkludi la protokolon (t.e. http:// aŭ https://) krom se ĝi estas interna ligilo.'
LogoRetinaUploadField: 'Altdistingiva paĝopieda emblemo ĉe la supro maldekstra (rekomendite duoble la alton kaj larĝon de la ordinara emblemo)'

0 comments on commit ece5a9e

Please sign in to comment.