From 1fa0c65461efd97633cbfa97ae865f1374163691 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 23 Jul 2023 17:01:56 +0200 Subject: [PATCH 1/5] fix(shared): Don't let modal wrapper grow --- sites/shared/components/wrappers/modal.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/wrappers/modal.mjs b/sites/shared/components/wrappers/modal.mjs index 99a7acf7597..2338b813edd 100644 --- a/sites/shared/components/wrappers/modal.mjs +++ b/sites/shared/components/wrappers/modal.mjs @@ -68,7 +68,7 @@ export const ModalWrapper = ({ children ) : (
{children}
From 1b2a3acd90f957158b0252a79dd8562a64092aab Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 23 Jul 2023 17:04:37 +0200 Subject: [PATCH 2/5] chore(shared): Adapted theme picker for mobile --- sites/shared/components/modal/theme-picker.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/shared/components/modal/theme-picker.mjs b/sites/shared/components/modal/theme-picker.mjs index 5f2082ad4b0..7af76814f0d 100644 --- a/sites/shared/components/modal/theme-picker.mjs +++ b/sites/shared/components/modal/theme-picker.mjs @@ -22,8 +22,8 @@ export const ModalThemePicker = ({ app, iconOnly = false, bottom = false }) => { className="btn btn-lg grow bg-base-100 border border-base-200 border-solid text-base-content hover:bg-primary hover:text-primary-content hover:border-primary shadow hover:shadow-lg" > {t(`${theme}Theme`)} - -
+ +
{['primary', 'secondary', 'accent', 'neutral'].map((color) => (
))} From 7dc1e22555eb9874dcb2cc4ec6d78b419c06abf4 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 23 Jul 2023 17:07:34 +0200 Subject: [PATCH 3/5] fix(shared): Adapted languages picker for mobile --- sites/shared/components/modal/locale-picker.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/modal/locale-picker.mjs b/sites/shared/components/modal/locale-picker.mjs index 3bee7970284..0dd9a7766e8 100644 --- a/sites/shared/components/modal/locale-picker.mjs +++ b/sites/shared/components/modal/locale-picker.mjs @@ -26,6 +26,7 @@ const translations = { export const ModalLocalePicker = () => { const { t } = useTranslation(ns) const router = useRouter() + const current = router.locale return ( @@ -38,7 +39,7 @@ export const ModalLocalePicker = () => { } key={locale} locale={locale} - className="btn btn-lg btn-primary grow" + className={`btn lg:btn-lg grow ${current === locale ? 'btn-neutral' : 'btn-primary'}`} > {t(locale)} From a7573846c7d7f9e7709c01af5d38cd71100dbbf0 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 23 Jul 2023 17:19:24 +0200 Subject: [PATCH 4/5] fix(shared): Tweak to theme picker --- sites/shared/components/modal/theme-picker.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/shared/components/modal/theme-picker.mjs b/sites/shared/components/modal/theme-picker.mjs index 7af76814f0d..6278cb8b133 100644 --- a/sites/shared/components/modal/theme-picker.mjs +++ b/sites/shared/components/modal/theme-picker.mjs @@ -22,8 +22,8 @@ export const ModalThemePicker = ({ app, iconOnly = false, bottom = false }) => { className="btn btn-lg grow bg-base-100 border border-base-200 border-solid text-base-content hover:bg-primary hover:text-primary-content hover:border-primary shadow hover:shadow-lg" > {t(`${theme}Theme`)} - -
+ +
{['primary', 'secondary', 'accent', 'neutral'].map((color) => (
))} From 6949861ec6687d9e092cacba77c6109eb4e72a46 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 23 Jul 2023 17:29:58 +0200 Subject: [PATCH 5/5] fix: Issue with crowdin filenames --- crowdin.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crowdin.yml b/crowdin.yml index 63961c0e0be..dd9fe693aba 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -3,22 +3,30 @@ commit_message: "skip-build" pull_request_assignees: - joostdecock files: + # Markdown - source: /markdown/org/**/en.md translation: /markdown/org/**/%two_letters_code%.md + # YAML - source: /sites/org/pages/*/*.en.yaml translation: /sites/org/pages/*/%file_name%.%two_letters_code%.yaml + translation_replace: &noen + ".en": "" - source: /sites/org/pages/**/*.en.yaml translation: /sites/org/pages/**/%file_name%.%two_letters_code%.yaml - - source: /sites/org/components/*/*.en.yaml - translation: /sites/org/components/*/%file_name%.%two_letters_code%.yaml + translation_replace: *noen - source: /sites/org/components/**/*.en.yaml translation: /sites/org/components/**/%file_name%.%two_letters_code%.yaml + translation_replace: *noen - source: /sites/shared/components/**/*.en.yaml translation: /sites/shared/components/**/%file_name%.%two_letters_code%.yaml + translation_replace: *noen - source: /sites/shared/i18n/*.en.yaml translation: /sites/shared/i18n/%file_name%.%two_letters_code%.yaml + translation_replace: *noen - source: /sites/backend/src/**/*.en.yaml translation: /sites/backend/src/**/%file_name%.%two_letters_code%.yaml + translation_replace: *noen + # JSON - source: /sites/shared/jargon/en.json translation: /sites/shared/jargon/%two_letters_code%.json - source: /designs/*/i18n/en.json