Skip to content

Commit

Permalink
Prepare for Moodle 4.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
lucaboesch committed Apr 21, 2024
1 parent e701d5a commit 3b895c7
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 89 deletions.
30 changes: 21 additions & 9 deletions .github/workflows/moodle-plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

services:
postgres:
Expand All @@ -30,6 +30,24 @@ jobs:
fail-fast: false
matrix:
include:
- php: '8.1'
moodle-branch: 'MOODLE_404_STABLE'
database: pgsql
- php: '8.2'
moodle-branch: 'MOODLE_404_STABLE'
database: pgsql
- php: '8.3'
moodle-branch: 'MOODLE_404_STABLE'
database: pgsql
- php: '8.1'
moodle-branch: 'MOODLE_404_STABLE'
database: mariadb
- php: '8.2'
moodle-branch: 'MOODLE_404_STABLE'
database: mariadb
- php: '8.3'
moodle-branch: 'MOODLE_404_STABLE'
database: mariadb
- php: '8.0'
moodle-branch: 'MOODLE_403_STABLE'
database: pgsql
Expand Down Expand Up @@ -81,7 +99,7 @@ jobs:

steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: plugin

Expand All @@ -95,7 +113,7 @@ jobs:

- name: Initialise moodle-plugin-ci
run: |
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^4
echo $(cd ci/bin; pwd) >> $GITHUB_PATH
echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
sudo locale-gen en_AU.UTF-8
Expand All @@ -112,11 +130,6 @@ jobs:
if: ${{ always() }}
run: moodle-plugin-ci phplint

- name: PHP Copy/Paste Detector
continue-on-error: true # This step will show errors but will not fail
if: ${{ always() }}
run: moodle-plugin-ci phpcpd

- name: PHP Mess Detector
continue-on-error: true # This step will show errors but will not fail
if: ${{ always() }}
Expand Down Expand Up @@ -153,4 +166,3 @@ jobs:
- name: Behat features
if: ${{ always() }}
run: moodle-plugin-ci behat --profile chrome --auto-rerun 0

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ moodle-tiny_fontcolor
========================

