From cb2e637a8699d627af2b57fcd710e412780e3f52 Mon Sep 17 00:00:00 2001 From: Fernando Date: Fri, 1 Oct 2021 15:49:12 -0500 Subject: [PATCH 01/12] Add spanish latino translation --- app/config/locale/codes.php | 1 + app/config/locale/translations/la.json | 232 +++++++++++++++++++++++++ app/init.php | 1 + 3 files changed, 234 insertions(+) create mode 100644 app/config/locale/translations/la.json diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index c8623f533c..d8f8572f46 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -12,6 +12,7 @@ return [ 'de', // German 'en', // English 'es', // Spanish + 'es-la', // Spanish (Latin America) 'fa', // Farsi/Persian 'fi', // Finnish 'fo', // Faroese diff --git a/app/config/locale/translations/la.json b/app/config/locale/translations/la.json new file mode 100644 index 0000000000..8a5ca808a9 --- /dev/null +++ b/app/config/locale/translations/la.json @@ -0,0 +1,232 @@ +{ + "settings.inspire": "\"El Arte de ser sabio es el arte de saber qué pasar por alto.\"", + "settings.locale": "en-la", + "settings.direction": "ltr", + "emails.sender": "%s equipo", + "emails.verification.subject": "Verificación de cuenta", + "emails.verification.hello": "Hola {{name}}", + "emails.verification.body": "Sigue este vínculo para verificar tu correo electrónico.", + "emails.verification.footer": "Si no solicitaste verificación de este correo electrónico, puedes ignorar este mensaje.", + "emails.verification.thanks": "Gracias", + "emails.verification.signature": "{{project}} Equipo", + "emails.magicSession.subject": "Iniciar sesion", + "emails.magicSession.hello": "Hola,", + "emails.magicSession.body": "Sigue este vínculo para iniciar sesion", + "emails.magicSession.footer": "Si no solicitaste verificación de este correo electrónico, puedes ignorar este mensaje.", + "emails.magicSession.thanks": "Gracias", + "emails.magicSession.signature": "{{project}} equipo", + "emails.recovery.subject": "Recuperar contraseña", + "emails.recovery.hello": "Hola {{name}}", + "emails.recovery.body": "Sigue este vínculo para recuperar la contraseña de tu proyecto {{project}}", + "emails.recovery.footer": "Si no solicitaste recuperar tu contraseña, Puedes ignorar este mensaje", + "emails.recovery.thanks": "Gracias", + "emails.recovery.signature": "{{project}} equipo", + "emails.invitation.subject": "Invitacion para %s en el equipo %s", + "emails.invitation.hello": "Hola", + "emails.invitation.body": "Este correo electrónico te fue enviado por que el dueño del proyecto quiere invitarte a convertirte en miembro en el equipo {{team}} en el {{project}}", + "emails.invitation.footer": "Si tu no estas interesado, puedes ignorar este mensaje", + "emails.invitation.thanks": "Gracias", + "emails.invitation.signature": "{{project}} team", + "locale.country.unknown": "Desconocido", + "countries.af": "Afghanistan", + "countries.ao": "Angola", + "countries.al": "Albania", + "countries.ad": "Andorra", + "countries.ae": "Emiratos Arabes Unidos", + "countries.ar": "Argentina", + "countries.am": "Armenia", + "countries.ag": "Antigua and Barbuda", + "countries.au": "Australia", + "countries.at": "Austria", + "countries.az": "Azerbaijan", + "countries.bi": "Burundi", + "countries.be": "Belgium", + "countries.bj": "Benin", + "countries.bf": "Burkina Faso", + "countries.bd": "Bangladesh", + "countries.bg": "Bulgaria", + "countries.bh": "Bahrain", + "countries.bs": "Bahamas", + "countries.ba": "Bosnia and Herzegovina", + "countries.by": "Belarus", + "countries.bz": "Belize", + "countries.bo": "Bolivia", + "countries.br": "Brazil", + "countries.bb": "Barbados", + "countries.bn": "Brunei", + "countries.bt": "Bhutan", + "countries.bw": "Botswana", + "countries.cf": "Central African Republic", + "countries.ca": "Canada", + "countries.ch": "Switzerland", + "countries.cl": "Chile", + "countries.cn": "China", + "countries.ci": "Ivory Coast", + "countries.cm": "Cameroon", + "countries.cd": "DR Congo", + "countries.cg": "Republic of the Congo", + "countries.co": "Colombia", + "countries.km": "Comoros", + "countries.cv": "Cape Verde", + "countries.cr": "Costa Rica", + "countries.cu": "Cuba", + "countries.cy": "Cyprus", + "countries.cz": "Czechia", + "countries.de": "Germany", + "countries.dj": "Djibouti", + "countries.dm": "Dominica", + "countries.dk": "Denmark", + "countries.do": "Republica dominicana", + "countries.dz": "Algeria", + "countries.ec": "Ecuador", + "countries.eg": "Egypt", + "countries.er": "Eritrea", + "countries.es": "Spain", + "countries.ee": "Estonia", + "countries.et": "Ethiopia", + "countries.fi": "Finland", + "countries.fj": "Fiji", + "countries.fr": "France", + "countries.fm": "Micronesia", + "countries.ga": "Gabon", + "countries.gb": "Reino Unido", + "countries.ge": "Georgia", + "countries.gh": "Ghana", + "countries.gn": "Guinea", + "countries.gm": "Gambia", + "countries.gw": "Guinea-Bissau", + "countries.gq": "Equatorial Guinea", + "countries.gr": "Greece", + "countries.gd": "Grenada", + "countries.gt": "Guatemala", + "countries.gy": "Guyana", + "countries.hn": "Honduras", + "countries.hr": "Croatia", + "countries.ht": "Haiti", + "countries.hu": "Hungary", + "countries.id": "Indonesia", + "countries.in": "India", + "countries.ie": "Ireland", + "countries.ir": "Iran", + "countries.iq": "Iraq", + "countries.is": "Iceland", + "countries.il": "Israel", + "countries.it": "Italy", + "countries.jm": "Jamaica", + "countries.jo": "Jordan", + "countries.jp": "Japan", + "countries.kz": "Kazakhstan", + "countries.ke": "Kenya", + "countries.kg": "Kyrgyzstan", + "countries.kh": "Cambodia", + "countries.ki": "Kiribati", + "countries.kn": "Saint Kitts and Nevis", + "countries.kr": "South Korea", + "countries.kw": "Kuwait", + "countries.la": "Laos", + "countries.lb": "Lebanon", + "countries.lr": "Liberia", + "countries.ly": "Libya", + "countries.lc": "Saint Lucia", + "countries.li": "Liechtenstein", + "countries.lk": "Sri Lanka", + "countries.ls": "Lesotho", + "countries.lt": "Lithuania", + "countries.lu": "Luxembourg", + "countries.lv": "Latvia", + "countries.ma": "Morocco", + "countries.mc": "Monaco", + "countries.md": "Moldova", + "countries.mg": "Madagascar", + "countries.mv": "Maldives", + "countries.mx": "Mexico", + "countries.mh": "Marshall Islands", + "countries.mk": "Macedonia", + "countries.ml": "Mali", + "countries.mt": "Malta", + "countries.mm": "Myanmar", + "countries.me": "Montenegro", + "countries.mn": "Mongolia", + "countries.mz": "Mozambique", + "countries.mr": "Mauritania", + "countries.mu": "Mauritius", + "countries.mw": "Malawi", + "countries.my": "Malaysia", + "countries.na": "Namibia", + "countries.ne": "Niger", + "countries.ng": "Nigeria", + "countries.ni": "Nicaragua", + "countries.nl": "Netherlands", + "countries.no": "Norway", + "countries.np": "Nepal", + "countries.nr": "Nauru", + "countries.nz": "New Zealand", + "countries.om": "Oman", + "countries.pk": "Pakistan", + "countries.pa": "Panama", + "countries.pe": "Peru", + "countries.ph": "Philippines", + "countries.pw": "Palau", + "countries.pg": "Papua New Guinea", + "countries.pl": "Poland", + "countries.kp": "North Korea", + "countries.pt": "Portugal", + "countries.py": "Paraguay", + "countries.qa": "Qatar", + "countries.ro": "Romania", + "countries.ru": "Russia", + "countries.rw": "Rwanda", + "countries.sa": "Saudi Arabia", + "countries.sd": "Sudan", + "countries.sn": "Senegal", + "countries.sg": "Singapore", + "countries.sb": "Solomon Islands", + "countries.sl": "Sierra Leone", + "countries.sv": "El Salvador", + "countries.sm": "San Marino", + "countries.so": "Somalia", + "countries.rs": "Serbia", + "countries.ss": "South Sudan", + "countries.st": "São Tomé and Príncipe", + "countries.sr": "Suriname", + "countries.sk": "Slovakia", + "countries.si": "Slovenia", + "countries.se": "Sweden", + "countries.sz": "Swaziland", + "countries.sc": "Seychelles", + "countries.sy": "Syria", + "countries.td": "Chad", + "countries.tg": "Togo", + "countries.th": "Thailand", + "countries.tj": "Tajikistan", + "countries.tm": "Turkmenistan", + "countries.tl": "Timor-Leste", + "countries.to": "Tonga", + "countries.tt": "Trinidad and Tobago", + "countries.tn": "Tunisia", + "countries.tr": "Turkey", + "countries.tv": "Tuvalu", + "countries.tz": "Tanzania", + "countries.ug": "Uganda", + "countries.ua": "Ukraine", + "countries.uy": "Uruguay", + "countries.us": "United States", + "countries.uz": "Uzbekistan", + "countries.va": "Vatican City", + "countries.vc": "Saint Vincent and the Grenadines", + "countries.ve": "Venezuela", + "countries.vn": "Vietnam", + "countries.vu": "Vanuatu", + "countries.ws": "Samoa", + "countries.ye": "Yemen", + "countries.za": "Sud-Africa", + "countries.zm": "Zambia", + "countries.zw": "Zimbabwe", + "continents.af": "Africa", + "continents.an": "Antarctica", + "continents.as": "Asia", + "continents.eu": "Europe", + "continents.na": "America del Norte", + "continents.oc": "Oceania", + "continents.sa": "America del Sur" +} \ No newline at end of file diff --git a/app/init.php b/app/init.php index 8c1d6cb455..36481ef4aa 100644 --- a/app/init.php +++ b/app/init.php @@ -317,6 +317,7 @@ Locale::setLanguageFromJSON('ur', __DIR__.'/config/locale/translations/ur.json') Locale::setLanguageFromJSON('vi', __DIR__.'/config/locale/translations/vi.json'); Locale::setLanguageFromJSON('zh-cn', __DIR__.'/config/locale/translations/zh-cn.json'); Locale::setLanguageFromJSON('zh-tw', __DIR__.'/config/locale/translations/zh-tw.json'); +Locale::setLanguageFromJSON('es-la', __DIR__.'/config/locale/translations/la.json'); \stream_context_set_default([ // Set global user agent and http settings 'http' => [ From 99e1aec48f9fdad1f522b9ebf8aa5136198c404a Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 5 Oct 2021 21:55:52 -0500 Subject: [PATCH 02/12] Translate json to latin --- app/config/locale/codes.php | 2 +- app/config/locale/translations/la.json | 56 +++++++++++++------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index d8f8572f46..f8016095c1 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -12,7 +12,6 @@ return [ 'de', // German 'en', // English 'es', // Spanish - 'es-la', // Spanish (Latin America) 'fa', // Farsi/Persian 'fi', // Finnish 'fo', // Faroese @@ -58,4 +57,5 @@ return [ 'vi', // Vietnamese 'zh-cn', // Chinese - China 'zh-tw', // Chinese - Taiwan + 'la', // Latin ]; diff --git a/app/config/locale/translations/la.json b/app/config/locale/translations/la.json index 8a5ca808a9..24972e0e64 100644 --- a/app/config/locale/translations/la.json +++ b/app/config/locale/translations/la.json @@ -1,33 +1,33 @@ { - "settings.inspire": "\"El Arte de ser sabio es el arte de saber qué pasar por alto.\"", - "settings.locale": "en-la", - "settings.direction": "ltr", - "emails.sender": "%s equipo", - "emails.verification.subject": "Verificación de cuenta", - "emails.verification.hello": "Hola {{name}}", - "emails.verification.body": "Sigue este vínculo para verificar tu correo electrónico.", - "emails.verification.footer": "Si no solicitaste verificación de este correo electrónico, puedes ignorar este mensaje.", - "emails.verification.thanks": "Gracias", - "emails.verification.signature": "{{project}} Equipo", - "emails.magicSession.subject": "Iniciar sesion", - "emails.magicSession.hello": "Hola,", - "emails.magicSession.body": "Sigue este vínculo para iniciar sesion", - "emails.magicSession.footer": "Si no solicitaste verificación de este correo electrónico, puedes ignorar este mensaje.", - "emails.magicSession.thanks": "Gracias", - "emails.magicSession.signature": "{{project}} equipo", - "emails.recovery.subject": "Recuperar contraseña", - "emails.recovery.hello": "Hola {{name}}", - "emails.recovery.body": "Sigue este vínculo para recuperar la contraseña de tu proyecto {{project}}", - "emails.recovery.footer": "Si no solicitaste recuperar tu contraseña, Puedes ignorar este mensaje", - "emails.recovery.thanks": "Gracias", - "emails.recovery.signature": "{{project}} equipo", - "emails.invitation.subject": "Invitacion para %s en el equipo %s", - "emails.invitation.hello": "Hola", - "emails.invitation.body": "Este correo electrónico te fue enviado por que el dueño del proyecto quiere invitarte a convertirte en miembro en el equipo {{team}} en el {{project}}", - "emails.invitation.footer": "Si tu no estas interesado, puedes ignorar este mensaje", - "emails.invitation.thanks": "Gracias", + "settings.inspire": "\"Ars sapiendi est ars sciendi quid negligat.\"", + "settings.locale": "la", + "settings.direction": "ltr*", + "emails.sender": "%s team", + "emails.verification.subject": "Ratio comprobatio", + "emails.verification.hello": "Salve ibi {{name}}", + "emails.verification.body": "Sequere hanc nexum ut quin inscriptionem tuum.", + "emails.verification.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.", + "emails.verification.thanks": "Gratias", + "emails.verification.signature": "{{project}} Team", + "emails.magicSession.subject": "Log in", + "emails.magicSession.hello": "Salve ibi,", + "emails.magicSession.body": "Hanc nexum cum login", + "emails.magicSession.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.", + "emails.magicSession.thanks": "Gratias", + "emails.magicSession.signature": "{{project}} team", + "emails.recovery.subject": "Recuperet password", + "emails.recovery.hello": "Salve ibi {{name}}", + "emails.recovery.body": "Sequere hanc conjunctionem ut recipias project password {{project}}", + "emails.recovery.footer": "Si tesseram tuam recuperare non petis, nuntium hunc ignorare potes", + "emails.recovery.thanks": "Gratias", + "emails.recovery.signature": "{{project}} team", + "emails.invitation.subject": "Invitatio pro% s in quadrigis% s", + "emails.invitation.hello": "Salve ibi", + "emails.invitation.body": "Haec inscriptio ad te missa est quia dominus incepto te invitare vult ut membrum {{team}} quadrigis fias ad {{project}}", + "emails.invitation.footer": "Si non quaero, potes hunc nuntium ignorare", + "emails.invitation.thanks": "Gratias", "emails.invitation.signature": "{{project}} team", - "locale.country.unknown": "Desconocido", + "locale.country.unknown": "Ignotum", "countries.af": "Afghanistan", "countries.ao": "Angola", "countries.al": "Albania", From 45aff15240d166ba7c9186cb2f64ee7c0a9d2fe7 Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 5 Oct 2021 21:57:30 -0500 Subject: [PATCH 03/12] Update init file --- app/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/init.php b/app/init.php index 36481ef4aa..a68d7645f9 100644 --- a/app/init.php +++ b/app/init.php @@ -317,7 +317,7 @@ Locale::setLanguageFromJSON('ur', __DIR__.'/config/locale/translations/ur.json') Locale::setLanguageFromJSON('vi', __DIR__.'/config/locale/translations/vi.json'); Locale::setLanguageFromJSON('zh-cn', __DIR__.'/config/locale/translations/zh-cn.json'); Locale::setLanguageFromJSON('zh-tw', __DIR__.'/config/locale/translations/zh-tw.json'); -Locale::setLanguageFromJSON('es-la', __DIR__.'/config/locale/translations/la.json'); +Locale::setLanguageFromJSON('la', __DIR__.'/config/locale/translations/la.json'); \stream_context_set_default([ // Set global user agent and http settings 'http' => [ From 6687bdc0287cf480d7eb038052a74ccfe927b819 Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 5 Oct 2021 21:58:04 -0500 Subject: [PATCH 04/12] Add new blank space --- app/config/locale/translations/la.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/translations/la.json b/app/config/locale/translations/la.json index 24972e0e64..92544bdf26 100644 --- a/app/config/locale/translations/la.json +++ b/app/config/locale/translations/la.json @@ -229,4 +229,4 @@ "continents.na": "America del Norte", "continents.oc": "Oceania", "continents.sa": "America del Sur" -} \ No newline at end of file +} From d0c325ed9ab85d6dcdb0ce2cff247bfaa775d33d Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 5 Oct 2021 22:51:39 -0500 Subject: [PATCH 05/12] Add owner var in the json lat file --- app/config/locale/translations/la.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/translations/la.json b/app/config/locale/translations/la.json index 92544bdf26..b20e9ee94b 100644 --- a/app/config/locale/translations/la.json +++ b/app/config/locale/translations/la.json @@ -23,7 +23,7 @@ "emails.recovery.signature": "{{project}} team", "emails.invitation.subject": "Invitatio pro% s in quadrigis% s", "emails.invitation.hello": "Salve ibi", - "emails.invitation.body": "Haec inscriptio ad te missa est quia dominus incepto te invitare vult ut membrum {{team}} quadrigis fias ad {{project}}", + "emails.invitation.body": "Haec inscriptio ad te missa est quia dominus incepto {{owner}} te invitare vult ut membrum {{team}} quadrigis fias ad {{project}}", "emails.invitation.footer": "Si non quaero, potes hunc nuntium ignorare", "emails.invitation.thanks": "Gratias", "emails.invitation.signature": "{{project}} team", From f0615de9c885375a733c55335f4353a873274fe0 Mon Sep 17 00:00:00 2001 From: Fernando Date: Wed, 6 Oct 2021 10:42:52 -0500 Subject: [PATCH 06/12] Add fixes to latin language --- app/config/locale/codes.php | 2 +- app/config/locale/translations/la.json | 2 +- app/init.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index f8016095c1..b1058a9e8a 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -31,6 +31,7 @@ return [ 'km', // Khmer 'ko', // Korean 'lt', // Lithuanian + 'la', // Latin 'ml', // Malayalam 'mr', // Marathi 'ms', // Malay @@ -57,5 +58,4 @@ return [ 'vi', // Vietnamese 'zh-cn', // Chinese - China 'zh-tw', // Chinese - Taiwan - 'la', // Latin ]; diff --git a/app/config/locale/translations/la.json b/app/config/locale/translations/la.json index b20e9ee94b..ea2b276a39 100644 --- a/app/config/locale/translations/la.json +++ b/app/config/locale/translations/la.json @@ -21,7 +21,7 @@ "emails.recovery.footer": "Si tesseram tuam recuperare non petis, nuntium hunc ignorare potes", "emails.recovery.thanks": "Gratias", "emails.recovery.signature": "{{project}} team", - "emails.invitation.subject": "Invitatio pro% s in quadrigis% s", + "emails.invitation.subject": "Invitatio pro %s in quadrigis %s", "emails.invitation.hello": "Salve ibi", "emails.invitation.body": "Haec inscriptio ad te missa est quia dominus incepto {{owner}} te invitare vult ut membrum {{team}} quadrigis fias ad {{project}}", "emails.invitation.footer": "Si non quaero, potes hunc nuntium ignorare", diff --git a/app/init.php b/app/init.php index a68d7645f9..c77df9bff4 100644 --- a/app/init.php +++ b/app/init.php @@ -290,6 +290,7 @@ Locale::setLanguageFromJSON('jv', __DIR__.'/config/locale/translations/jv.json') Locale::setLanguageFromJSON('kn', __DIR__.'/config/locale/translations/kn.json'); Locale::setLanguageFromJSON('km', __DIR__.'/config/locale/translations/km.json'); Locale::setLanguageFromJSON('ko', __DIR__.'/config/locale/translations/ko.json'); +Locale::setLanguageFromJSON('la', __DIR__.'/config/locale/translations/la.json'); Locale::setLanguageFromJSON('lt', __DIR__.'/config/locale/translations/lt.json'); Locale::setLanguageFromJSON('ml', __DIR__.'/config/locale/translations/ml.json'); Locale::setLanguageFromJSON('mr', __DIR__.'/config/locale/translations/mr.json'); @@ -317,7 +318,6 @@ Locale::setLanguageFromJSON('ur', __DIR__.'/config/locale/translations/ur.json') Locale::setLanguageFromJSON('vi', __DIR__.'/config/locale/translations/vi.json'); Locale::setLanguageFromJSON('zh-cn', __DIR__.'/config/locale/translations/zh-cn.json'); Locale::setLanguageFromJSON('zh-tw', __DIR__.'/config/locale/translations/zh-tw.json'); -Locale::setLanguageFromJSON('la', __DIR__.'/config/locale/translations/la.json'); \stream_context_set_default([ // Set global user agent and http settings 'http' => [ From 5003a2e536c3e845bef0dbe7bba5fd9372897869 Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 19 Oct 2021 10:31:14 -0500 Subject: [PATCH 07/12] Fix order locale alphabetical --- app/config/locale/codes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index b1058a9e8a..1d9ac9fcfd 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -30,8 +30,8 @@ return [ 'kn', // Kannada 'km', // Khmer 'ko', // Korean - 'lt', // Lithuanian 'la', // Latin + 'lt', // Lithuanian 'ml', // Malayalam 'mr', // Marathi 'ms', // Malay From b91c13fcb529767f18e0b3716880d46e2bcba396 Mon Sep 17 00:00:00 2001 From: Fernando Amezcua Date: Wed, 17 Nov 2021 10:58:47 -0600 Subject: [PATCH 08/12] Fix merge changes --- app/config/locale/codes.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 2e1502943e..628ad831c8 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -37,15 +37,11 @@ return [ 'kn', // Kannada 'km', // Khmer 'ko', // Korean -<<<<<<< HEAD 'la', // Latin - 'lt', // Lithuanian -======= 'lb', // Luxembourgish 'lt', // Lithuanian 'la', // Latin 'lv', // Latvian ->>>>>>> 09d2ed9586c390ab66221848c871df130ae7916e 'ml', // Malayalam 'mr', // Marathi 'ms', // Malay From ab961597c42c4a5619f62ea64aab08d0df7592ee Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 28 Nov 2021 07:36:40 +0000 Subject: [PATCH 09/12] fix: upgrade chart.js from 3.5.1 to 3.6.0 Snyk has created this PR to upgrade chart.js from 3.5.1 to 3.6.0. See this package in npm: https://www.npmjs.com/package/chart.js See this project in Snyk: https://app.snyk.io/org/eldadfux/project/8574b5e4-6e89-4ade-bc02-2eaabc43eed0?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d83c0ded3..27f8f09162 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "license": "BSD-3-Clause", "dependencies": { - "chart.js": "^3.5.1", + "chart.js": "^3.6.0", "markdown-it": "^12.2.0", "pell": "^1.0.6", "prismjs": "^1.25.0", @@ -549,9 +549,9 @@ } }, "node_modules/chart.js": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz", - "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz", + "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ==" }, "node_modules/chokidar": { "version": "2.1.8", @@ -5484,9 +5484,9 @@ "dev": true }, "chart.js": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz", - "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz", + "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ==" }, "chokidar": { "version": "2.1.8", diff --git a/package.json b/package.json index 6c71f23a67..135e4ff8a7 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "gulp-less": "^5.0.0" }, "dependencies": { - "chart.js": "^3.5.1", + "chart.js": "^3.6.0", "markdown-it": "^12.2.0", "pell": "^1.0.6", "prismjs": "^1.25.0", From 8b4e1745b13af1159612edaa71b31d02e7762562 Mon Sep 17 00:00:00 2001 From: Fernando Date: Mon, 29 Nov 2021 08:17:07 -0600 Subject: [PATCH 10/12] Fix country duplicated --- app/config/locale/codes.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 628ad831c8..368f44cfa3 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -40,7 +40,6 @@ return [ 'la', // Latin 'lb', // Luxembourgish 'lt', // Lithuanian - 'la', // Latin 'lv', // Latvian 'ml', // Malayalam 'mr', // Marathi From 277d397a41ee33b3d3e2d677313b39bb689f8a6e Mon Sep 17 00:00:00 2001 From: Matej Baco Date: Mon, 6 Dec 2021 16:03:11 +0100 Subject: [PATCH 11/12] Attempt to fix tests --- tests/e2e/Services/Locale/LocaleBase.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/e2e/Services/Locale/LocaleBase.php b/tests/e2e/Services/Locale/LocaleBase.php index 5624571c41..98df97a706 100644 --- a/tests/e2e/Services/Locale/LocaleBase.php +++ b/tests/e2e/Services/Locale/LocaleBase.php @@ -205,15 +205,15 @@ trait LocaleBase $this->assertEquals($response['headers']['status-code'], 200); $this->assertIsArray($response['body']); - $this->assertEquals(185, $response['body']['sum']); + $this->assertEquals(184, $response['body']['sum']); $this->assertEquals($response['body']['languages'][0]['code'], 'aa'); $this->assertEquals($response['body']['languages'][0]['name'], 'Afar'); $this->assertEquals($response['body']['languages'][0]['nativeName'], 'Afar'); - $this->assertEquals($response['body']['languages'][184]['code'], 'zu'); - $this->assertEquals($response['body']['languages'][184]['name'], 'Zulu'); - $this->assertEquals($response['body']['languages'][184]['nativeName'], 'isiZulu'); + $this->assertEquals($response['body']['languages'][183]['code'], 'zu'); + $this->assertEquals($response['body']['languages'][183]['name'], 'Zulu'); + $this->assertEquals($response['body']['languages'][183]['nativeName'], 'isiZulu'); /** * Test for FAILURE From 27b7b73b929d174d41601c78f88b40494e8969ab Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 7 Dec 2021 18:27:56 +0200 Subject: [PATCH 12/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e71cbf57e9..5d2652cf19 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=90a88b&style=flat-square)](https://hacktoberfest.appwrite.io) -[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord) +[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github) [![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite) [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) [![Twitter Account](https://img.shields.io/twitter/follow/appwrite_io?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite_io)