release: alpha6 (#355)

.github/workflows/crowdin.yml

@@ -8,12 +8,9 @@ on:
     types:
       - closed
     branches-ignore:
-      - dev
+      # - dev
       - main
       - l10n*
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.ref || github.ref }}
-  cancel-in-progress: true
 
 jobs:
   synchronize-with-crowdin:
@@ -32,6 +29,15 @@ jobs:
           flags: gi
           replacement: IN-xxx
 
+      - name: Sanitize github branch name
+        id: sanitizebranch
+        uses: ashley-taylor/regex-property-action@eeec905bf940ec1c65ff777402c57f786368d9bc # v1.4
+        with:
+          value: ${{ github.head_ref || github.ref_name}}
+          regex: '[\\/:*?"<>|>]'
+          flags: gi
+          replacement: '_'
+
       - name: Upload to Crowdin
         if: github.event_name != 'pull_request'
         uses: crowdin/github-action@840b586cf1214a04c4701d90f9100f9766d7390d # v1.7.1
@@ -45,9 +51,9 @@ jobs:
           localization_branch_name: ${{ steps.branchregex.outputs.value }}
           create_pull_request: true
           pull_request_title: 'chore(i18n): Updated translations from Crowdin'
-          pull_request_labels: "translations, kodiak: merge.method = 'squash'"
+          pull_request_labels: "translations, kodiak: merge.method = 'squash', automerge"
           pull_request_base_branch_name: ${{ github.ref_name }}
-          crowdin_branch_name: ${{ github.ref_name }}
+          crowdin_branch_name: ${{ steps.sanitizebranch.outputs.value }}
 
       - name: Delete Crowdin Branch
         if: github.event_name == 'pull_request'
@@ -60,4 +66,4 @@ jobs:
           upload_translations: false
           download_translations: false
           create_pull_request: false
-          delete_crowdin_branch: ${{ github.ref_name }}
+          delete_crowdin_branch: ${{ steps.sanitizebranch.outputs.value }}

apps/app/package.json

@@ -87,7 +87,7 @@
 		"@types/flat": "5.0.2",
 		"@types/luxon": "3.2.0",
 		"@types/node": "18.15.10",
-		"@types/react": "18.0.30",
+		"@types/react": "18.0.31",
 		"@types/react-dom": "18.0.11",
 		"@types/umami": "0.1.1",
 		"@typescript-eslint/eslint-plugin": "5.57.0",

apps/app/public/locales/ar/common.json

@@ -19,6 +19,11 @@
 	"claimed": "مطالب",
 	"clear": "مسح",
 	"close": "أغلق",
+	"confirm-account": {
+		"click-verify": "انقر هنا للتحقق من تأكيد حسابك في InReach",
+		"message": "انقر على الرابط التالي لتأكيد حسابك:",
+		"subject": "تأكيد حسابك"
+	},
 	"connect": "الاتصال",
 	"contact": "الاتصال",
 	"contact-us": "اتصل بنا",
@@ -47,6 +52,10 @@
 	"enter-email-placeholder": "أدخل عنوان البريد الإلكتروني...",
 	"enter-password-placeholder": "أدخل كلمة المرور...",
 	"enter-review": "أدخل مراجعتك...",
+	"errors": {
+		"oh-no": "Oh no!",
+		"try-again-text": "<Text>حدث خطأ ما! الرجاء المحاولة مرة أخرى</Text>"
+	},
 	"exclude": "استبعاد",
 	"facebook": "فيسبوك",
 	"find-resources": "البحث عن الموارد",
@@ -99,11 +108,16 @@
 	"none-apply": "لا ينطبق علي أي من هذه",
 	"other-specify": "أخرى (يرجى التحديد)",
 	"password": "كلمة المرور",
+	"password-confirm": "تأكيد كلمة المرور",
+	"password-error-match": "يجب أن تتطابق كلمات المرور",
+	"password-reenter-placeholder": "إعادة إدخال كلمة المرور...",
 	"password-req-length": "يشمل 8 أحرف على الأقل",
 	"password-req-lowercase": "يشمل حرف صغير",
 	"password-req-number": "يشمل الرقم",
 	"password-req-special": "يتضمن حرف خاص",
 	"password-req-uppercase": "يتضمن حرف كبير",
+	"password-reset-success": "<Text>الرجاء <LoginModal>تسجيل الدخول</LoginModal> باستخدام كلمة المرور الجديدة.</Text>",
+	"password-saved": "تم حفظ كلمة المرور!",
 	"phone": "الهاتف",
 	"photo-count_interval": "(0) [لا توجد صور بعد]؛(1)[{{count}} صورة]؛(2-inf)[{{count}} صورة]",
 	"photo_interval": "(0) [لا توجد صور بعد]؛(3-inf)[{{count}} صورة]؛",
