Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@sentry/react": "7.118.0",
"classnames": "2.3.1",
"cozy-bar": "^23.1.0",
"cozy-client": "^60.8.0",
"cozy-client": "^60.11.0",
"cozy-dataproxy-lib": "^4.11.0",
"cozy-device-helper": "^3.8.0",
"cozy-devtools": "^1.3.0",
Expand All @@ -81,7 +81,7 @@
"cozy-intent": "^2.30.0",
"cozy-interapp": "^0.16.0",
"cozy-keys-lib": "^6.3.0",
"cozy-pouch-link": "^57.7.0",
"cozy-pouch-link": "^60.11.0",
"cozy-realtime": "^5.6.4",
"cozy-search": "^0.11.0",
"cozy-sharing": "^26.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Premium/PremiumProvider.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe('PremiumProvider', () => {
expect(screen.getByText('Can open premium link: true')).toBeInTheDocument()
expect(
screen.getByText(
'Premium link: http://mycozy.cloud/cozy/instances/1223/premium'
'Premium link: http://mycozy.cloud/cozy/instances/1223/premium?lang=en'
)
).toBeInTheDocument()
})
Expand Down
17 changes: 9 additions & 8 deletions src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,16 @@
"locale": {
"title": "Sprache",
"label": "Dies wird die Sprache sein, die in deinem Twake verwendet wird.",
"fr": "Französisch ",
"en": "Englisch",
"es": "Spanisch",
"ja": "Japanisch",
"nl": "Niederländisch",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"ru": "Russisch",
"nl_NL": "Niederländisch (Niederlande)",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Koreanisch",
"pl": "Polnisch",
"pt": "Portugiesisch",
Expand All @@ -215,7 +217,6 @@
"it": "Italienisch",
"ro": "Rumänisch",
"eo": "Esperanto",
"de_DE": "Deutsch (Deutschland)",
"sq": "Albanisch",
"tr": "Türkisch",
"uk_UA": "Ukrainisch (Ukraine)",
Expand Down
17 changes: 9 additions & 8 deletions src/locales/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,16 @@
"locale": {
"title": "Sprache",
"label": "Dies wird die Sprache sein, die in deinem Twake verwendet wird.",
"fr": "Französisch",
"en": "Englisch",
"es": "Spanisch",
"ja": "Japanisch",
"nl": "Holländisch",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"ru": "Russisch",
"nl_NL": "Holländisch (Niederlande)",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Koreanisch",
"pl": "Polnisch",
"pt": "Portugiesisch",
Expand All @@ -215,7 +217,6 @@
"it": "Italienisch",
"ro": "Rumänisch",
"eo": "Esperanto",
"de_DE": "Deutsch (Deutschland)",
"sq": "Albanisch",
"tr": "Türkisch",
"uk_UA": "Ukrainisch (Ukraine)",
Expand Down
18 changes: 9 additions & 9 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,16 @@
"locale": {
"title": "Language",
"label": "This will be the language used in your Twake.",
"fr": "French",
"fr": "Français",
"en": "English",
"es": "Spanish",
"ja": "Japanese",
"nl": "Dutch",
"de": "German",
"ru": "Russian",
"vi": "Vietnamese",
"nl_NL": "Dutch (Netherlands)",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Korean",
"pl": "Polish",
"pt": "Portuguese",
Expand All @@ -297,7 +298,6 @@
"it": "Italian",
"ro": "Romanian",
"eo": "Esperanto",
"de_DE": "German (Germany)",
"sq": "Albanian",
"tr": "Turkish",
"uk_UA": "Ukrainian (Ukraine)",
Expand Down
17 changes: 9 additions & 8 deletions src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,16 @@
"locale": {
"title": "Idioma",
"label": "Éste será el idioma utilizado en su Twake.",
"fr": "Francés",
"en": "Inglés",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "Japonés",
"nl": "Holandés",
"de": "Alemán",
"ru": "Ruso",
"nl_NL": "Holandés",
"ja": "日本語",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Coreano",
"pl": "Polonés",
"pt": "Portugués",
Expand All @@ -222,7 +224,6 @@
"it": "Italiano",
"ro": "Rumano",
"eo": "Esperanto",
"de_DE": "Alemán (Alemania)",
"sq": "Albanés",
"tr": "Turco",
"uk_UA": "Ucraniano (Ucrania)",
Expand Down
18 changes: 9 additions & 9 deletions src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,15 @@
"title": "Langue",
"label": "C'est la langue de votre Twake.",
"fr": "Français",
"en": "Anglais",
"es": "Espagnol",
"ja": "Japonais",
"nl": "Néerlandais",
"de": "Allemand",
"ru": "Russe",
"vi": "Vietnamien",
"nl_NL": "Neérlandais (Pays-bas)",
"en": "English",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Koréen",
"pl": "Polonais",
"pt": "Portugais",
Expand All @@ -294,7 +295,6 @@
"it": "Italien",
"ro": "Roumain",
"eo": "Esperanto",
"de_DE": "Allemand (Allemagne)",
"sq": "Albanais",
"tr": "Turc",
"uk_UA": "Ukrainien (Ukraine)",
Expand Down
17 changes: 9 additions & 8 deletions src/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,16 @@
"locale": {
"title": "言語",
"label": "Twake で使用される言語です。",
"fr": "フランス語",
"en": "英語",
"es": "スペイン語",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "日本語",
"nl": "オランダ語",
"de": "ドイツ語",
"ru": "ロシア語",
"nl_NL": "オランダ語 (オランダ)",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "朝鮮語",
"pl": "ポーランド語",
"pt": "ポルトガル語",
Expand All @@ -194,7 +196,6 @@
"it": "イタリア語",
"ro": "ルーマニア語",
"eo": "エスペラント語",
"de_DE": "ドイツ語 (ドイツ)",
"sq": "アルバニア語",
"tr": "トルコ語",
"uk_UA": "ウクライナ語 (ウクライナ)",
Expand Down
17 changes: 9 additions & 8 deletions src/locales/nl_NL.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,16 @@
"locale": {
"title": "Taal",
"label": "Dit is de taal die zal worden gebruikt in je Twake.",
"fr": "Frans",
"en": "Engels",
"es": "Spaans",
"ja": "Japans",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"de": "Duits",
"ru": "Russisch",
"nl_NL": "Nederlands (Nederland)",
"nl_NL": "Nederlands",
"ko": "Koreaans",
"pl": "Pools",
"pt": "Portugees",
Expand All @@ -254,7 +256,6 @@
"it": "Italiaans",
"ro": "Roemeens",
"eo": "Esperanto",
"de_DE": "Duits (Duitsland)",
"sq": "Albanees",
"tr": "Turks",
"uk_UA": "Oekraïens (Oekraïne)",
Expand Down
18 changes: 9 additions & 9 deletions src/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,16 @@
"locale": {
"title": "Язык",
"label": "Язык интерфейса вашего аккаунта.",
"fr": "Французский",
"en": "Английский",
"es": "Испанский",
"ja": "Японский",
"nl": "Нидерландский",
"de": "Немецкий",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "вьетнамский",
"nl_NL": "Нидерландский (Нидерланды)",
"vi": "Tiếng Việt",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Корейский",
"pl": "Польский",
"pt": "Португальский",
Expand All @@ -292,7 +293,6 @@
"it": "Итальянский",
"ro": "Румынский",
"eo": "Эсперанто",
"de_DE": "Немецкий (Германия)",
"sq": "Албанский",
"tr": "Турецкий",
"uk_UA": "Украинский (Украина)",
Expand Down
18 changes: 9 additions & 9 deletions src/locales/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,16 @@
"locale": {
"title": "Ngôn ngữ",
"label": "Đây sẽ là ngôn ngữ được sử dụng trong Twake của bạn.",
"fr": "Tiếng Pháp",
"en": "Tiếng Anh",
"es": "Tiếng Tây Ban Nha",
"ja": "Tiếng Nhật",
"nl": "Tiếng Hà Lan",
"de": "Tiếng Đức",
"ru": "Tiếng Nga",
"fr": "Français",
"en": "English",
"es": "Español",
"ja": "日本語",
"de": "Deutsch",
"de_DE": "Deutsch",
"ru": "Русский",
"vi": "Tiếng Việt",
"nl_NL": "Tiếng Hà Lan (Hà Lan)",
"nl": "Nederlands",
"nl_NL": "Nederlands",
"ko": "Tiếng Hàn",
"pl": "Tiếng Ba Lan",
"pt": "Tiếng Bồ Đào Nha",
Expand All @@ -292,7 +293,6 @@
"it": "Tiếng Ý",
"ro": "Tiếng Romania",
"eo": "Tiếng Esperanto",
"de_DE": "Tiếng Đức (Đức)",
"sq": "Tiếng Albania",
"tr": "Tiếng Thổ Nhĩ Kỳ",
"uk_UA": "Tiếng Ukraine (Ukraine)",
Expand Down
54 changes: 9 additions & 45 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4449,37 +4449,10 @@ cozy-bar@^23.1.0:
redux-persist "5.10.0"
redux-thunk "2.3.0"

cozy-client@^57.7.0:
version "57.7.0"
resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-57.7.0.tgz#c0d3daadfca7cd117fb0261a51a0e26bc4b6a730"
integrity sha512-4pWcbZy/J3l8Fxm7Ytmfp3KJ2N8Acdvx1fi3U0H6irep3fKO/+xTQO1ozgi+zvOmox3J70OvMWoJRw4xbLXqWg==
dependencies:
"@cozy/minilog" "1.0.0"
"@fastify/deepmerge" "^2.0.2"
"@types/jest" "^26.0.20"
"@types/lodash" "^4.14.170"
btoa "^1.2.1"
cozy-stack-client "^57.2.0"
date-fns "2.29.3"
fast-deep-equal "^3.1.3"
json-stable-stringify "^1.0.1"
lodash "^4.17.13"
microee "^0.0.6"
node-fetch "^2.6.1"
node-polyglot "2.4.2"
open "7.4.2"
prop-types "^15.6.2"
react-redux "^7.2.0"
redux "3 || 4"
redux-thunk "^2.3.0"
server-destroy "^1.0.1"
sift "^6.0.0"
url-search-params-polyfill "^8.0.0"

cozy-client@^60.8.0:
version "60.8.0"
resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-60.8.0.tgz#e4edf2c4154a0cd7d68a815941c7f2ecce38c2a0"
integrity sha512-jkF+grk5OR96avpoknz+kZHPcTY96E82R4oejMZkLHxFLme+1hG+q/B19eRemx0M8swZbxDOc7a2K1/ZrBgeGw==
cozy-client@^60.11.0:
version "60.11.0"
resolved "https://registry.yarnpkg.com/cozy-client/-/cozy-client-60.11.0.tgz#43fae6ee886f4711acc480af989f51fa02036b1f"
integrity sha512-H5S4VhDP78qb+0Qkri/6T2qUVx6djBbddK1oxkYubVbZUxqEmhzSAl22L/wFSAURZBRh72xg9wP8nNcnDJ4jKw==
dependencies:
"@cozy/minilog" "1.0.0"
"@fastify/deepmerge" "^2.0.2"
Expand Down Expand Up @@ -4652,12 +4625,12 @@ cozy-minilog@^3.10.0:
dependencies:
microee "0.0.6"

cozy-pouch-link@^57.7.0:
version "57.7.0"
resolved "https://registry.yarnpkg.com/cozy-pouch-link/-/cozy-pouch-link-57.7.0.tgz#193ea1f9ec462733f6cfeb8f79a0948c6f943d42"
integrity sha512-p1aZ8etwIFVLBr5DdndpSjAr/+dMGAYHfuRLZrIWAqwEs7MgL10wzJEuc1gPLkeplXU/DGVGzCY4AURWpMBofA==
cozy-pouch-link@^60.11.0:
version "60.11.0"
resolved "https://registry.yarnpkg.com/cozy-pouch-link/-/cozy-pouch-link-60.11.0.tgz#337b4b59d31e35a779c5273b6ca692299f7201b3"
integrity sha512-qbqY7m++Lb77WdqFoswcbFqoZ+MWKcCOENF9gWKaEejCLpIkMkKchXWVnSvxXD9/u+bbk/ZMzHXIC1rSxifLzA==
dependencies:
cozy-client "^57.7.0"
cozy-client "^60.11.0"
pouchdb-browser "^7.2.2"
pouchdb-find "^7.2.2"

Expand Down Expand Up @@ -4694,15 +4667,6 @@ cozy-sharing@^26.3.0:
react-tooltip "^3.11.1"
snarkdown "^2.0.0"

cozy-stack-client@^57.2.0:
version "57.2.0"
resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-57.2.0.tgz#837176d73561aa1983f6b2c0a9b0cbe1eb0a0d14"
integrity sha512-k68fuNdfLXsskdgA0pd04Bk+CDUCqICCm5IZHJZiIEJkovvA6IqI/jU8vyNI7fNrCuRQasCjwatIRoT7Qq9O6g==
dependencies:
detect-node "^2.0.4"
mime "^2.4.0"
qs "^6.7.0"

cozy-stack-client@^60.6.0:
version "60.6.0"
resolved "https://registry.yarnpkg.com/cozy-stack-client/-/cozy-stack-client-60.6.0.tgz#7819415ba8025dde8a3728f489b9f545a0f6d759"
Expand Down
Loading