From bd30726ee3844db4c9d2508de2199d692bf4dd54 Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Mon, 1 Jun 2026 17:48:41 +0200
Subject: [PATCH 1/7] [i18n] Make the active formatting locale reactive

Expose a reactive localeCode (a valid Intl/moment code such as 'en' or 'zh-tw') updated by setLocale, so consumers re-localize when the language changes.
---
 src/lib/lang.js             | 17 +++++++++++------
 tests/unit/lib/lang.spec.js | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/lib/lang.js b/src/lib/lang.js
index 28d6df33fb..66ab59b6c6 100644
--- a/src/lib/lang.js
+++ b/src/lib/lang.js
@@ -1,11 +1,16 @@
 import moment from 'moment-timezone'
+import { ref } from 'vue'
+
 import i18n from '@/lib/i18n'
 
 const LOCALE_MAP = {
-  zh_Hans_CN: { language: 'zh', localeCode: 'zh-cn' },
-  zh_Hant_TW: { language: 'zh_tw', localeCode: 'zh-tw' }
+  zh_Hans_CN: { language: 'zh', code: 'zh-cn' },
+  zh_Hant_TW: { language: 'zh_tw', code: 'zh-tw' }
 }
 
+// Reactive, Intl-safe formatting code for the active language ('en', 'zh-tw', …).
+export const localeCode = ref('en')
+
 export default {
   /**
    * Set the locale for the application (vue-i18n + moment.js)
@@ -13,14 +18,14 @@ export default {
    */
   setLocale(locale) {
     const fallback = locale?.substring(0, 2) || 'en'
-    const { language, localeCode } = LOCALE_MAP[locale] || {
+    const { language, code } = LOCALE_MAP[locale] || {
       language: fallback,
-      localeCode: fallback
+      code: fallback
     }
 
-    moment.locale(localeCode)
+    moment.locale(code)
 
     i18n.global.locale = language
-    i18n.global.locale_code = localeCode
+    localeCode.value = code
   }
 }
diff --git a/tests/unit/lib/lang.spec.js b/tests/unit/lib/lang.spec.js
index 728f15a9a4..420c818b31 100644
--- a/tests/unit/lib/lang.spec.js
+++ b/tests/unit/lib/lang.spec.js
@@ -1,5 +1,5 @@
 import moment from 'moment-timezone'
-import lang from '@/lib/lang'
+import lang, { localeCode } from '@/lib/lang'
 import timezone from '@/lib/timezone'
 
 import i18n from '@/lib/i18n'
@@ -27,6 +27,18 @@ describe('lang', () => {
     expect(moment.locale()).toEqual('fr')
     expect(i18n.global.locale).toEqual('fr')
   })
+
+  test('localeCode tracks the active language with an Intl-safe code', () => {
+    lang.setLocale('en_US')
+    expect(localeCode.value).toEqual('en')
+
+    // Mapped locale keeps its region (Traditional Chinese).
+    lang.setLocale('zh_Hant_TW')
+    expect(localeCode.value).toEqual('zh-tw')
+
+    lang.setLocale('fr_FR')
+    expect(localeCode.value).toEqual('fr')
+  })
 })
 
 describe('timezone', () => {

From 4dc784b437068eff93ec974dc794c132e011fb9d Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Mon, 1 Jun 2026 17:49:12 +0200
Subject: [PATCH 2/7] [calendar] Localize the user calendar from the active
 language

Drive FullCalendar's locale from the reactive localeCode and refresh it on language change, instead of being hardcoded to English.
---
 src/components/widgets/UserCalendar.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/widgets/UserCalendar.vue b/src/components/widgets/UserCalendar.vue
index e8169ec3e5..aa8ee5bf73 100644
--- a/src/components/widgets/UserCalendar.vue
+++ b/src/components/widgets/UserCalendar.vue
@@ -72,6 +72,8 @@ import allLocales from '@fullcalendar/core/locales-all'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import multiMonthPlugin from '@fullcalendar/multimonth'
 
+import { localeCode } from '@/lib/lang'
+
 import EntityThumbnail from '@/components/widgets/EntityThumbnail.vue'
 import ProductionName from '@/components/widgets/ProductionName.vue'
 import Spinner from '@/components/widgets/Spinner.vue'
@@ -113,7 +115,7 @@ const calendarOptions = ref({
   initialView: 'dayGridMonth',
   firstDay: 1,
   locales: allLocales,
-  locale: 'en'
+  locale: localeCode.value
 })
 
 const resetEvents = () => {
@@ -231,6 +233,11 @@ watch(
     resetEvents()
   }
 )
+
+watch(localeCode, code => {
+  calendarOptions.value.locale = code
+  calendarRef.value?.getApi().setOption('locale', code)
+})
 </script>
 
 <style lang="scss" scoped>

From 0ef87bd975b02e601c5aedcb4c0fcdf3d49c74a1 Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Mon, 1 Jun 2026 17:49:27 +0200
Subject: [PATCH 3/7] [people] Add a country field

Editable in the person modal and shown as a column in the people list, localized with Intl.DisplayNames from the ISO 3166-1 alpha-2 codes. The country is only stored for non-bot, non-client people.
---
 src/components/lists/PeopleList.vue       |  21 +-
 src/components/modals/EditPersonModal.vue |  22 +-
 src/lib/countries.js                      | 294 ++++++++++++++++++++++
 src/locales/da.json                       |   2 +
 src/locales/de.json                       |   2 +
 src/locales/en.js                         |   2 +
 src/locales/es.json                       |   2 +
 src/locales/fa.json                       |   2 +
 src/locales/fr.json                       |   2 +
 src/locales/hu.json                       |   2 +
 src/locales/ja.json                       |   2 +
 src/locales/ko.json                       |   2 +
 src/locales/nl.json                       |   2 +
 src/locales/pt.json                       |   2 +
 src/locales/ru.json                       |   2 +
 src/locales/zh.json                       |   2 +
 src/locales/zh_tw.json                    |   2 +
 src/store/api/people.js                   |   4 +-
 tests/unit/lib/countries.spec.js          |  50 ++++
 19 files changed, 416 insertions(+), 3 deletions(-)
 create mode 100644 src/lib/countries.js
 create mode 100644 tests/unit/lib/countries.spec.js

diff --git a/src/components/lists/PeopleList.vue b/src/components/lists/PeopleList.vue
index 788d105e22..41d611605f 100644
--- a/src/components/lists/PeopleList.vue
+++ b/src/components/lists/PeopleList.vue
@@ -28,6 +28,9 @@
             <th scope="col" class="studio" v-if="!isBots && !isGuests">
               {{ $t('people.list.studio') }}
             </th>
+            <th scope="col" class="country" v-if="!isBots && !isGuests">
+              {{ $t('people.list.country') }}
+            </th>
             <th scope="col" class="contract" v-if="!isBots && !isGuests">
               {{ $t('people.list.contract') }}
             </th>
@@ -79,6 +82,9 @@
             <td class="studio" v-if="!isBots && !isGuests">
               <studio-name :studio="person.studio" v-if="person.studio" />
             </td>
+            <td class="country" v-if="!isBots && !isGuests">
+              {{ countryName(person.country) }}
+            </td>
             <td class="contract" v-if="!isBots && !isGuests">
               {{ $t(`people.contract.${person.contract_type}`) }}
             </td>
@@ -124,7 +130,7 @@
       </table>
     </div>
 
-    <table-info :is-loading="isLoading" :is-error="isError" :cells="8" />
+    <table-info :is-loading="isLoading" :is-error="isError" :cells="9" />
 
     <p class="has-text-centered footer-info" v-if="!isLoading">
       {{ nbUsersDetails }}
@@ -136,6 +142,9 @@
 import { AlertTriangleIcon } from 'lucide-vue-next'
 import { mapGetters } from 'vuex'
 
+import { getCountryName } from '@/lib/countries'
+import { localeCode } from '@/lib/lang'
+
 import { grabListMixin } from '@/components/mixins/grablist'
 import { domMixin } from '@/components/mixins/dom'
 
@@ -257,6 +266,10 @@ export default {
   },
 
   methods: {
+    countryName(country) {
+      return getCountryName(country, localeCode.value)
+    },
+
     isExpired(expirationDate) {
       return expirationDate < this.today
     },
@@ -320,6 +333,11 @@ export default {
   min-width: 180px;
 }
 
+.country {
+  width: 160px;
+  min-width: 160px;
+}
+
 .contract {
   width: 160px;
   min-width: 160px;
@@ -455,6 +473,7 @@ export default {
 
   .phone,
   .studio,
+  .country,
   .contract,
   .position,
   .seniority,
diff --git a/src/components/modals/EditPersonModal.vue b/src/components/modals/EditPersonModal.vue
index 76682318c3..1f0fa95aa7 100644
--- a/src/components/modals/EditPersonModal.vue
+++ b/src/components/modals/EditPersonModal.vue
@@ -118,6 +118,12 @@
         v-model="form.studio_id"
         v-if="!isBot"
       />
+      <combobox
+        :label="$t('people.fields.country')"
+        :options="countryOptions"
+        v-model="form.country"
+        v-if="showCountryField"
+      />
       <combobox
         :label="$t('people.fields.active')"
         :options="activeOptions"
@@ -201,6 +207,8 @@ import { useI18n } from 'vue-i18n'
 import { useStore } from 'vuex'
 
 import { useTime } from '@/composables/time'
+import { getCountryOptions } from '@/lib/countries'
+import { localeCode } from '@/lib/lang'
 
 import BaseModal from '@/components/modals/BaseModal.vue'
 import Combobox from '@/components/widgets/Combobox.vue'
@@ -245,6 +253,8 @@ const activeOptions = computed(() => [
   { label: t('main.no'), value: 'false' }
 ])
 
+const countryOptions = computed(() => getCountryOptions(localeCode.value))
+
 const contractOptions = [
   { label: 'open-ended', value: 'open-ended' },
   { label: 'fixed-term', value: 'fixed-term' },
@@ -290,6 +300,7 @@ const form = ref({
   active: 'true',
   departments: [],
   studio_id: null,
+  country: null,
   expiration_date: null,
   is_bot: false
 })
@@ -303,6 +314,11 @@ const user = computed(() => store.getters.user)
 
 const isEditing = computed(() => Boolean(props.personToEdit?.id))
 
+// Country feeds the carbon footprint calculation; hidden for bots/clients (guests never reach this modal).
+const showCountryField = computed(
+  () => !props.isBot && form.value.role !== 'client'
+)
+
 const modalTitle = computed(() => {
   if (isEditing.value) {
     const prefix = props.isBot ? t('bots.edit_title') : t('people.edit_title')
@@ -349,7 +365,9 @@ const emitForm = event => {
   emit(event, {
     ...form.value,
     last_name: form.value.last_name || '',
-    active: form.value.active === 'true' || form.value.active === true
+    active: form.value.active === 'true' || form.value.active === true,
+    // Don't store a country for excluded roles (field hidden but value kept).
+    country: showCountryField.value ? form.value.country : null
   })
 }
 
@@ -379,6 +397,7 @@ const resetForm = () => {
       active: p.active ? 'true' : 'false',
       departments: [...(p.departments || [])],
       studio_id: p.studio_id,
+      country: p.country || null,
       expiration_date: p.expiration_date,
       is_bot: p.is_bot,
       notifications_enabled: p.notifications_enabled ? 'true' : 'false',
@@ -402,6 +421,7 @@ const resetForm = () => {
       active: 'true',
       departments: [],
       studio_id: null,
+      country: null,
       expiration_date: null,
       is_bot: props.isBot,
       email: props.isBot ? user.value.email : null
diff --git a/src/lib/countries.js b/src/lib/countries.js
new file mode 100644
index 0000000000..eeccd18a32
--- /dev/null
+++ b/src/lib/countries.js
@@ -0,0 +1,294 @@
+/*
+ * Country helpers for the person "Country" field.
+ *
+ * Country names are not hardcoded: they are localized at runtime with the
+ * native `Intl.DisplayNames` API from the ISO 3166-1 alpha-2 codes below.
+ */
+
+/** Full ISO 3166-1 alpha-2 list (countries and territories) */
+export const COUNTRY_CODES = [
+  'AD',
+  'AE',
+  'AF',
+  'AG',
+  'AI',
+  'AL',
+  'AM',
+  'AO',
+  'AQ',
+  'AR',
+  'AS',
+  'AT',
+  'AU',
+  'AW',
+  'AX',
+  'AZ',
+  'BA',
+  'BB',
+  'BD',
+  'BE',
+  'BF',
+  'BG',
+  'BH',
+  'BI',
+  'BJ',
+  'BL',
+  'BM',
+  'BN',
+  'BO',
+  'BQ',
+  'BR',
+  'BS',
+  'BT',
+  'BV',
+  'BW',
+  'BY',
+  'BZ',
+  'CA',
+  'CC',
+  'CD',
+  'CF',
+  'CG',
+  'CH',
+  'CI',
+  'CK',
+  'CL',
+  'CM',
+  'CN',
+  'CO',
+  'CR',
+  'CU',
+  'CV',
+  'CW',
+  'CX',
+  'CY',
+  'CZ',
+  'DE',
+  'DJ',
+  'DK',
+  'DM',
+  'DO',
+  'DZ',
+  'EC',
+  'EE',
+  'EG',
+  'EH',
+  'ER',
+  'ES',
+  'ET',
+  'FI',
+  'FJ',
+  'FK',
+  'FM',
+  'FO',
+  'FR',
+  'GA',
+  'GB',
+  'GD',
+  'GE',
+  'GF',
+  'GG',
+  'GH',
+  'GI',
+  'GL',
+  'GM',
+  'GN',
+  'GP',
+  'GQ',
+  'GR',
+  'GS',
+  'GT',
+  'GU',
+  'GW',
+  'GY',
+  'HK',
+  'HM',
+  'HN',
+  'HR',
+  'HT',
+  'HU',
+  'ID',
+  'IE',
+  'IL',
+  'IM',
+  'IN',
+  'IO',
+  'IQ',
+  'IR',
+  'IS',
+  'IT',
+  'JE',
+  'JM',
+  'JO',
+  'JP',
+  'KE',
+  'KG',
+  'KH',
+  'KI',
+  'KM',
+  'KN',
+  'KP',
+  'KR',
+  'KW',
+  'KY',
+  'KZ',
+  'LA',
+  'LB',
+  'LC',
+  'LI',
+  'LK',
+  'LR',
+  'LS',
+  'LT',
+  'LU',
+  'LV',
+  'LY',
+  'MA',
+  'MC',
+  'MD',
+  'ME',
+  'MF',
+  'MG',
+  'MH',
+  'MK',
+  'ML',
+  'MM',
+  'MN',
+  'MO',
+  'MP',
+  'MQ',
+  'MR',
+  'MS',
+  'MT',
+  'MU',
+  'MV',
+  'MW',
+  'MX',
+  'MY',
+  'MZ',
+  'NA',
+  'NC',
+  'NE',
+  'NF',
+  'NG',
+  'NI',
+  'NL',
+  'NO',
+  'NP',
+  'NR',
+  'NU',
+  'NZ',
+  'OM',
+  'PA',
+  'PE',
+  'PF',
+  'PG',
+  'PH',
+  'PK',
+  'PL',
+  'PM',
+  'PN',
+  'PR',
+  'PS',
+  'PT',
+  'PW',
+  'PY',
+  'QA',
+  'RE',
+  'RO',
+  'RS',
+  'RU',
+  'RW',
+  'SA',
+  'SB',
+  'SC',
+  'SD',
+  'SE',
+  'SG',
+  'SH',
+  'SI',
+  'SJ',
+  'SK',
+  'SL',
+  'SM',
+  'SN',
+  'SO',
+  'SR',
+  'SS',
+  'ST',
+  'SV',
+  'SX',
+  'SY',
+  'SZ',
+  'TC',
+  'TD',
+  'TF',
+  'TG',
+  'TH',
+  'TJ',
+  'TK',
+  'TL',
+  'TM',
+  'TN',
+  'TO',
+  'TR',
+  'TT',
+  'TV',
+  'TW',
+  'TZ',
+  'UA',
+  'UG',
+  'UM',
+  'US',
+  'UY',
+  'UZ',
+  'VA',
+  'VC',
+  'VE',
+  'VG',
+  'VI',
+  'VN',
+  'VU',
+  'WF',
+  'WS',
+  'YE',
+  'YT',
+  'ZA',
+  'ZM',
+  'ZW'
+]
+
+/** Cache one Intl.DisplayNames per locale, reused across all country codes */
+const regionNamesCache = new Map()
+
+/** Localized country name for an ISO code ('' if falsy, raw code on failure) */
+export const getCountryName = (code, locale = 'en') => {
+  if (!code) return ''
+  try {
+    if (!regionNamesCache.has(locale)) {
+      regionNamesCache.set(
+        locale,
+        new Intl.DisplayNames([locale], { type: 'region' })
+      )
+    }
+    return regionNamesCache.get(locale).of(code) || code
+  } catch {
+    return code
+  }
+}
+
+/** Country combobox options: an empty entry, then every country sorted by localized name */
+export const getCountryOptions = (locale = 'en') => {
+  let collator
+  try {
+    collator = new Intl.Collator(locale)
+  } catch {
+    collator = new Intl.Collator()
+  }
+  const countries = COUNTRY_CODES.map(code => ({
+    label: getCountryName(code, locale),
+    value: code
+  })).sort((a, b) => collator.compare(a.label, b.label))
+
+  return [{ label: '', value: null }, ...countries]
+}
diff --git a/src/locales/da.json b/src/locales/da.json
index 62d5a2a0b8..a69db7b9c5 100644
--- a/src/locales/da.json
+++ b/src/locales/da.json
@@ -712,6 +712,7 @@
         "active": "Aktiv",
         "departments": "Afdelinger",
         "contract": "Kontrakt",
+        "country": "Land",
         "studio": "Studio",
         "daily_salary": "Daglig pris",
         "position": "Position",
@@ -726,6 +727,7 @@
         "active": "Aktiv",
         "departments": "Afdelinger",
         "contract": "Kontrakt",
+        "country": "Land",
         "expiration": "Udløb",
         "studio": "Studio",
         "position": "Position",
diff --git a/src/locales/de.json b/src/locales/de.json
index 03182b7d3c..838c9db96b 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -712,6 +712,7 @@
         "active": "Aktiv",
         "departments": "Abteilungen",
         "contract": "Vertrag",
+        "country": "Land",
         "studio": "Studio",
         "daily_salary": "Tagessatz",
         "position": "Position",
@@ -726,6 +727,7 @@
         "active": "Aktiv",
         "departments": "Abteilungen",
         "contract": "Vertrag",
+        "country": "Land",
         "expiration": "Verfallsdatum",
         "studio": "Studio",
         "position": "Position",
diff --git a/src/locales/en.js b/src/locales/en.js
index e1e684c4ef..e7de8f8ad5 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -1082,6 +1082,7 @@ export default {
     fields: {
       active: 'Active',
       contract: 'Contract',
+      country: 'Country',
       created_at: 'Creation date',
       daily_salary: 'Daily rate',
       departments: 'Departments',
@@ -1100,6 +1101,7 @@ export default {
     list: {
       active: 'Active',
       contract: 'Contract',
+      country: 'Country',
       departments: 'Departments',
       email: 'Email',
       expiration: 'Expiration',
diff --git a/src/locales/es.json b/src/locales/es.json
index 515a445855..b87b7aac49 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -712,6 +712,7 @@
         "active": "Activo",
         "departments": "Departamentos",
         "contract": "Contrato",
+        "country": "País",
         "studio": "Estudio",
         "daily_salary": "Tarifa diaria",
         "position": "Posición",
@@ -726,6 +727,7 @@
         "active": "Activo",
         "departments": "Departamentos",
         "contract": "Contrato",
+        "country": "País",
         "expiration": "Caducidad",
         "studio": "Estudio",
         "position": "Posición",
diff --git a/src/locales/fa.json b/src/locales/fa.json
index 56157647a0..0f6e17b74e 100644
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -712,6 +712,7 @@
         "active": "فعال",
         "departments": "دپارتمان ها",
         "contract": "قرارداد",
+        "country": "کشور",
         "studio": "استودیو",
         "daily_salary": "نرخ روزانه",
         "position": "موقعیت",
@@ -726,6 +727,7 @@
         "active": "فعال",
         "departments": "دپارتمان ها",
         "contract": "قرارداد",
+        "country": "کشور",
         "expiration": "انقضا",
         "studio": "استودیو",
         "position": "موقعیت",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 41aac8d9fa..0b589a609a 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -706,6 +706,7 @@
         "email": "Adresse email",
         "phone": "Téléphone",
         "role": "Rôle",
+        "country": "Pays",
         "old_password": "Mot de passe actuel",
         "password": "Nouveau mot de passe",
         "password_2": "Répétez le nouveau mot de passe",
@@ -724,6 +725,7 @@
         "phone": "Téléphone",
         "role": "Rôle",
         "active": "Actif",
+        "country": "Pays",
         "departments": "Départements",
         "contract": "Contrat",
         "expiration": "Expiration",
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 076f887946..b7c221d030 100644
--- a/src/locales/hu.json
+++ b/src/locales/hu.json
@@ -712,6 +712,7 @@
         "active": "Aktív",
         "departments": "Osztályok",
         "contract": "Szerződés",
+        "country": "Ország",
         "created_at": "Létrehozás dátuma",
         "daily_salary": "Napidíj",
         "position": "Pozíció",
@@ -726,6 +727,7 @@
         "active": "Aktív",
         "departments": "Osztályok",
         "contract": "Szerződés",
+        "country": "Ország",
         "expiration": "Lejárat",
         "position": "Pozíció",
         "salary": "Fizetés",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 30f171f334..cfbc435a2a 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -712,6 +712,7 @@
         "active": "アクティブ",
         "departments": "部門",
         "contract": "契約",
+        "country": "国",
         "studio": "スタジオ",
         "daily_salary": "日当",
         "position": "ポジション",
@@ -726,6 +727,7 @@
         "active": "アクティブ",
         "departments": "部門",
         "contract": "契約",
+        "country": "国",
         "expiration": "有効期限",
         "studio": "スタジオ",
         "position": "ポジション",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index d396cdba8a..11196ea448 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -712,6 +712,7 @@
         "active": "활성",
         "departments": "부서",
         "contract": "계약",
+        "country": "국가",
         "studio": "스튜디오",
         "daily_salary": "일일 요금",
         "position": "위치",
@@ -726,6 +727,7 @@
         "active": "활성",
         "departments": "부서",
         "contract": "계약",
+        "country": "국가",
         "expiration": "만료",
         "studio": "스튜디오",
         "position": "위치",
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 2f8ce7da7c..f682b4f0d8 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -712,6 +712,7 @@
         "active": "Actief",
         "departments": "Afdelingen",
         "contract": "Contract",
+        "country": "Land",
         "studio": "Studio",
         "daily_salary": "Dagtarief",
         "position": "Positie",
@@ -726,6 +727,7 @@
         "active": "Actief",
         "departments": "Afdelingen",
         "contract": "Contract",
+        "country": "Land",
         "expiration": "Vervaldatum",
         "studio": "Studio",
         "position": "Positie",
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 724c1c950b..288be1d758 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -712,6 +712,7 @@
         "active": "Ativo",
         "departments": "Departamentos",
         "contract": "Contrato",
+        "country": "País",
         "studio": "Estúdio",
         "daily_salary": "Taxa diária",
         "position": "Posição",
@@ -726,6 +727,7 @@
         "active": "Ativo",
         "departments": "Departamentos",
         "contract": "Contrato",
+        "country": "País",
         "expiration": "Vencimento",
         "studio": "Estúdio",
         "position": "Posição",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index aa19f7a271..724210d587 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -712,6 +712,7 @@
         "active": "Активный",
         "departments": "Отделы",
         "contract": "Контракт",
+        "country": "Страна",
         "studio": "Студия",
         "daily_salary": "Суточная ставка",
         "position": "Позиция",
@@ -726,6 +727,7 @@
         "active": "Активный",
         "departments": "Отделы",
         "contract": "Контракт",
+        "country": "Страна",
         "expiration": "Истечение",
         "studio": "Студия",
         "position": "Позиция",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 20ffcfe1d3..7148611302 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -712,6 +712,7 @@
         "active": "活动",
         "departments": "部门",
         "contract": "合同",
+        "country": "国家",
         "studio": "工作室",
         "daily_salary": "每日费率",
         "position": "职位",
@@ -726,6 +727,7 @@
         "active": "活动",
         "departments": "部门",
         "contract": "合同",
+        "country": "国家",
         "expiration": "到期",
         "studio": "工作室",
         "position": "职位",
diff --git a/src/locales/zh_tw.json b/src/locales/zh_tw.json
index ce44782757..eb3cfc8591 100644
--- a/src/locales/zh_tw.json
+++ b/src/locales/zh_tw.json
@@ -712,6 +712,7 @@
         "active": "活動",
         "departments": "部門",
         "contract": "合約",
+        "country": "國家",
         "studio": "工作室",
         "daily_salary": "每日費率",
         "position": "職位",
@@ -726,6 +727,7 @@
         "active": "活動",
         "departments": "部門",
         "contract": "合約",
+        "country": "國家",
         "expiration": "到期日",
         "studio": "工作室",
         "position": "職位",
diff --git a/src/store/api/people.js b/src/store/api/people.js
index ede7de6e3d..4c70fbc19e 100644
--- a/src/store/api/people.js
+++ b/src/store/api/people.js
@@ -64,6 +64,7 @@ export default {
       daily_salary: person.daily_salary,
       departments: person.departments,
       studio_id: person.studio_id,
+      country: person.country,
       is_bot: person.is_bot,
       expiration_date: person.expiration_date?.toJSON().slice(0, 10)
     }
@@ -111,7 +112,8 @@ export default {
       ),
       notifications_discord_userid: person.notifications_discord_userid,
       departments: person.departments,
-      studio_id: person.studio_id
+      studio_id: person.studio_id,
+      country: person.country
     }
     return client.pput(`/api/data/persons/${person.id}`, data)
   },
diff --git a/tests/unit/lib/countries.spec.js b/tests/unit/lib/countries.spec.js
new file mode 100644
index 0000000000..06230b466a
--- /dev/null
+++ b/tests/unit/lib/countries.spec.js
@@ -0,0 +1,50 @@
+import { describe, it, expect } from 'vitest'
+
+import {
+  COUNTRY_CODES,
+  getCountryName,
+  getCountryOptions
+} from '@/lib/countries'
+
+// `locale` is expected to be an Intl-safe code (provided by localeCode in
+// @/lib/lang), so these tests pass such codes directly.
+describe('lib/countries', () => {
+  it('returns an empty string for a falsy code', () => {
+    expect(getCountryName(null)).toBe('')
+    expect(getCountryName(undefined)).toBe('')
+    expect(getCountryName('')).toBe('')
+  })
+
+  it('falls back to the raw value for a malformed code', () => {
+    expect(getCountryName('bad-code', 'en')).toBe('bad-code')
+  })
+
+  it('localizes a country name from its ISO code', () => {
+    const name = getCountryName('FR', 'en')
+    expect(name).toBeTruthy()
+    expect(name).not.toBe('FR')
+  })
+
+  it('builds a flat option list of every country, sorted by localized name', () => {
+    const options = getCountryOptions('en')
+
+    // Leading empty entry so the field can be cleared.
+    expect(options[0]).toEqual({ label: '', value: null })
+
+    const countries = options.slice(1)
+    // COUNTRY_CODES must stay duplicate-free, else the picker shows repeated rows.
+    expect(new Set(COUNTRY_CODES).size).toBe(COUNTRY_CODES.length)
+    expect(countries.length).toBe(COUNTRY_CODES.length)
+
+    const labels = countries.map(o => o.label)
+    const collator = new Intl.Collator('en')
+    expect(labels).toEqual([...labels].sort((a, b) => collator.compare(a, b)))
+  })
+
+  it('never throws when building options, even for an unusable locale', () => {
+    expect(() => getCountryOptions('not a locale')).not.toThrow()
+    expect(getCountryOptions('not a locale').length).toBe(
+      COUNTRY_CODES.length + 1
+    )
+  })
+})

From bc3e4d2b02bbc36cb58f634e8539885a89d3f462 Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Mon, 1 Jun 2026 17:49:36 +0200
Subject: [PATCH 4/7] [profile] Let users set their own country

Add the country field to the profile page (hidden for clients and guests), reusing the people country combobox options.
---
 src/components/pages/Profile.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/pages/Profile.vue b/src/components/pages/Profile.vue
index 8a80c1b136..d186b313ce 100644
--- a/src/components/pages/Profile.vue
+++ b/src/components/pages/Profile.vue
@@ -60,6 +60,12 @@
             v-model="form.locale"
             @update:model-value="localeChanged"
           />
+          <combobox
+            :label="$t('people.fields.country')"
+            :options="countryOptions"
+            v-model="form.country"
+            v-if="user.role !== 'client' && !user.is_guest"
+          />
         </div>
       </card>
 
@@ -183,7 +189,8 @@ import { useI18n } from 'vue-i18n'
 import { useHead } from '@unhead/vue'
 import { useStore } from 'vuex'
 
-import lang from '@/lib/lang'
+import { getCountryOptions } from '@/lib/countries'
+import lang, { localeCode } from '@/lib/lang'
 
 import ChangeAvatarModal from '@/components/modals/ChangeAvatarModal.vue'
 import Card from '@/components/widgets/Card.vue'
@@ -210,6 +217,7 @@ const form = ref({
   notifications_discord_userid: '',
   email: '',
   phone: '',
+  country: null,
   timezone: 'Europe/Paris',
   locale: 'en_US'
 })
@@ -262,6 +270,8 @@ const timezoneOptions = computed(() =>
     .map(tz => ({ label: tz, value: tz }))
 )
 
+const countryOptions = computed(() => getCountryOptions(localeCode.value))
+
 // Functions
 
 const syncFormFromUser = () => {

From 1da59fdc183af1b7e4be45e47731c92f50169f29 Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Tue, 2 Jun 2026 14:11:18 +0200
Subject: [PATCH 5/7] [people] Add missing fields to the CSV import

---
 src/components/pages/People.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/pages/People.vue b/src/components/pages/People.vue
index 30e40484ee..b15bd79b77 100644
--- a/src/components/pages/People.vue
+++ b/src/components/pages/People.vue
@@ -232,8 +232,13 @@ export default {
       optionalCsvColumns: [
         'Phone',
         'Role',
-        'Contract Type',
+        'Departments',
         'Studio',
+        'Country',
+        'Contract Type',
+        'Position',
+        'Seniority',
+        'Daily Salary',
         'Active'
       ],
       dataMatchers: ['Email'],

From 6e9a67685402bfef61076d7b6386a6926d60acb0 Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Tue, 2 Jun 2026 17:27:52 +0200
Subject: [PATCH 6/7] [qa] Bump npm dependencies

---
 package-lock.json | 78 +++++++++++++++++++++++------------------------
 package.json      |  4 +--
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba4d54eac3..604488a83b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@fullcalendar/multimonth": "6.1.20",
         "@fullcalendar/vue3": "6.1.20",
         "@google/model-viewer": "4.3.0",
-        "@sentry/vue": "10.55.0",
+        "@sentry/vue": "10.56.0",
         "@unhead/vue": "3.1.1",
         "@vuepic/vue-datepicker": "11.0.3",
         "bowser": "2.14.1",
@@ -80,7 +80,7 @@
         "vite": "8.0.16",
         "vitest": "4.1.8",
         "vitest-localstorage-mock": "0.1.2",
-        "vue-eslint-parser": "10.4.0"
+        "vue-eslint-parser": "10.4.1"
       },
       "engines": {
         "node": ">=22.22.1",
@@ -2262,88 +2262,88 @@
       "license": "MIT"
     },
     "node_modules/@sentry-internal/browser-utils": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.55.0.tgz",
-      "integrity": "sha512-zUvyBr13EK0evKsSTzwSimRzZ3P9kugS32dLCj3ea5gNN+/DFtU/GsMTdcIQDhusEDraIlH17AGgqJH5gUAv5w==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.56.0.tgz",
+      "integrity": "sha512-I8tZWAFg8SZpD8BFUpglEtSTzhZjacmcThB5/Mlq/iFiiT8mBPG4ZWDWssSfmIBKvZywJZJ83uDA0+uiJU73Tw==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "10.55.0"
+        "@sentry/core": "10.56.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/feedback": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.55.0.tgz",
-      "integrity": "sha512-32X9WW1xs5DjCRlp89QJ/PLw4kbTIX6MsBDXN2RBN1nWBjm/2WcwXqO/v/WoIS4W2kTWXcZnQwalLSI22Fp33A==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.56.0.tgz",
+      "integrity": "sha512-fkRR9JroESTIlErkht3OrH4DXKd/DbPozr2KLdX7boMo31hPu4cL9fuqzwOrwyDPRq9B4j+qEgIWB8JrTbgvmg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "10.55.0"
+        "@sentry/core": "10.56.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.55.0.tgz",
-      "integrity": "sha512-OkQpANGwYU5UKfwLk6Y+NpESRC8nrLBjawRDLwF6cJ8HpNScOuNNJDEJEGwXHVkJPH0pcIixsH8y0Qfcltq6Xw==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.56.0.tgz",
+      "integrity": "sha512-DjF09hpy3TF7Km/kOZc73YJmBqcbPCxuZ5rtRs+KtVHu3Vq48xeW83qKUcFEZv20ur9UD99OAJ/gaEt//1Qbwg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "10.55.0",
-        "@sentry/core": "10.55.0"
+        "@sentry-internal/browser-utils": "10.56.0",
+        "@sentry/core": "10.56.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay-canvas": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.55.0.tgz",
-      "integrity": "sha512-lu/y7k9cK7FZ/qJpL0fBX4WqK6IFa/+bTPhedEaC5UpzjUNP7BfXt0H+R7q9CHWmp20Ffh/wGfO3j7O+Tv2MAA==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.56.0.tgz",
+      "integrity": "sha512-SDg2K0CAZT/TnhrixQGwXoi6ZsWUB+DQy3UUk0bSQm6c/5k5zFBpGOiughQN+DYsDilKREfPKmUEEnqvUjm1HQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/replay": "10.55.0",
-        "@sentry/core": "10.55.0"
+        "@sentry-internal/replay": "10.56.0",
+        "@sentry/core": "10.56.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.55.0.tgz",
-      "integrity": "sha512-5n1kxmW1m4j16ZDV9kt+Zo5uafFnKTy7s5YyEcGnC45KnOiO1Gy+QFd3woXns1K5GNxpjF7oOOc6tXgZLuXnQQ==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.56.0.tgz",
+      "integrity": "sha512-80X3NmsGB6tLmfzXYdjzWWdVAdL5CRukGKLcRWIcNhgGjtskOmnzaGb93egEZGI5bUTbtONJ0oyscQ3Z9yoAtQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "10.55.0",
-        "@sentry-internal/feedback": "10.55.0",
-        "@sentry-internal/replay": "10.55.0",
-        "@sentry-internal/replay-canvas": "10.55.0",
-        "@sentry/core": "10.55.0"
+        "@sentry-internal/browser-utils": "10.56.0",
+        "@sentry-internal/feedback": "10.56.0",
+        "@sentry-internal/replay": "10.56.0",
+        "@sentry-internal/replay-canvas": "10.56.0",
+        "@sentry/core": "10.56.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/core": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.55.0.tgz",
-      "integrity": "sha512-XUyoNtDSYCvgJnoNzlh+YeAXfIPhCRIXbhWqqM3GQ3AFtZICi85lkyfsrwXEl9wzlPGYnU+Eg8F4tOfScx+FcQ==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.56.0.tgz",
+      "integrity": "sha512-L+u1dIz5SANrmST5jhIwETtt4apILgKrylv12X4hKJU0PvZl+NorjeV/ty3MwzpKQPg6b6q6qMOSLc1rLpy3iQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/vue": {
-      "version": "10.55.0",
-      "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-10.55.0.tgz",
-      "integrity": "sha512-K2tpJP4s7BYeOADubP4huFMJNEHWBy7jaggNIt0bH7TBKeTZo0r9wfCjJUI+i7Bg0gTgX3JggE9bV45vs96Amw==",
+      "version": "10.56.0",
+      "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-10.56.0.tgz",
+      "integrity": "sha512-bDQ+RNPc/D9ZkFj/iK+IDYYxlQNJFYPQx9YEq1TNCKHudZrhc4AXnXxY7COmre0CQOXrVkuc6vYOGJnbB460Cg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/browser": "10.55.0",
-        "@sentry/core": "10.55.0"
+        "@sentry/browser": "10.56.0",
+        "@sentry/core": "10.56.0"
       },
       "engines": {
         "node": ">=18"
@@ -9637,9 +9637,9 @@
       "license": "MIT"
     },
     "node_modules/vue-eslint-parser": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.4.0.tgz",
-      "integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==",
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.4.1.tgz",
+      "integrity": "sha512-Gk6gRDj0n/fkRa3C3l0bBheoBckUq/Rs0F/TvMWIS6nzzx67amAViMe9CkNgsP2tXyQONvGiHQESHwFtZ3aYDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 89d7bfde79..157fb6a5ae 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@fullcalendar/multimonth": "6.1.20",
     "@fullcalendar/vue3": "6.1.20",
     "@google/model-viewer": "4.3.0",
-    "@sentry/vue": "10.55.0",
+    "@sentry/vue": "10.56.0",
     "@unhead/vue": "3.1.1",
     "@vuepic/vue-datepicker": "11.0.3",
     "bowser": "2.14.1",
@@ -92,7 +92,7 @@
     "vite": "8.0.16",
     "vitest": "4.1.8",
     "vitest-localstorage-mock": "0.1.2",
-    "vue-eslint-parser": "10.4.0"
+    "vue-eslint-parser": "10.4.1"
   },
   "engines": {
     "node": ">=22.22.1",

From 3b7a92e4e6ba380d9f5a31576aaaa6c5011ae41a Mon Sep 17 00:00:00 2001
From: Nicolas Pennec <nicolas.pennec@cg-wire.com>
Date: Tue, 2 Jun 2026 15:07:21 +0200
Subject: [PATCH 7/7] [assets] Hide "Display Breakdown Assets" option when
 episode is "all"

---
 src/components/pages/Assets.vue                   | 3 ++-
 src/components/pages/TaskType.vue                 | 3 ++-
 src/components/widgets/ComboboxDisplayOptions.vue | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue
index d6eadf54a8..0416d52ca1 100644
--- a/src/components/pages/Assets.vue
+++ b/src/components/pages/Assets.vue
@@ -30,8 +30,9 @@
               />
               <combobox-display-options
                 class="flexrow-item"
-                :type="type"
                 :has-linked-assets="isTVShow"
+                :is-all-episodes="currentEpisode?.id === 'all'"
+                :type="type"
                 v-model="displaySettings"
               />
             </div>
diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue
index b158a8dcea..b815eefc0c 100644
--- a/src/components/pages/TaskType.vue
+++ b/src/components/pages/TaskType.vue
@@ -16,8 +16,9 @@
             <div class="filler"></div>
             <combobox-display-options
               class="flexrow-item"
-              :type="displayTaskType"
               :has-linked-assets="isTVShow"
+              :is-all-episodes="currentEpisode?.id === 'all'"
+              :type="displayTaskType"
               v-model="displaySettings"
             />
             <div
diff --git a/src/components/widgets/ComboboxDisplayOptions.vue b/src/components/widgets/ComboboxDisplayOptions.vue
index d8c21d5ecb..2e1ef807b8 100644
--- a/src/components/widgets/ComboboxDisplayOptions.vue
+++ b/src/components/widgets/ComboboxDisplayOptions.vue
@@ -19,7 +19,11 @@ const props = defineProps({
   },
   hasLinkedAssets: {
     type: Boolean,
-    required: false
+    default: false
+  },
+  isAllEpisodes: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -63,7 +67,8 @@ const options = computed(() => {
       value: 'showLinkedAssets',
       when:
         (props.type === 'asset' || props.type === 'tasktype-asset') &&
-        props.hasLinkedAssets
+        props.hasLinkedAssets &&
+        !props.isAllEpisodes
     }
   ]
     .filter(opt => opt.when !== false)