![Release](https://img.shields.io/badge/Release-0.4-blue.svg)
[![Moodle Plugin CI](https://github.com/bfh/moodle-tiny_fontcolor/workflows/Moodle%20Plugin%20CI/badge.svg?branch=master)](https://github.com/bfh/moodle-tiny_fontcolor/actions?query=workflow%3A%22Moodle+Plugin+CI%22+branch%3Amaster)
[![PHP Support](https://img.shields.io/badge/php-7.4--8.2-blue)](https://github.com/bfh/moodle-tiny_fontcolor/action)
[![Moodle Support](https://img.shields.io/badge/Moodle-4.1+-orange)](https://github.com/bfh/moodle-tiny_fontcolor/actions)
[![Moodle Plugin CI](https://github.com/bfh/moodle-tiny_fontcolor/workflows/Moodle%20Plugin%20CI/badge.svg?branch=main)](https://github.com/bfh/moodle-tiny_fontcolor/actions?query=workflow%3A%22Moodle+Plugin+CI%22+branch%3Amain)
[![PHP Support](https://img.shields.io/badge/php-7.4--8.3-blue)](https://github.com/bfh/moodle-tiny_fontcolor/action)
[![Moodle Support](https://img.shields.io/badge/Moodle-4.1--4.4+-orange)](https://github.com/bfh/moodle-tiny_fontcolor/actions)
[![License GPL-3.0](https://img.shields.io/github/license/bfh/moodle-tiny_fontcolor?color=lightgrey)](https://github.com/bfh/moodle-tiny_fontcolor/blob/main/LICENSE)
[![GitHub contributors](https://img.shields.io/github/contributors/bfh/moodle-tiny_fontcolor)](https://github.com/bfh/moodle-tiny_fontcolor/graphs/contributors)

Expand Down Expand Up @@ -61,7 +61,7 @@ over the appropriate color square.

## Version History

## Current Master
## Current Main
- Add json for a comprehensive color scheme (thanks to Joseph Rézeau).

### 0.4
Expand Down
2 changes: 1 addition & 1 deletion classes/privacy/provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class provider implements \core_privacy\local\metadata\null_provider {
*
* @return string
*/
public static function get_reason() : string {
public static function get_reason(): string {
return 'privacy:metadata';
}
}
54 changes: 0 additions & 54 deletions lang/de/tiny_fontcolor.php

This file was deleted.

33 changes: 15 additions & 18 deletions lang/en/tiny_fontcolor.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,29 @@

defined('MOODLE_INTERNAL') || die();

$string['backgroundcolorpicker'] = 'Colour picker for text background colour';
$string['backgroundcolorpicker_desc'] = 'Should a colour picker for text background color be available';
$string['backgroundcolors'] = 'Available text background colours';
$string['backgroundcolors_desc'] = 'A list of colour names on the left and their RGB colour code, e.g. "#000000". The values are the colorus displayed in the dialogue to choose from. The names serve as as the tooltip when hovering over the colours.';
$string['btnBgcolor'] = 'Text background colour';
$string['btnFgcolor'] = 'Text foreground colour';
$string['menuItemBgcolor'] = 'Text background colour';
$string['menuItemFgcolor'] = 'Text foreground colour';
$string['customColor'] = 'Custom colour';
$string['removeColor'] = 'Remove colour';
$string['colorPickerTitle'] = 'Colour picker';
$string['colorPickerColor'] = 'Colour';
$string['colorPickerSave'] = 'Apply';
$string['colorPickerCancel'] = 'Cancel';
$string['colorPickerColor'] = 'Colour';
$string['colorPickerErrHexCode'] = 'Invalid hex colour code: {0}';
$string['colorPickerErrRgbCode'] = 'Invalid rgb value: {0}';
$string['colorPickerSave'] = 'Apply';
$string['colorPickerTitle'] = 'Colour picker';
$string['customColor'] = 'Custom colour';
$string['helplinktext'] = 'Tiny font colour';
$string['menuItemBgcolor'] = 'Text background colour';
$string['menuItemFgcolor'] = 'Text foreground colour';
$string['placeholdercolorname'] = 'Descriptive name of colour';
$string['placeholdercolorvalue'] = 'Hex code of colour value';
$string['pluginname'] = 'Tiny font colour';
$string['privacy:metadata'] = 'Tiny font colour does not store any personal data';
$string['privacy:metadata'] = 'The Tiny font color plugin does not store any personal data about any user.';
$string['removeColor'] = 'Remove colour';
$string['settings'] = 'Tiny text colour/text background colour settings';
$string['textcolorpicker'] = 'Colour picker for text colour';
$string['textcolorpicker_desc'] = 'Should a colour picker for text colour be available';
$string['backgroundcolorpicker'] = 'Colour picker for text background colour';
$string['backgroundcolorpicker_desc'] = 'Should a colour picker for text background color be available';
$string['backgroundcolors'] = 'Available text background colours';
$string['backgroundcolors_desc'] = 'A list of colour names on the left and their RGB colour code, e.g. "#000000". The values are the colorus displayed in the dialogue to choose from. The names serve as as the tooltip when hovering over the colours.';
$string['textcolors'] = 'Available text colours';
$string['textcolors_desc'] = 'A list of colour names on the left and their RGB colour code, e.g. "#000000". The values are the colours displayed in the dialogue to choose from. The names serve as as the tooltip when hovering over the colours.';
$string['placeholdercolorname'] = 'Descriptive name of colour';
$string['placeholdercolorvalue'] = 'Hex code of colour value';
$string['helplinktext'] = 'Tiny font colour';

// PRIVACY.
$string['privacy:metadata'] = 'The Tiny font color plugin does not store any personal data about any user.';
2 changes: 1 addition & 1 deletion settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

defined('MOODLE_INTERNAL') || die();

use \tiny_fontcolor\admin_setting_colorlist;
use tiny_fontcolor\admin_setting_colorlist;

$ADMIN->add('editortiny', new admin_category('tiny_fontcolor', new lang_string('pluginname', 'tiny_fontcolor')));

Expand Down
5 changes: 3 additions & 2 deletions version.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
defined('MOODLE_INTERNAL') || die();

$plugin->component = 'tiny_fontcolor';
$plugin->release = '0.4';
$plugin->version = 2023101000;
$plugin->release = '0.5';
$plugin->version = 2024042200;
$plugin->requires = 2022112800;
$plugin->maturity = MATURITY_RC;
$plugin->supported = [401, 404];

0 comments on commit 3b895c7

Please sign in to comment.