From d84abc3a771625dff3943a064910029f835cc523 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:54:57 +1200 Subject: [PATCH 1/2] ENH Update translations (#118) --- lang/en.yml | 4 ++-- lang/eo.yml | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lang/en.yml b/lang/en.yml index ba4bcd7..1dad62a 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -7,6 +7,8 @@ en: LOGINFAILURE: 'Unfortunately we''re not able to log you in through RealMe right now. Please try again shortly.' SilverStripe\RealMe\Authenticator\MiniLoginForm: LOGINBUTTON: LoginAction + SilverStripe\RealMe\Extension\MemberExtension: + db_RealmeSPNameID: 'RealmeSP name ID' SilverStripe\RealMe\RealMeService: ERROR_AUTHNFAILED: 'You have chosen to leave RealMe.' ERROR_GENERAL: 'RealMe reported a serious application error. Please try again later. If the problem persists, please contact the RealMe Help Desk. From New Zealand: 0800 664 774 (toll free), from overseas dial +64 9 357 4468 (overseas call charges apply).' @@ -41,5 +43,3 @@ en: ERR_NOT_CLI: 'This task can only be run from the command-line, not in your browser.' OUPUT_PREFIX: 'Metadata XML is listed below for the ''{env}'' RealMe environment, this should be sent to the agency so they can pass it on to RealMe Operations staff' VALIDATION_SUCCESS: 'Validation succeeded, continuing with setup...' - SilverStripe\RealMe\Extension\MemberExtension: - db_RealmeSPNameID: 'RealmeSP name ID' diff --git a/lang/eo.yml b/lang/eo.yml index dd76e9d..96b85b9 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -3,6 +3,12 @@ eo: ASSERTLOGINBUTTON: 'Dividi viajn detalojn kun {orgname}' AUTHENTICATOR_NAME: RealMe-konto LOGINBUTTON: Ensaluti + SilverStripe\RealMe\Authenticator\LoginHandler: + LOGINFAILURE: 'Bedaŭrinde ni ne povas nun ensalutigi vin per RealMe. Bonvolu reprovi baldaŭ.' + SilverStripe\RealMe\Authenticator\MiniLoginForm: + LOGINBUTTON: LoginAction + SilverStripe\RealMe\Extension\MemberExtension: + db_RealmeSPNameID: 'RealmeSP nomo ID' SilverStripe\RealMe\RealMeService: ERROR_AUTHNFAILED: 'Vi elektis lasi je RealMe.' ERROR_GENERAL: 'RealMe sciigis pri grava aplikaĵa eraro. Bonvolu reprovi estonte. Se la problemo restos, bonvolu kontakti la helpejon de RealMe. El Nov-Zelando: 0800 664 774 (sen pagvoko), el eksterlando, +64 9 357 4468 (aplikiĝos alilandaj kostoj de pagvoko).' @@ -37,7 +43,3 @@ eo: ERR_NOT_CLI: 'Eblas ruli la taskon ĉe la komanda linio, ne per la TTT-legilo.' OUPUT_PREFIX: 'Metadatuma XML-dosiero estas listigita sube por la ''{env}'' RealMe-medio. Necesas sendi tion al la agentejo por ke ili transdonu ĝin al la stabo de RealMe.' VALIDATION_SUCCESS: 'Validigo sukcesis, agordado daŭras...' - SilverStripe\RealMe\Authenticator\LoginHandler: - LOGINFAILURE: 'Bedaŭrinde ni ne povas nun ensalutigi vin per RealMe. Bonvolu reprovi baldaŭ.' - SilverStripe\RealMe\Authenticator\MiniLoginForm: - LOGINBUTTON: LoginAction From c274a3bf6eacb3d8105d0b1d58be90ff809989cf Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 29 Aug 2023 15:13:34 +1200 Subject: [PATCH 2/2] MNT Run module-standardiser --- .github/workflows/keepalive.yml | 6 +++--- .github/workflows/merge-up.yml | 17 +++++++++++++++++ .github/workflows/update-js.yml | 17 +++++++++++++++++ LICENSE.md => LICENSE | 6 +++--- composer.json | 4 ++-- 5 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/merge-up.yml create mode 100644 .github/workflows/update-js.yml rename LICENSE.md => LICENSE (89%) diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4cf5fbb..089e1ee 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,10 +1,10 @@ name: Keepalive on: - workflow_dispatch: - # The 4th of every month at 10:50am UTC + # At 10:50 PM UTC, on day 27 of the month schedule: - - cron: '50 10 4 * *' + - cron: '50 22 27 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..eb850c3 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:30 PM UTC, only on Monday + schedule: + - cron: '30 12 * * 1' + workflow_dispatch: + +jobs: + merge-up: + name: Merge-up + # 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: Merge-up + uses: silverstripe/gha-merge-up@v1 diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml new file mode 100644 index 0000000..907a74e --- /dev/null +++ b/.github/workflows/update-js.yml @@ -0,0 +1,17 @@ +name: Update JS + +on: + workflow_dispatch: + # Run on a schedule of once per quarter + schedule: + - cron: '50 22 1 */3 *' + +jobs: + update-js: + name: Update JS + # 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: Update JS + uses: silverstripe/gha-update-js@v1 diff --git a/LICENSE.md b/LICENSE similarity index 89% rename from LICENSE.md rename to LICENSE index 3b12e11..5a0209f 100644 --- a/LICENSE.md +++ b/LICENSE @@ -1,6 +1,6 @@ Revised BSD License -Copyright (c) 2015, SilverStripe Ltd. +Copyright (c) 2015, Silverstripe Ltd. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of SilverStripe nor the names of its contributors + * Neither the name of Silverstripe nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -24,4 +24,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/composer.json b/composer.json index 7744ba9..2101189 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "onelogin/php-saml": "^4" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "extra": { @@ -45,4 +45,4 @@ "support": { "issues": "https://github.com/silverstripe/realme/issues" } -} \ No newline at end of file +}