diff --git a/source/connector-mobilizon/changelog.txt b/source/connector-mobilizon/changelog.txt index e11ebef..b47edcb 100644 --- a/source/connector-mobilizon/changelog.txt +++ b/source/connector-mobilizon/changelog.txt @@ -6,6 +6,7 @@ #### Deprecated #### Removed #### Fixed +- Improve translatability #### Security ### [0.4.0] - 2021-04-20 diff --git a/source/connector-mobilizon/includes/constants.php b/source/connector-mobilizon/includes/constants.php index 795f9ed..159460e 100644 --- a/source/connector-mobilizon/includes/constants.php +++ b/source/connector-mobilizon/includes/constants.php @@ -9,4 +9,3 @@ if (!defined('ABSPATH')) { const DEFAULT_EVENTS_COUNT = 5; const NAME = ''; const NICE_NAME = ''; -const TEXT_DOMAIN = ''; diff --git a/source/connector-mobilizon/includes/events-list-shortcut.php b/source/connector-mobilizon/includes/events-list-shortcut.php index bbf6fef..1aaab10 100644 --- a/source/connector-mobilizon/includes/events-list-shortcut.php +++ b/source/connector-mobilizon/includes/events-list-shortcut.php @@ -29,7 +29,6 @@ class EventsListShortcut { $locale = str_replace('_', '-', get_locale()); $groupName = $atts_with_overriden_defaults['group-name']; $url = Settings::getUrl(); - $textDomain = TEXT_DOMAIN; $timeZone = get_option('timezone_string'); ob_start(); diff --git a/source/connector-mobilizon/includes/events-list-widget.php b/source/connector-mobilizon/includes/events-list-widget.php index 4dfdc6d..90eedf5 100644 --- a/source/connector-mobilizon/includes/events-list-widget.php +++ b/source/connector-mobilizon/includes/events-list-widget.php @@ -11,9 +11,9 @@ class EventsListWidget extends \WP_Widget { public function __construct() { parent::__construct( NAME . '-events-list', - NICE_NAME . ' ' . esc_html__('Events List', TEXT_DOMAIN), + NICE_NAME . ' ' . __('Events List', 'connector-mobilizon'), array( - 'description' => __('A list of the upcoming events of the connected Mobilizon instance.', TEXT_DOMAIN), + 'description' => __('A list of the upcoming events of the connected Mobilizon instance.', 'connector-mobilizon'), ), ); } @@ -30,7 +30,6 @@ class EventsListWidget extends \WP_Widget { $locale = str_replace('_', '-', get_locale()); $groupName = isset($options['groupName']) ? $options['groupName'] : ''; $url = Settings::getUrl(); - $textDomain = TEXT_DOMAIN; $timeZone = get_option('timezone_string'); require dirname(__DIR__) . '/view/events-list.php'; @@ -39,10 +38,9 @@ class EventsListWidget extends \WP_Widget { } public function form($options) { - $title = !empty($options['title']) ? $options['title'] : esc_html__('Events', TEXT_DOMAIN); + $title = !empty($options['title']) ? $options['title'] : __('Events', 'connector-mobilizon'); $eventsCount = !empty($options['eventsCount']) ? $options['eventsCount'] : DEFAULT_EVENTS_COUNT; $groupName = !empty($options['groupName']) ? $options['groupName'] : ''; - $textDomain = TEXT_DOMAIN; require dirname(__DIR__) . '/view/events-list-widget/form.php'; } diff --git a/source/connector-mobilizon/includes/settings.php b/source/connector-mobilizon/includes/settings.php index 2fd2ffc..b927f17 100644 --- a/source/connector-mobilizon/includes/settings.php +++ b/source/connector-mobilizon/includes/settings.php @@ -29,14 +29,14 @@ class Settings { add_settings_section( self::$SETTINGS_SECTION_NAME, - __('General Settings', TEXT_DOMAIN), + __('General Settings', 'connector-mobilizon'), '', self::$PAGE_NAME ); add_settings_field( self::$SETTING_FIELD_NAME_URL, - __('URL', TEXT_DOMAIN), + __('URL', 'connector-mobilizon'), 'MobilizonConnector\Settings::output_field_url', self::$PAGE_NAME, self::$SETTINGS_SECTION_NAME, @@ -47,7 +47,6 @@ class Settings { } public static function output_field_url($args) { - $textDomain = TEXT_DOMAIN; $url = self::getUrl(); require dirname(__DIR__) . '/view/settings/url-field.php'; } @@ -58,7 +57,7 @@ class Settings { add_settings_error( self::$OPTION_NAME_URL, 'wordpress_mobilizon_field_url_error', - __('The URL is invalid.', TEXT_DOMAIN), + __('The URL is invalid.', 'connector-mobilizon'), 'error' ); } @@ -70,7 +69,7 @@ class Settings { public static function register_settings_page() { add_options_page( - NICE_NAME . ' ' . __('Settings', TEXT_DOMAIN), + NICE_NAME . ' ' . __('Settings', 'connector-mobilizon'), NICE_NAME, 'manage_options', NAME . '-settings', diff --git a/source/connector-mobilizon/view/events-list-widget/form.php b/source/connector-mobilizon/view/events-list-widget/form.php index 930554b..db614d4 100644 --- a/source/connector-mobilizon/view/events-list-widget/form.php +++ b/source/connector-mobilizon/view/events-list-widget/form.php @@ -5,14 +5,14 @@ if (!defined('ABSPATH')) { } ?>

- +

- +

- +

diff --git a/source/connector-mobilizon/view/events-list.php b/source/connector-mobilizon/view/events-list.php index ac4cdee..7735d0f 100644 --- a/source/connector-mobilizon/view/events-list.php +++ b/source/connector-mobilizon/view/events-list.php @@ -10,5 +10,5 @@ if (!defined('ABSPATH')) { data-maximum="" data-group-name="" data-time-zone=""> -
  • +
  • diff --git a/source/connector-mobilizon/view/settings/url-field.php b/source/connector-mobilizon/view/settings/url-field.php index f249f88..053e30b 100644 --- a/source/connector-mobilizon/view/settings/url-field.php +++ b/source/connector-mobilizon/view/settings/url-field.php @@ -10,5 +10,5 @@ if (!defined('ABSPATH')) { type="url" value="">

    - +