@@ -221,6 +235,11 @@
 	"user-avatar": "صورة المستخدم",
 	"verified-information": "معلومات تم التحقق منها",
 	"verified-information-detail": "تم تحديث المعلومات الموجودة في هذه الصفحة آخر تحديث {{dateString}}. تحديد أولوية الدقة وسلامة المستخدم، وتحديث جميع المعلومات مرة واحدة على الأقل كل 6 أشهر. لمزيد من المعلومات عن عملية التدقيق لدينا، يرجى زيارة صفحة عملية التحقق لدينا.",
+	"verify-account": {
+		"verified": "تم تأكيد الحساب!",
+		"verified-body": "<Text>تم التحقق من حسابك! الرجاء <LoginModal>تسجيل الدخول</LoginModal> لبدء استخدام الميزات الإضافية لـ InReach.",
+		"verifying": "التحقق من الحساب..."
+	},
 	"view-list": "عرض القائمة",
 	"visit": "زيارة",
 	"website": "الموقع",
@@ -232,6 +251,7 @@
 		"coming-soon": "قريباً",
 		"more": "المزيد",
 		"next": "التالي",
+		"please-wait": "الرجاء الانتظار...",
 		"prev": "المسبق",
 		"saved": "محفوظ",
 		"search": "البحث",

apps/app/public/locales/ar/country.json

