From 42e739b28707153a8baf63f61fe0a9bd058c0040 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 15 Jul 2021 15:16:42 +0300 Subject: [PATCH 1/2] #4345 language flag and warning for new posting --- .../resources/config/settings/sections.php | 1 + .../resources/config/settings/settings.php | 8 +- .../advs-module/resources/images/flags/ar.svg | 9 ++ .../advs-module/resources/images/flags/de.svg | 8 ++ .../advs-module/resources/images/flags/el.svg | 72 ++++++++++++++ .../advs-module/resources/images/flags/en.svg | 12 +++ .../advs-module/resources/images/flags/es.svg | 65 +++++++++++++ .../advs-module/resources/images/flags/fa.svg | 21 ++++ .../advs-module/resources/images/flags/fr.svg | 9 ++ .../advs-module/resources/images/flags/it.svg | 9 ++ .../advs-module/resources/images/flags/nl.svg | 8 ++ .../advs-module/resources/images/flags/pt.svg | 95 +++++++++++++++++++ .../advs-module/resources/images/flags/ru.svg | 8 ++ .../advs-module/resources/images/flags/tr.svg | 7 ++ .../advs-module/resources/images/flags/zh.svg | 12 +++ .../advs-module/resources/lang/en/field.php | 1 + .../advs-module/resources/lang/en/setting.php | 10 +- .../views/form/partials/translations.twig | 21 ++++ .../src/AdvsModuleServiceProvider.php | 4 + 19 files changed, 376 insertions(+), 4 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/ar.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/de.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/el.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/en.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/es.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/fa.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/fr.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/it.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/nl.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/pt.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/ru.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/tr.svg create mode 100644 addons/default/visiosoft/advs-module/resources/images/flags/zh.svg create mode 100644 addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 8b322a998..247210f87 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -66,6 +66,7 @@ return [ 'make_map_required', 'show_breadcrumb_when_creating_ad', 'show_post_ad_agreement', + 'show_input_flag', ], ], 'ads_image' => [ diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index b99a1fa65..83a75233d 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -474,5 +474,11 @@ return [ 'config' => [ 'default_value' => false, ] - ] + ], + 'show_input_flag' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ] ]; diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/ar.svg b/addons/default/visiosoft/advs-module/resources/images/flags/ar.svg new file mode 100644 index 000000000..00460a191 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/ar.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/de.svg b/addons/default/visiosoft/advs-module/resources/images/flags/de.svg new file mode 100644 index 000000000..6a45408fe --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/de.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/el.svg b/addons/default/visiosoft/advs-module/resources/images/flags/el.svg new file mode 100644 index 000000000..cecd03a42 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/el.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/en.svg b/addons/default/visiosoft/advs-module/resources/images/flags/en.svg new file mode 100644 index 000000000..570980821 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/en.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/es.svg b/addons/default/visiosoft/advs-module/resources/images/flags/es.svg new file mode 100644 index 000000000..1e5595d57 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/es.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/fa.svg b/addons/default/visiosoft/advs-module/resources/images/flags/fa.svg new file mode 100644 index 000000000..2ad1bea4f --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/fa.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/fr.svg b/addons/default/visiosoft/advs-module/resources/images/flags/fr.svg new file mode 100644 index 000000000..b151931f2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/fr.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/it.svg b/addons/default/visiosoft/advs-module/resources/images/flags/it.svg new file mode 100644 index 000000000..6470fd568 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/it.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/nl.svg b/addons/default/visiosoft/advs-module/resources/images/flags/nl.svg new file mode 100644 index 000000000..f1487961f --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/nl.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/pt.svg b/addons/default/visiosoft/advs-module/resources/images/flags/pt.svg new file mode 100644 index 000000000..c7a8d18bf --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/pt.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/ru.svg b/addons/default/visiosoft/advs-module/resources/images/flags/ru.svg new file mode 100644 index 000000000..2e85ebda8 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/ru.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/tr.svg b/addons/default/visiosoft/advs-module/resources/images/flags/tr.svg new file mode 100644 index 000000000..c8fda48b2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/tr.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/flags/zh.svg b/addons/default/visiosoft/advs-module/resources/images/flags/zh.svg new file mode 100644 index 000000000..4d0b91b85 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/flags/zh.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index cd7e80b4e..b26c57483 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -382,4 +382,5 @@ return [ ], 'name_a_z' => 'Name (A to Z)', 'name_z_a' => 'Name (Z to A)', + 'select_lang_ads' => 'select the language of the ads', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 9eb3da933..fbe003c58 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -133,8 +133,8 @@ return [ ], 'market_place' => [ 'name' => 'Market Place', - 'instructions' => 'If the marketplace is down, your site will act as ecommerce. For example, - some fields in the profile such as ads, dopings, messages, sale, packages and store are not visible and + 'instructions' => 'If the marketplace is down, your site will act as ecommerce. For example, + some fields in the profile such as ads, dopings, messages, sale, packages and store are not visible and removes corporate membership.' ], 'price_area_hidden' => [ @@ -285,5 +285,9 @@ return [ ], 'hide_contact_created_at' => [ 'name' => 'Hide Contact Fields For in Create New Ad' - ] + ], + 'show_input_flag' => [ + 'name' => 'Show Flags on Input', + 'instructions' => 'Show flag and description on translatable inputs' + ] ]; diff --git a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig new file mode 100644 index 000000000..a780844ce --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig @@ -0,0 +1,21 @@ +
+ {% if setting_value('visiosoft.module.advs::show_input_flag') %} + {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }} + {% endif %} + + {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }} + +
+ {% for iso in config_get('streams::locales.enabled') %} + + {{ trans('streams::locale.' ~ iso ~ '.name') }} + + {% endfor %} +
+
+
+ + ***{{ trans('visiosoft.module.advs::field.select_lang_ads') }} + diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 14fc29ca9..73ebc37ee 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -271,6 +271,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider StatusRepositoryInterface::class => StatusRepository::class, ]; + protected $overrides = [ + 'streams::form.partials.translations' => 'visiosoft.module.advs::form.partials.translations', + ]; + public function boot(AddonCollection $addonCollection, FileModel $fileModel,CategoryRepositoryInterface $categoryRepository) { From 3d281a52a7134a5c27a688684d31bb9404009aec Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 15 Jul 2021 15:25:19 +0300 Subject: [PATCH 2/2] #4345 language flag and warning for new posting --- .../views/form/partials/translations.twig | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig index a780844ce..319d09ee6 100644 --- a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig +++ b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig @@ -1,21 +1,23 @@ -
- {% if setting_value('visiosoft.module.advs::show_input_flag') %} - {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }} - {% endif %} - - {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }} - -
- {% for iso in config_get('streams::locales.enabled') %} - - {{ trans('streams::locale.' ~ iso ~ '.name') }} - - {% endfor %} +{% if config_get('streams::locales.enabled')|length > 1 %} +
+ {% if setting_value('visiosoft.module.advs::show_input_flag') %} + {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }} + {% endif %} + + {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }} + +
+ {% for iso in config_get('streams::locales.enabled') %} + + {{ trans('streams::locale.' ~ iso ~ '.name') }} + + {% endfor %} +
-
-
- - ***{{ trans('visiosoft.module.advs::field.select_lang_ads') }} - +
+ + ***{{ trans('visiosoft.module.advs::field.select_lang_ads') }} + +{% endif %}