@@ -412,12 +412,12 @@
 	},
 	"COG": {
 		"name": "جمهورية الكونغو الديمقراطية",
-		"demonym_zero": "Congoleses",
+		"demonym_zero": "Congolese",
 		"demonym_one": "Congolese",
-		"demonym_two": "Congoleses",
-		"demonym_few": "Congoleses",
-		"demonym_many": "Congoleses",
-		"demonym_other": "Congoleses"
+		"demonym_two": "Congolese",
+		"demonym_few": "Congolese",
+		"demonym_many": "Congolese",
+		"demonym_other": "Congolese"
 	},
 	"COK": {
 		"name": "جزر كوك",
@@ -1198,12 +1198,12 @@
 	},
 	"MAC": {
 		"name": "ماكاو",
-		"demonym_zero": "الصينيون",
+		"demonym_zero": "الصينية",
 		"demonym_one": "الصينية",
-		"demonym_two": "الصينيون",
-		"demonym_few": "الصينيون",
-		"demonym_many": "الصينيون",
-		"demonym_other": "الصينيون"
+		"demonym_two": "الصينية",
+		"demonym_few": "الصينية",
+		"demonym_many": "الصينية",
+		"demonym_other": "الصينية"
 	},
 	"MAF": {
 		"name": "سانت مارتن",

apps/app/public/locales/en/common.json

@@ -19,6 +19,11 @@
 	"claimed": "Claimed",
 	"clear": "Clear",
 	"close": "Close",
+	"confirm-account": {
+		"click-verify": "Click here to verify your confirm your InReach account",
+		"message": "Click the following link to confirm your account:",
+		"subject": "Confirm your account"
+	},
 	"connect": "Connect",
 	"contact": "Contact",
 	"contact-us": "Contact Us",
@@ -43,6 +48,10 @@
 	"enter-email-placeholder": "Enter email address...",
 	"enter-password-placeholder": "Enter password...",
 	"enter-review": "Enter your review...",
+	"errors": {
+		"oh-no": "Oh no!",
+		"try-again-text": "<Text>Something went wrong! Please try again.</Text>"
+	},
 	"exclude": "Exclude",
 	"facebook": "Facebook",
 	"find-resources": "Find resources",
@@ -95,11 +104,16 @@
 	"none-apply": "None of these apply to me",
 	"other-specify": "Other (please specify)",
 	"password": "Password",
+	"password-confirm": "Confirm password",
+	"password-error-match": "Passwords must match",
+	"password-reenter-placeholder": "Re-enter your password...",
 	"password-req-length": "Includes at least 8 characters",
 	"password-req-lowercase": "Includes lowercase letter",
 	"password-req-number": "Includes number",
 	"password-req-special": "Includes special character",
 	"password-req-uppercase": "Includes uppercase letter",
+	"password-reset-success": "<Text>Please <LoginModal>login</LoginModal> using your new password.</Text>",
+	"password-saved": "Password saved!",
 	"phone": "Phone",
 	"photo-count_interval": "(0)[No photos yet.];(1)[{{count}} photo];(2-inf)[{{count}} photos]",
 	"photo_interval": "(0)[No photos yet];(3-inf)[{{count}} photos];",
@@ -223,6 +237,11 @@
 	"user-avatar": "User avatar",
 	"verified-information": "Verified information",
 	"verified-information-detail": "The information on this page was last updated {{dateString}}. InReach prioritizes accuracy and user safety, and updates all information at least once every 6 months.  For more information on our vetting process, please visit our Vetting Process page on InReach.org.",
+	"verify-account": {
+		"verified": "Account verified!",
+		"verified-body": "<Text>Your account has been verified! Please <LoginModal>login</LoginModal> to start using InReach's additional features.",
+		"verifying": "Verifying account..."
+	},
 	"view-list": "View list",
 	"view-x-result_one": "View {{count}} result",
 	"view-x-result_other": "View {{count}} results",
@@ -236,6 +255,7 @@
 		"coming-soon": "Coming soon",
 		"more": "more",
 		"next": "Next",
+		"please-wait": "Please wait...",
 		"prev": "Prev",
 		"saved": "Saved",
 		"search": "Search",

apps/app/public/locales/es/common.json

@@ -19,6 +19,11 @@
 	"claimed": "Reclamado",
 	"clear": "Claro",
 	"close": "Cerrar",
+	"confirm-account": {
+		"click-verify": "Haz clic aquí para confirmar tu cuenta de InReach",
+		"message": "Haga clic en el siguiente enlace para confirmar su cuenta:",
+		"subject": "Confirma tu cuenta"
+	},
 	"connect": "Conectar",
 	"contact": "Contacto",
 	"contact-us": "Contáctenos",
@@ -43,6 +48,10 @@
 	"enter-email-placeholder": "Introduzca dirección de correo electrónico...",
 	"enter-password-placeholder": "Introduzca contraseña...",
 	"enter-review": "Ingrese su reseña...",
+	"errors": {
+		"oh-no": "Oh no!",
+		"try-again-text": "<Text>¡Algo salió mal! Por favor, inténtalo de nuevo.</Text>"
+	},
 	"exclude": "Excluir",
 	"facebook": "Facebook",
 	"find-resources": "Encontrar recursos",
@@ -95,11 +104,16 @@
 	"none-apply": "Ninguno de estos se aplica a mí",
 	"other-specify": "Other (specify)",
 	"password": "Contraseña",
+	"password-confirm": "Confirmar contraseña",
+	"password-error-match": "Las contraseñas deben coincidir",
+	"password-reenter-placeholder": "Vuelva a introducir su contraseña...",
 	"password-req-length": "Incluye al menos 8 caracteres",
 	"password-req-lowercase": "Incluye letra minúscula",
 	"password-req-number": "Incluye número",
 	"password-req-special": "Incluye carácter especial",
 	"password-req-uppercase": "Incluye letras mayúsculas",
+	"password-reset-success": "<Text>Por favor <LoginModal>iniciar sesión</LoginModal> usando su nueva contraseña.</Text>",
+	"password-saved": "¡Contraseña guardada!",
 	"phone": "Teléfono",
 	"photo-count_interval": "(0)[No hay fotos aún.];(1)[{{count}} foto];(2-inf)[{{count}} fotos]",
 	"photo_interval": "(0)[Aún no hay fotos];(3-inf)[{{count}} fotos];",
@@ -217,6 +231,11 @@
 	"user-avatar": "Avatar de usuario",
 	"verified-information": "Información verificada",
 	"verified-information-detail": "La información de esta página fue actualizada por última vez {{dateString}}. El alcance prioriza la exactitud y la seguridad del usuario, y actualiza toda la información al menos una vez cada 6 meses. Para más información sobre nuestro proceso de veterinario, por favor visite nuestra página del Proceso de Verificación .",
+	"verify-account": {
+		"verified": "¡Cuenta verificada!",
+		"verified-body": "<Text>¡Tu cuenta ha sido verificada! Por favor, <LoginModal>inicia sesión</LoginModal> para empezar a usar las características adicionales de InReach.",
+		"verifying": "Verificando cuenta..."
+	},
 	"view-list": "Ver lista",
 	"visit": "Visita",
 	"website": "Sitio web",
@@ -228,6 +247,7 @@
 		"coming-soon": "Próximamente",
 		"more": "más",
 		"next": "Siguiente",
+		"please-wait": "Por favor espere...",
 		"prev": "Anterior",
 		"saved": "Guardado",
 		"search": "Buscar",

apps/app/public/locales/es/country.json

@@ -233,7 +233,7 @@
 	"COG": {
 		"name": "República del Congo",
 		"demonym_one": "Congolese",
-		"demonym_other": "Congoleses"
+		"demonym_other": "Congolese"
 	},
 	"COK": {
 		"name": "Islas Cook",
@@ -671,7 +671,7 @@
 	"MAC": {
 		"name": "Macao",
 		"demonym_one": "Chino",
-		"demonym_other": "Chinos"
+		"demonym_other": "Chino"
 	},
 	"MAF": {
 		"name": "San Martín",