From 1b746debe87a745a3f6889ba1c814db9c6e95cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jess=C3=A9=20Souza?= Date: Sat, 28 Sep 2019 16:04:39 -0300 Subject: [PATCH 01/12] add PT-BR locale --- app/config/locale/pt-br.continents.php | 11 + app/config/locale/pt-br.countries.php | 198 ++++++++++++++++++ app/config/locale/pt-br.php | 21 ++ .../templates/pt-br.email.auth.confirm.tpl | 24 +++ .../templates/pt-br.email.auth.invitation.tpl | 27 +++ .../templates/pt-br.email.auth.recovery.tpl | 24 +++ 6 files changed, 305 insertions(+) create mode 100644 app/config/locale/pt-br.continents.php create mode 100644 app/config/locale/pt-br.countries.php create mode 100644 app/config/locale/pt-br.php create mode 100644 app/config/locale/templates/pt-br.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/pt-br.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/pt-br.email.auth.recovery.tpl diff --git a/app/config/locale/pt-br.continents.php b/app/config/locale/pt-br.continents.php new file mode 100644 index 000000000..9096c20d7 --- /dev/null +++ b/app/config/locale/pt-br.continents.php @@ -0,0 +1,11 @@ + 'África', + 'AN' => 'Antártica', + 'AS' => 'Ásia', + 'EU' => 'Europa', + 'NA' => 'América do Norte', + 'OC' => 'Oceania', + 'SA' => 'América do Sul', +]; diff --git a/app/config/locale/pt-br.countries.php b/app/config/locale/pt-br.countries.php new file mode 100644 index 000000000..3825ebe8f --- /dev/null +++ b/app/config/locale/pt-br.countries.php @@ -0,0 +1,198 @@ + 'Afeganistão', + 'AO' => 'Angola', + 'AL' => 'Albânia', + 'AD' => 'Andorra', + 'AE' => 'Emirados Árabes Unidos', + 'AR' => 'Argentina', + 'AM' => 'Armênia', + 'AG' => 'Antígua e Barbuda', + 'AU' => 'Austrália', + 'AT' => 'Áustria', + 'AZ' => 'Azerbaijão', + 'BI' => 'Burúndi', + 'BE' => 'Bélgica', + 'BJ' => 'Benim', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesh', + 'BG' => 'Bulgária', + 'BH' => 'Bahrein', + 'BS' => 'Bahamas', + 'BA' => 'Bósnia and Herzegovina', + 'BY' => 'Bielorússia', + 'BZ' => 'Belize', + 'BO' => 'Bolívia', + 'BR' => 'Brasil', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Butão', + 'BW' => 'Botsuana', + 'CF' => 'República Centro-Africana', + 'CA' => 'Canadá', + 'CH' => 'Suíça', + 'CL' => 'Chile', + 'CN' => 'China', + 'CI' => 'Costa do Marfim', + 'CM' => 'Camarões', + 'CD' => 'República Democrática do Congo', + 'CG' => 'República do Congo', + 'CO' => 'Colombia', + 'KM' => 'Comores', + 'CV' => 'Cabo Verde', + 'CR' => 'Costa Rica', + 'CU' => 'Cuba', + 'CY' => 'Chipre', + 'CZ' => 'Tchéquia', + 'DE' => 'Alemanha', + 'DJ' => 'Djibouti', + 'DM' => 'Dominica', + 'DK' => 'Dinamarca', + 'DO' => 'República Dominicana', + 'DZ' => 'Argélia', + 'EC' => 'Equador', + 'EG' => 'Egito', + 'ER' => 'Eritrea', + 'ES' => 'Espanha', + 'EE' => 'Estônia', + 'ET' => 'Etiópia', + 'FI' => 'Finlândia', + 'FJ' => 'Fiji', + 'FR' => 'França', + 'FM' => 'Micronésia', + 'GA' => 'Gabão', + 'GB' => 'Reino Unido', + 'GE' => 'Geórgia', + 'GH' => 'Gana', + 'GN' => 'Guiné', + 'GM' => 'Gâmbia', + 'GW' => 'Guiné-Bissau', + 'GQ' => 'Guiné Equatorial', + 'GR' => 'Grécia', + 'GD' => 'Granada', + 'GT' => 'Guatemala', + 'GY' => 'Guiana', + 'HN' => 'Honduras', + 'HR' => 'Croácia', + 'HT' => 'Haiti', + 'HU' => 'Hungria', + 'ID' => 'Indonésia', + 'IN' => 'Índia', + 'IE' => 'Irlanda', + 'IR' => 'Irã', + 'IQ' => 'Iraque', + 'IS' => 'Islândia', + 'IL' => 'Israel', + 'IT' => 'Itália', + 'JM' => 'Jamaica', + 'JO' => 'Jordânia', + 'JP' => 'Japão', + 'KZ' => 'Cazaquistão', + 'KE' => 'Quênia', + 'KG' => 'Quirguistão', + 'KH' => 'Camboja', + 'KI' => 'Quiribati', + 'KN' => 'São Cristóvão e Névis', + 'KR' => 'Coreia do Sul', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Líbano', + 'LR' => 'Libéria', + 'LY' => 'Líbia', + 'LC' => 'Santa Lúcia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesoto', + 'LT' => 'Lituânia', + 'LU' => 'Luxemburgo', + 'LV' => 'Letônia', + 'MA' => 'Marrocos', + 'MC' => 'Mônaco', + 'MD' => 'Moldávia', + 'MG' => 'Madagascar', + 'MV' => 'Maldivas', + 'MX' => 'México', + 'MH' => 'Ilhas Marshall', + 'MK' => 'Macedônia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongólia', + 'MZ' => 'Moçambique', + 'MR' => 'Mauritânia', + 'MU' => 'Ilhas Maurício', + 'MW' => 'Malawi', + 'MY' => 'Malásia', + 'NA' => 'Namíbia', + 'NE' => 'Níger', + 'NG' => 'Nigéria', + 'NI' => 'Nicarágua', + 'NL' => 'Países Baixos', + 'NO' => 'Noruega', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Nova Zelândia', + 'OM' => 'Omã', + 'PK' => 'Paquistão', + 'PA' => 'Panamá', + 'PE' => 'Peru', + 'PH' => 'Filipinas', + 'PW' => 'Palau', + 'PG' => 'Papua-Nova Guiné', + 'PL' => 'Polônia', + 'KP' => 'Coreia do Norte', + 'PT' => 'Portugal', + 'PY' => 'Paraguai', + 'QA' => 'Catar', + 'RO' => 'Romênia', + 'RU' => 'Rússia', + 'RW' => 'Ruanda', + 'SA' => 'Arábia Saudita', + 'SD' => 'Sudão', + 'SN' => 'Senegal', + 'SG' => 'Singapura', + 'SB' => 'Ilhas Salomão', + 'SL' => 'Serra Leoa', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somália', + 'RS' => 'Sérvia', + 'SS' => 'Sudão do Sul', + 'ST' => 'São Tomé e Príncipe', + 'SR' => 'Suriname', + 'SK' => 'Eslováquia', + 'SI' => 'Eslovênia', + 'SE' => 'Suécia', + 'SZ' => 'Suazilândia', + 'SC' => 'Seicheles', + 'SY' => 'Síria', + 'TD' => 'Chade', + 'TG' => 'Togo', + 'TH' => 'Tailândia', + 'TJ' => 'Tajisquistão', + 'TM' => 'Turcomenistão', + 'TL' => 'Timor-Leste', + 'TO' => 'Tonga', + 'TT' => 'Trindade e Tobago', + 'TN' => 'Tunísia', + 'TR' => 'Turquia', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzânia', + 'UG' => 'Uganda', + 'UA' => 'Ucrânia', + 'UY' => 'Uruguai', + 'US' => 'Estados Unidos', + 'UZ' => 'Uzbequistão', + 'VA' => 'Cidade do Vaticano', + 'VC' => 'São Vincente e Granadinas', + 'VE' => 'Venezuela', + 'VN' => 'Vietnã', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Iêmen', + 'ZA' => 'África do Sul', + 'ZM' => 'Zâmbia', + 'ZW' => 'Zimbábue', +]; diff --git a/app/config/locale/pt-br.php b/app/config/locale/pt-br.php new file mode 100644 index 000000000..cc0862288 --- /dev/null +++ b/app/config/locale/pt-br.php @@ -0,0 +1,21 @@ + '"The art of being wise is the art of knowing what to overlook."', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'pt-br', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => 'Time %s', + 'auth.emails.confirm.title' => 'Confirmação de Conta', + 'auth.emails.confirm.body' => 'pt-br.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Redefinição de Senha', + 'auth.emails.recovery.body' => 'pt-br.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Convite para a Equipe %s em %s', + 'auth.emails.invitation.body' => 'pt-br.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Desconhecido', + + 'countries' => include 'pt-br.countries.php', + 'continents' => include 'pt-br.continents.php', +]; diff --git a/app/config/locale/templates/pt-br.email.auth.confirm.tpl b/app/config/locale/templates/pt-br.email.auth.confirm.tpl new file mode 100644 index 000000000..aaee0d5ba --- /dev/null +++ b/app/config/locale/templates/pt-br.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Olá {{name}}, +
+
+ Por favor, confirme o seu email acessando este link abaixo. +
+ {{redirect}} +
+
+ Se a confirmação de email não foi solicitada por você, ignore esta mensagem. +
+
+ Atenciosamente, +
+ Equipe {{project}} +
\ No newline at end of file diff --git a/app/config/locale/templates/pt-br.email.auth.invitation.tpl b/app/config/locale/templates/pt-br.email.auth.invitation.tpl new file mode 100644 index 000000000..e7a5645c5 --- /dev/null +++ b/app/config/locale/templates/pt-br.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ Olá, +
+
+ Este email foi enviado a você porque
{{owner}} deseja lhe convidar a se tornar membro da equipe {{team}} no {{project}}. +
+
+ Siga este link para se juntar a equipe {{team}}: +
+ {{redirect}} +
+
+ Se não estiver interessado, por favor ignore esta mensagem. +
+
+ Atenciosamente, +
+ Equipe {{project}} +
diff --git a/app/config/locale/templates/pt-br.email.auth.recovery.tpl b/app/config/locale/templates/pt-br.email.auth.recovery.tpl new file mode 100644 index 000000000..e70a712cb --- /dev/null +++ b/app/config/locale/templates/pt-br.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Olá {{name}}, +
+
+ Acesse este link para redefinir sua senha do {{project}}. +
+ {{redirect}} +
+
+ Se você não solicitou a redefinição de senha, por favor ignore esta mensagem. +
+
+ Atenciosamente, +
+ Equipe {{project}} +
From 8da99000b49d2fdff5a37fa955740b90aa7f103e Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 22:26:19 +0300 Subject: [PATCH 02/12] Updated contributors list --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fe1614912..f0040e9f7 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,5 @@ Created by [Eldad Fux](https://twitter.com/eldadfux) with the amazing help of ou * 🇺🇸Justin Dorfman ([Github](https://github.com/@jdorfman), [Twitter](https://twitter.com/jdorfman)) * 🇺🇳0xflotus ([Github](https://github.com/0xflotus)) -* 🇳🇴Chaaarles ([Github](https://github.com/Chaaarles)) \ No newline at end of file +* 🇳🇴Chaaarles ([Github](https://github.com/Chaaarles)) +* 🇧🇷Jessé Souza ([Github](https://github.com/jessescn)) \ No newline at end of file From 7f0f533982e3aa0e064b24d269dbb6c097b78e6d Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 22:30:43 +0300 Subject: [PATCH 03/12] Enabled PT-BR locale --- app/init.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/init.php b/app/init.php index fb23c9bdf..f8dceb9f3 100644 --- a/app/init.php +++ b/app/init.php @@ -24,7 +24,7 @@ const APP_EMAIL_TEAM = 'team@' . APP_DOMAIN; const APP_EMAIL_SECURITY = 'security@' . APP_DOMAIN; const APP_USERAGENT = APP_NAME . '-Server/%s Please report abuse at ' . APP_EMAIL_SECURITY; const APP_MODE_ADMIN = 'admin'; -const APP_LOCALES = ['en', 'he']; +const APP_LOCALES = ['en', 'he', 'pt-br']; const APP_PAGING_LIMIT = 15; $register = new Registry(); @@ -128,6 +128,7 @@ Locale::$exceptions = false; Locale::setLanguage('en', include __DIR__ . '/config/locale/en.php'); Locale::setLanguage('he', include __DIR__ . '/config/locale/he.php'); +Locale::setLanguage('pt-br', include __DIR__ . '/config/locale/pt-br.php'); if(in_array($locale, APP_LOCALES)) { Locale::setDefault($locale); From 5d8661fd278b23806876fbade3bb62929228b226 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 22:30:56 +0300 Subject: [PATCH 04/12] Better structure error --- src/Database/Validator/Structure.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Database/Validator/Structure.php b/src/Database/Validator/Structure.php index 3f60d812b..407fbcf06 100644 --- a/src/Database/Validator/Structure.php +++ b/src/Database/Validator/Structure.php @@ -187,8 +187,12 @@ class Structure extends Validator if (empty($validator)) { // Error creating validator for property $this->message = 'Unknown rule type "' . $ruleType . '" for property "' . htmlspecialchars($key, ENT_QUOTES, 'UTF-8') . '"'; - // $this->message = 'Unknown property "'.$key.'" type'. - // '. Make sure to follow '.strtolower($collection->getAttribute('name', 'unknown')).' collection structure'; + + if(empty($ruleType)) { + $this->message = 'Unknown property "'.$key.'" type'. + '. Make sure to follow '.strtolower($collection->getAttribute('name', 'unknown')).' collection structure'; + } + return false; } From fa9a7c778b26de4478e4ab1ee3537e80d9a3540f Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 22:31:14 +0300 Subject: [PATCH 05/12] Fixed OAuth settings update error --- app/config/collections.php | 6 +++--- app/views/console/users/index.phtml | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/config/collections.php b/app/config/collections.php index 64bb0a61c..ac62c1882 100644 --- a/app/config/collections.php +++ b/app/config/collections.php @@ -1076,7 +1076,7 @@ foreach ($providers as $key => $provider) { $collections[Database::SYSTEM_COLLECTION_PROJECTS]['rules'][] = [ '$collection' => Database::SYSTEM_COLLECTION_RULES, 'label' => 'OAuth '.ucfirst($key).' ID', - 'key' => 'oauth'.ucfirst($key), + 'key' => 'usersOauth'.ucfirst($key) . 'Appid', 'type' => 'text', 'default' => '', 'required' => false, @@ -1085,8 +1085,8 @@ foreach ($providers as $key => $provider) { $collections[Database::SYSTEM_COLLECTION_PROJECTS]['rules'][] = [ '$collection' => Database::SYSTEM_COLLECTION_RULES, - 'label' => 'OAuth '.ucfirst($key).' Access Token', - 'key' => 'oauth'.ucfirst($key).'AccessToken', + 'label' => 'OAuth '.ucfirst($key).' Secret', + 'key' => 'usersOauth'.ucfirst($key).'Secret', 'type' => 'text', 'default' => '', 'required' => false, diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml index ccc532861..0ee7c32be 100644 --- a/app/views/console/users/index.phtml +++ b/app/views/console/users/index.phtml @@ -307,8 +307,13 @@ $providers = $this->getParam('providers', []);

  • Providers

    - -
    + +
      $data): if(isset($data['enabled']) && !$data['enabled']) { continue; } ?>
    • @@ -357,7 +362,9 @@ $providers = $this->getParam('providers', []); - +  Disabled From 682b11a5e330969dc4f9e010261d1a7b088a4bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esther=20=C3=81lvarez=20Feijoo?= Date: Sat, 28 Sep 2019 21:29:40 +0200 Subject: [PATCH 06/12] Add spanish translation --- app/config/locale/es.continents.php | 11 + app/config/locale/es.countries.php | 198 ++++++++++++++++++ app/config/locale/es.php | 21 ++ .../templates/es.email.auth.confirm.tpl | 24 +++ .../templates/es.email.auth.invitation.tpl | 27 +++ .../templates/es.email.auth.recovery.tpl | 24 +++ 6 files changed, 305 insertions(+) create mode 100644 app/config/locale/es.continents.php create mode 100644 app/config/locale/es.countries.php create mode 100644 app/config/locale/es.php create mode 100644 app/config/locale/templates/es.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/es.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/es.email.auth.recovery.tpl diff --git a/app/config/locale/es.continents.php b/app/config/locale/es.continents.php new file mode 100644 index 000000000..8822e9aab --- /dev/null +++ b/app/config/locale/es.continents.php @@ -0,0 +1,11 @@ + 'África', + 'AN' => 'Antártica', + 'AS' => 'Asia', + 'EU' => 'Europa', + 'NA' => 'América del Norte', + 'OC' => 'Oceanía', + 'SA' => 'América del Sur', +]; diff --git a/app/config/locale/es.countries.php b/app/config/locale/es.countries.php new file mode 100644 index 000000000..1e9aa3291 --- /dev/null +++ b/app/config/locale/es.countries.php @@ -0,0 +1,198 @@ + 'Afganistán' + 'AO' => 'Angola' + 'AL' => 'Albania' + 'AD' => 'Andorra' + 'AE' => 'Emiratos Árabes Unidos' + 'AR' => 'Argentina' + 'AM' => 'Armenia' + 'AG' => 'Antigua y Barbuda' + 'AU' => 'Australia' + 'AT' => 'Austria' + 'AZ' => 'Azerbaiyán' + 'BI' => 'Burundi' + 'BE' => 'Bélgica' + 'BJ' => 'Benin' + 'BF' => 'Burkina Faso' + 'BD' => 'Bangladesh' + 'BG' => 'Bulgaria' + 'BH' => 'Bahrein' + 'BS' => 'Bahamas' + 'BA' => 'Bosnia y Herzegovina' + 'BY' => 'Bielorrusia' + 'BZ' => 'Belice' + 'BO' => 'Bolivia' + 'BR' => 'Brasil' + 'BB' => 'Barbados' + 'BN' => 'Brunei' + 'BT' => 'Bután' + 'BW' => 'Botsuana' + 'CF' => 'República Centroafricana' + 'CA' => 'Canadá' + 'CH' => 'Suiza' + 'CL' => 'Chile' + 'CN' => 'China' + 'CI' => 'Costa de Marfil' + 'CM' => 'Camerún' + 'CD' => 'República Democrática del Congo' + 'CG' => 'República del congo' + 'CO' => 'Colombia' + 'KM' => 'Comoras' + 'CV' => 'Cabo Verde' + 'CR' => 'Costa Rica' + 'CU' => 'Cuba' + 'CY' => 'Chipre' + 'CZ' => 'Chequia' + 'DE' => 'Alemania' + 'DJ' => 'Yibuti' + 'DM' => 'Dominica' + 'DK' => 'Dinamarca' + 'DO' => 'República Dominicana' + 'DZ' => 'Argelia' + 'EC' => 'Ecuador' + 'EG' => 'Egipto' + 'ER' => 'Eritrea' + 'ES' => 'España' + 'EE' => 'Estonia' + 'ET' => 'Etiopía' + 'FI' => 'Finlandia' + 'FJ' => 'Fiyi' + 'FR' => 'Francia' + 'FM' => 'Micronesia' + 'GA' => 'Gabón' + 'GB' => 'Reino Unido' + 'GE' => 'Georgia' + 'GH' => 'Ghana' + 'GN' => 'Guinea' + 'GM' => 'Gambia' + 'GW' => 'Guinea-Bissau' + 'GQ' => 'Guinea Ecuatorial' + 'GR' => 'Grecia' + 'GD' => 'Granada' + 'GT' => 'Guatemala' + 'GY' => 'Guayana' + 'HN' => 'Honduras' + 'HR' => 'Croacia' + 'HT' => 'Haití' + 'HU' => 'Hungría' + 'ID' => 'Indonesia' + 'IN' => 'India' + 'IE' => 'Irlanda' + 'IR' => 'Iran' + 'IQ' => 'Irak' + 'IS' => 'Islandia' + 'IL' => 'Israel' + 'IT' => 'Italia' + 'JM' => 'Jamaica' + 'JO' => 'Jordán' + 'JP' => 'Japón' + 'KZ' => 'Kazajstán' + 'KE' => 'Kenia' + 'KG' => 'Kirguistán' + 'KH' => 'Camboya' + 'KI' => 'Kiribati' + 'KN' => 'San Cristóbal y Nieves' + 'KR' => 'Corea del Sur' + 'KW' => 'Kuwait' + 'LA' => 'Laos' + 'LB' => 'Líbano' + 'LR' => 'Liberia' + 'LY' => 'Libia' + 'LC' => 'Santa Lucía' + 'LI' => 'Liechtenstein' + 'LK' => 'Sri Lanka' + 'LS' => 'Lesoto' + 'LT' => 'Lituania' + 'LU' => 'Luxemburgo' + 'LV' => 'Letonia' + 'MA' => 'Marruecos' + 'MC' => 'Mónaco' + 'MD' => 'Moldavia' + 'MG' => 'Madagascar' + 'MV' => 'Maldivas' + 'MX' => 'Mexico' + 'MH' => 'Islas Marshall' + 'MK' => 'Macedonia' + 'ML' => 'Mali' + 'MT' => 'Malta' + 'MM' => 'Myanmar' + 'ME' => 'Montenegro' + 'MN' => 'Mongolia' + 'MZ' => 'Mozambique' + 'MR' => 'Mauritania' + 'MU' => 'Mauricio' + 'MW' => 'Malawi' + 'MY' => 'Malasia' + 'NA' => 'Namibia' + 'NE' => 'Níger' + 'NG' => 'Nigeria' + 'NI' => 'Nicaragua' + 'NL' => 'Países Bajos' + 'NO' => 'Noruega' + 'NP' => 'Nepal' + 'NR' => 'Nauru' + 'NZ' => 'Nueva Zelanda' + 'OM' => 'Omán' + 'PK' => 'Pakistán' + 'PA' => 'Panamá' + 'PE' => 'Perú' + 'PH' => 'Filipinas' + 'PW' => 'Palaos' + 'PG' => 'Papúa Nueva Guinea' + 'PL' => 'Polonia' + 'KP' => 'Corea del Norte' + 'PT' => 'Portugal' + 'PY' => 'Paraguay' + 'QA' => 'Katar' + 'RO' => 'Rumania' + 'RU' => 'Rusia' + 'RW' => 'Ruanda' + 'SA' => 'Arabia Saudita' + 'SD' => 'Sudán' + 'SN' => 'Senegal' + 'SG' => 'Singapur' + 'SB' => 'Islas Salomón' + 'SL' => 'Sierra Leona' + 'SV' => 'El Salvador' + 'SM' => 'San Marino' + 'SO' => 'Somalia' + 'RS' => 'Serbia' + 'SS' => 'Sudán del Sur' + 'ST' => 'Santo Tomé y Príncipe' + 'SR' => 'Surinam' + 'SK' => 'Eslovaquia' + 'SI' => 'Eslovenia' + 'SE' => 'Suecia' + 'SZ' => 'Suazilandia' + 'SC' => 'Seychelles' + 'SY' => 'Siria' + 'TD' => 'Chad' + 'TG' => 'Togo' + 'TH' => 'Tailandia' + 'TJ' => 'Tayikistán' + 'TM' => 'Turkmenistán' + 'TL' => 'Timor Oriental' + 'TO' => 'Tonga' + 'TT' => 'Trinidad y Tobago' + 'TN' => 'Túnez' + 'TR' => 'Turquía' + 'TV' => 'Tuvalu' + 'TZ' => 'Tanzania' + 'UG' => 'Uganda' + 'UA' => 'Ucrania' + 'UY' => 'Uruguay' + 'US' => 'Estados Unidos' + 'UZ' => 'Uzbekistán' + 'VA' => 'Ciudad del Vaticano' + 'VC' => 'San Vicente y las Granadinas' + 'VE' => 'Venezuela' + 'VN' => 'Vietnam' + 'VU' => 'Vanuatu' + 'WS' => 'Samoa' + 'YE' => 'Yemen' + 'ZA' => 'Sudáfrica' + 'ZM' => 'Zambia' + 'ZW' => 'Zimbabue' +]; \ No newline at end of file diff --git a/app/config/locale/es.php b/app/config/locale/es.php new file mode 100644 index 000000000..5554e71a5 --- /dev/null +++ b/app/config/locale/es.php @@ -0,0 +1,21 @@ + '"El arte de ser sabio es el arte de saber qu pasar por alto"', // This is the line printed in the homepage and console 'view-source' + 'settings.locale' => 'es', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => '%s Equipo', + 'auth.emails.confirm.title' => 'Confirmacin de la cuenta', + 'auth.emails.confirm.body' => 'es.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Reestablecer contrasea', + 'auth.emails.recovery.body' => 'es.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Invitacin al Equipo %s en %s', + 'auth.emails.invitation.body' => 'es.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Desconocido', + + 'countries' => include 'es.countries.php', + 'continents' => include 'es.continents.php', +]; diff --git a/app/config/locale/templates/es.email.auth.confirm.tpl b/app/config/locale/templates/es.email.auth.confirm.tpl new file mode 100644 index 000000000..3bb7e97b6 --- /dev/null +++ b/app/config/locale/templates/es.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
      + Hola {{name}}, +
      +
      + Sigue este enlace para verificar tu dirección de correo: +
      + {{redirect}} +
      +
      + Si no has solicitado verificar esta dirección, puedes ignorar este mensaje. +
      +
      + Gracias, +
      + Equipo {{project}} +
      \ No newline at end of file diff --git a/app/config/locale/templates/es.email.auth.invitation.tpl b/app/config/locale/templates/es.email.auth.invitation.tpl new file mode 100644 index 000000000..aa0469d9c --- /dev/null +++ b/app/config/locale/templates/es.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
      + Hola, +
      +
      + Te hemos enviamos este correo porque {{owner}} quiere invitarte a formar parte del equipo {{team}} en {{project}}. +
      +
      + Sigue este enlace para unirte al equipo {{team}}: +
      + {{redirect}} +
      +
      + Si no ests interesado, puedes ignorar este mensaje. +
      +
      + Gracias, +
      + Equipo {{project}} +
      diff --git a/app/config/locale/templates/es.email.auth.recovery.tpl b/app/config/locale/templates/es.email.auth.recovery.tpl new file mode 100644 index 000000000..6f78fffa7 --- /dev/null +++ b/app/config/locale/templates/es.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
      + Hola {{name}}, +
      +
      + Sigue este enlace para reestablecer tu contraseña de {{project}}. +
      + {{redirect}} +
      +
      + Si no has pedido reestablecer tu contraseña, puedes ignorar este mensaje. +
      +
      + Gracias, +
      + Equipo {{project}} +
      From 2d87795b78faab619313428051886df343a8e8f0 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 22:47:01 +0300 Subject: [PATCH 07/12] Updated console titles --- app/controllers/console.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/console.php b/app/controllers/console.php index 222ec917c..d8caebe4c 100644 --- a/app/controllers/console.php +++ b/app/controllers/console.php @@ -216,7 +216,7 @@ $utopia->get('/console/users') $page->setParam('providers', $providers); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.users.title')) + ->setParam('title', APP_NAME.' - Users') ->setParam('body', $page); }); @@ -228,6 +228,6 @@ $utopia->get('/console/users/view') $page = new View(__DIR__.'/../views/console/users/view.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.users.title')) + ->setParam('title', APP_NAME.' - View User') ->setParam('body', $page); }); From f99db9d1ebb1616f9e0684908fae3316dd8ca987 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 22:58:10 +0300 Subject: [PATCH 08/12] Updated creadits --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f0040e9f7..eac5f961d 100644 --- a/README.md +++ b/README.md @@ -101,4 +101,5 @@ Created by [Eldad Fux](https://twitter.com/eldadfux) with the amazing help of ou * 🇺🇸Justin Dorfman ([Github](https://github.com/@jdorfman), [Twitter](https://twitter.com/jdorfman)) * 🇺🇳0xflotus ([Github](https://github.com/0xflotus)) * 🇳🇴Chaaarles ([Github](https://github.com/Chaaarles)) -* 🇧🇷Jessé Souza ([Github](https://github.com/jessescn)) \ No newline at end of file +* 🇧🇷Jessé Souza ([Github](https://github.com/jessescn)) +* 🇪🇸Esther Álvarez Feijoo ([Github](https://github.com/EstherAF)) \ No newline at end of file From af89e00912de96bb55a5ccf8e9b1b0da6e163f34 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 23:01:56 +0300 Subject: [PATCH 09/12] Fixed PHP array structure --- app/config/locale/es.countries.php | 388 ++++++++++++++--------------- 1 file changed, 194 insertions(+), 194 deletions(-) diff --git a/app/config/locale/es.countries.php b/app/config/locale/es.countries.php index 1e9aa3291..796dc9c95 100644 --- a/app/config/locale/es.countries.php +++ b/app/config/locale/es.countries.php @@ -1,198 +1,198 @@  'Afganistán' - 'AO' => 'Angola' - 'AL' => 'Albania' - 'AD' => 'Andorra' - 'AE' => 'Emiratos Árabes Unidos' - 'AR' => 'Argentina' - 'AM' => 'Armenia' - 'AG' => 'Antigua y Barbuda' - 'AU' => 'Australia' - 'AT' => 'Austria' - 'AZ' => 'Azerbaiyán' - 'BI' => 'Burundi' - 'BE' => 'Bélgica' - 'BJ' => 'Benin' - 'BF' => 'Burkina Faso' - 'BD' => 'Bangladesh' - 'BG' => 'Bulgaria' - 'BH' => 'Bahrein' - 'BS' => 'Bahamas' - 'BA' => 'Bosnia y Herzegovina' - 'BY' => 'Bielorrusia' - 'BZ' => 'Belice' - 'BO' => 'Bolivia' - 'BR' => 'Brasil' - 'BB' => 'Barbados' - 'BN' => 'Brunei' - 'BT' => 'Bután' - 'BW' => 'Botsuana' - 'CF' => 'República Centroafricana' - 'CA' => 'Canadá' - 'CH' => 'Suiza' - 'CL' => 'Chile' - 'CN' => 'China' - 'CI' => 'Costa de Marfil' - 'CM' => 'Camerún' - 'CD' => 'República Democrática del Congo' - 'CG' => 'República del congo' - 'CO' => 'Colombia' - 'KM' => 'Comoras' - 'CV' => 'Cabo Verde' - 'CR' => 'Costa Rica' - 'CU' => 'Cuba' - 'CY' => 'Chipre' - 'CZ' => 'Chequia' - 'DE' => 'Alemania' - 'DJ' => 'Yibuti' - 'DM' => 'Dominica' - 'DK' => 'Dinamarca' - 'DO' => 'República Dominicana' - 'DZ' => 'Argelia' - 'EC' => 'Ecuador' - 'EG' => 'Egipto' - 'ER' => 'Eritrea' - 'ES' => 'España' - 'EE' => 'Estonia' - 'ET' => 'Etiopía' - 'FI' => 'Finlandia' - 'FJ' => 'Fiyi' - 'FR' => 'Francia' - 'FM' => 'Micronesia' - 'GA' => 'Gabón' - 'GB' => 'Reino Unido' - 'GE' => 'Georgia' - 'GH' => 'Ghana' - 'GN' => 'Guinea' - 'GM' => 'Gambia' - 'GW' => 'Guinea-Bissau' - 'GQ' => 'Guinea Ecuatorial' - 'GR' => 'Grecia' - 'GD' => 'Granada' - 'GT' => 'Guatemala' - 'GY' => 'Guayana' - 'HN' => 'Honduras' - 'HR' => 'Croacia' - 'HT' => 'Haití' - 'HU' => 'Hungría' - 'ID' => 'Indonesia' - 'IN' => 'India' - 'IE' => 'Irlanda' - 'IR' => 'Iran' - 'IQ' => 'Irak' - 'IS' => 'Islandia' - 'IL' => 'Israel' - 'IT' => 'Italia' - 'JM' => 'Jamaica' - 'JO' => 'Jordán' - 'JP' => 'Japón' - 'KZ' => 'Kazajstán' - 'KE' => 'Kenia' - 'KG' => 'Kirguistán' - 'KH' => 'Camboya' - 'KI' => 'Kiribati' - 'KN' => 'San Cristóbal y Nieves' - 'KR' => 'Corea del Sur' - 'KW' => 'Kuwait' - 'LA' => 'Laos' - 'LB' => 'Líbano' - 'LR' => 'Liberia' - 'LY' => 'Libia' - 'LC' => 'Santa Lucía' - 'LI' => 'Liechtenstein' - 'LK' => 'Sri Lanka' - 'LS' => 'Lesoto' - 'LT' => 'Lituania' - 'LU' => 'Luxemburgo' - 'LV' => 'Letonia' - 'MA' => 'Marruecos' - 'MC' => 'Mónaco' - 'MD' => 'Moldavia' - 'MG' => 'Madagascar' - 'MV' => 'Maldivas' - 'MX' => 'Mexico' - 'MH' => 'Islas Marshall' - 'MK' => 'Macedonia' - 'ML' => 'Mali' - 'MT' => 'Malta' - 'MM' => 'Myanmar' - 'ME' => 'Montenegro' - 'MN' => 'Mongolia' - 'MZ' => 'Mozambique' - 'MR' => 'Mauritania' - 'MU' => 'Mauricio' - 'MW' => 'Malawi' - 'MY' => 'Malasia' - 'NA' => 'Namibia' - 'NE' => 'Níger' - 'NG' => 'Nigeria' - 'NI' => 'Nicaragua' - 'NL' => 'Países Bajos' - 'NO' => 'Noruega' - 'NP' => 'Nepal' - 'NR' => 'Nauru' - 'NZ' => 'Nueva Zelanda' - 'OM' => 'Omán' - 'PK' => 'Pakistán' - 'PA' => 'Panamá' - 'PE' => 'Perú' - 'PH' => 'Filipinas' - 'PW' => 'Palaos' - 'PG' => 'Papúa Nueva Guinea' - 'PL' => 'Polonia' - 'KP' => 'Corea del Norte' - 'PT' => 'Portugal' - 'PY' => 'Paraguay' - 'QA' => 'Katar' - 'RO' => 'Rumania' - 'RU' => 'Rusia' - 'RW' => 'Ruanda' - 'SA' => 'Arabia Saudita' - 'SD' => 'Sudán' - 'SN' => 'Senegal' - 'SG' => 'Singapur' - 'SB' => 'Islas Salomón' - 'SL' => 'Sierra Leona' - 'SV' => 'El Salvador' - 'SM' => 'San Marino' - 'SO' => 'Somalia' - 'RS' => 'Serbia' - 'SS' => 'Sudán del Sur' - 'ST' => 'Santo Tomé y Príncipe' - 'SR' => 'Surinam' - 'SK' => 'Eslovaquia' - 'SI' => 'Eslovenia' - 'SE' => 'Suecia' - 'SZ' => 'Suazilandia' - 'SC' => 'Seychelles' - 'SY' => 'Siria' - 'TD' => 'Chad' - 'TG' => 'Togo' - 'TH' => 'Tailandia' - 'TJ' => 'Tayikistán' - 'TM' => 'Turkmenistán' - 'TL' => 'Timor Oriental' - 'TO' => 'Tonga' - 'TT' => 'Trinidad y Tobago' - 'TN' => 'Túnez' - 'TR' => 'Turquía' - 'TV' => 'Tuvalu' - 'TZ' => 'Tanzania' - 'UG' => 'Uganda' - 'UA' => 'Ucrania' - 'UY' => 'Uruguay' - 'US' => 'Estados Unidos' - 'UZ' => 'Uzbekistán' - 'VA' => 'Ciudad del Vaticano' - 'VC' => 'San Vicente y las Granadinas' - 'VE' => 'Venezuela' - 'VN' => 'Vietnam' - 'VU' => 'Vanuatu' - 'WS' => 'Samoa' - 'YE' => 'Yemen' - 'ZA' => 'Sudáfrica' - 'ZM' => 'Zambia' - 'ZW' => 'Zimbabue' + 'AF' => 'Afganistán', + 'AO' => 'Angola', + 'AL' => 'Albania', + 'AD' => 'Andorra', + 'AE' => 'Emiratos Árabes Unidos', + 'AR' => 'Argentina', + 'AM' => 'Armenia', + 'AG' => 'Antigua y Barbuda', + 'AU' => 'Australia', + 'AT' => 'Austria', + 'AZ' => 'Azerbaiyán', + 'BI' => 'Burundi', + 'BE' => 'Bélgica', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Bangladesh', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrein', + 'BS' => 'Bahamas', + 'BA' => 'Bosnia y Herzegovina', + 'BY' => 'Bielorrusia', + 'BZ' => 'Belice', + 'BO' => 'Bolivia', + 'BR' => 'Brasil', + 'BB' => 'Barbados', + 'BN' => 'Brunei', + 'BT' => 'Bután', + 'BW' => 'Botsuana', + 'CF' => 'República Centroafricana', + 'CA' => 'Canadá', + 'CH' => 'Suiza', + 'CL' => 'Chile', + 'CN' => 'China', + 'CI' => 'Costa de Marfil', + 'CM' => 'Camerún', + 'CD' => 'República Democrática del Congo', + 'CG' => 'República del congo', + 'CO' => 'Colombia', + 'KM' => 'Comoras', + 'CV' => 'Cabo Verde', + 'CR' => 'Costa Rica', + 'CU' => 'Cuba', + 'CY' => 'Chipre', + 'CZ' => 'Chequia', + 'DE' => 'Alemania', + 'DJ' => 'Yibuti', + 'DM' => 'Dominica', + 'DK' => 'Dinamarca', + 'DO' => 'República Dominicana', + 'DZ' => 'Argelia', + 'EC' => 'Ecuador', + 'EG' => 'Egipto', + 'ER' => 'Eritrea', + 'ES' => 'España', + 'EE' => 'Estonia', + 'ET' => 'Etiopía', + 'FI' => 'Finlandia', + 'FJ' => 'Fiyi', + 'FR' => 'Francia', + 'FM' => 'Micronesia', + 'GA' => 'Gabón', + 'GB' => 'Reino Unido', + 'GE' => 'Georgia', + 'GH' => 'Ghana', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Guinea Ecuatorial', + 'GR' => 'Grecia', + 'GD' => 'Granada', + 'GT' => 'Guatemala', + 'GY' => 'Guayana', + 'HN' => 'Honduras', + 'HR' => 'Croacia', + 'HT' => 'Haití', + 'HU' => 'Hungría', + 'ID' => 'Indonesia', + 'IN' => 'India', + 'IE' => 'Irlanda', + 'IR' => 'Iran', + 'IQ' => 'Irak', + 'IS' => 'Islandia', + 'IL' => 'Israel', + 'IT' => 'Italia', + 'JM' => 'Jamaica', + 'JO' => 'Jordán', + 'JP' => 'Japón', + 'KZ' => 'Kazajstán', + 'KE' => 'Kenia', + 'KG' => 'Kirguistán', + 'KH' => 'Camboya', + 'KI' => 'Kiribati', + 'KN' => 'San Cristóbal y Nieves', + 'KR' => 'Corea del Sur', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LB' => 'Líbano', + 'LR' => 'Liberia', + 'LY' => 'Libia', + 'LC' => 'Santa Lucía', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesoto', + 'LT' => 'Lituania', + 'LU' => 'Luxemburgo', + 'LV' => 'Letonia', + 'MA' => 'Marruecos', + 'MC' => 'Mónaco', + 'MD' => 'Moldavia', + 'MG' => 'Madagascar', + 'MV' => 'Maldivas', + 'MX' => 'Mexico', + 'MH' => 'Islas Marshall', + 'MK' => 'Macedonia', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MM' => 'Myanmar', + 'ME' => 'Montenegro', + 'MN' => 'Mongolia', + 'MZ' => 'Mozambique', + 'MR' => 'Mauritania', + 'MU' => 'Mauricio', + 'MW' => 'Malawi', + 'MY' => 'Malasia', + 'NA' => 'Namibia', + 'NE' => 'Níger', + 'NG' => 'Nigeria', + 'NI' => 'Nicaragua', + 'NL' => 'Países Bajos', + 'NO' => 'Noruega', + 'NP' => 'Nepal', + 'NR' => 'Nauru', + 'NZ' => 'Nueva Zelanda', + 'OM' => 'Omán', + 'PK' => 'Pakistán', + 'PA' => 'Panamá', + 'PE' => 'Perú', + 'PH' => 'Filipinas', + 'PW' => 'Palaos', + 'PG' => 'Papúa Nueva Guinea', + 'PL' => 'Polonia', + 'KP' => 'Corea del Norte', + 'PT' => 'Portugal', + 'PY' => 'Paraguay', + 'QA' => 'Katar', + 'RO' => 'Rumania', + 'RU' => 'Rusia', + 'RW' => 'Ruanda', + 'SA' => 'Arabia Saudita', + 'SD' => 'Sudán', + 'SN' => 'Senegal', + 'SG' => 'Singapur', + 'SB' => 'Islas Salomón', + 'SL' => 'Sierra Leona', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Somalia', + 'RS' => 'Serbia', + 'SS' => 'Sudán del Sur', + 'ST' => 'Santo Tomé y Príncipe', + 'SR' => 'Surinam', + 'SK' => 'Eslovaquia', + 'SI' => 'Eslovenia', + 'SE' => 'Suecia', + 'SZ' => 'Suazilandia', + 'SC' => 'Seychelles', + 'SY' => 'Siria', + 'TD' => 'Chad', + 'TG' => 'Togo', + 'TH' => 'Tailandia', + 'TJ' => 'Tayikistán', + 'TM' => 'Turkmenistán', + 'TL' => 'Timor Oriental', + 'TO' => 'Tonga', + 'TT' => 'Trinidad y Tobago', + 'TN' => 'Túnez', + 'TR' => 'Turquía', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzania', + 'UG' => 'Uganda', + 'UA' => 'Ucrania', + 'UY' => 'Uruguay', + 'US' => 'Estados Unidos', + 'UZ' => 'Uzbekistán', + 'VA' => 'Ciudad del Vaticano', + 'VC' => 'San Vicente y las Granadinas', + 'VE' => 'Venezuela', + 'VN' => 'Vietnam', + 'VU' => 'Vanuatu', + 'WS' => 'Samoa', + 'YE' => 'Yemen', + 'ZA' => 'Sudáfrica', + 'ZM' => 'Zambia', + 'ZW' => 'Zimbabue', ]; \ No newline at end of file From 526acd131c16e57834229aa8e0dec2a10fe2b4b6 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 23:02:16 +0300 Subject: [PATCH 10/12] Enabled es locale --- app/init.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/init.php b/app/init.php index f8dceb9f3..4db74f3bc 100644 --- a/app/init.php +++ b/app/init.php @@ -24,7 +24,7 @@ const APP_EMAIL_TEAM = 'team@' . APP_DOMAIN; const APP_EMAIL_SECURITY = 'security@' . APP_DOMAIN; const APP_USERAGENT = APP_NAME . '-Server/%s Please report abuse at ' . APP_EMAIL_SECURITY; const APP_MODE_ADMIN = 'admin'; -const APP_LOCALES = ['en', 'he', 'pt-br']; +const APP_LOCALES = ['en', 'he', 'pt-br', 'es']; const APP_PAGING_LIMIT = 15; $register = new Registry(); @@ -129,6 +129,7 @@ Locale::$exceptions = false; Locale::setLanguage('en', include __DIR__ . '/config/locale/en.php'); Locale::setLanguage('he', include __DIR__ . '/config/locale/he.php'); Locale::setLanguage('pt-br', include __DIR__ . '/config/locale/pt-br.php'); +Locale::setLanguage('es', include __DIR__ . '/config/locale/es.php'); if(in_array($locale, APP_LOCALES)) { Locale::setDefault($locale); From fd5673c2b42396e9aa9179a9322ac15ce57327c8 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sat, 28 Sep 2019 23:28:44 +0300 Subject: [PATCH 11/12] Debug tests --- tests/e2e/ConsoleHealthTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/e2e/ConsoleHealthTest.php b/tests/e2e/ConsoleHealthTest.php index 34b1b5d54..084f78d77 100644 --- a/tests/e2e/ConsoleHealthTest.php +++ b/tests/e2e/ConsoleHealthTest.php @@ -13,6 +13,8 @@ class ConsoleHealthTest extends BaseConsole 'content-type' => 'application/json', ], []); + var_dump($response); + $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('OK', $response['body']['status']); } From a018f2532d5017da7343806289de87d6cc9250a8 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Sun, 29 Sep 2019 00:34:12 +0300 Subject: [PATCH 12/12] Fixed encoding --- app/config/locale/es.countries.php | 3 +-- app/config/locale/es.php | 8 ++++---- tests/e2e/ConsoleHealthTest.php | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/config/locale/es.countries.php b/app/config/locale/es.countries.php index 796dc9c95..b8fec0848 100644 --- a/app/config/locale/es.countries.php +++ b/app/config/locale/es.countries.php @@ -1,5 +1,4 @@ - 'Afganistán', 'AO' => 'Angola', diff --git a/app/config/locale/es.php b/app/config/locale/es.php index 5554e71a5..0a5674368 100644 --- a/app/config/locale/es.php +++ b/app/config/locale/es.php @@ -1,17 +1,17 @@ '"El arte de ser sabio es el arte de saber qu pasar por alto"', // This is the line printed in the homepage and console 'view-source' + 'settings.inspire' => '"El arte de ser sabio es el arte de saber qué pasar por alto"', // This is the line printed in the homepage and console 'view-source' 'settings.locale' => 'es', 'settings.direction' => 'ltr', // Service - Users 'auth.emails.team' => '%s Equipo', - 'auth.emails.confirm.title' => 'Confirmacin de la cuenta', + 'auth.emails.confirm.title' => 'Confirmación de la cuenta', 'auth.emails.confirm.body' => 'es.email.auth.confirm.tpl', - 'auth.emails.recovery.title' => 'Reestablecer contrasea', + 'auth.emails.recovery.title' => 'Reestablecer contraseña', 'auth.emails.recovery.body' => 'es.email.auth.recovery.tpl', - 'auth.emails.invitation.title' => 'Invitacin al Equipo %s en %s', + 'auth.emails.invitation.title' => 'Invitación al Equipo %s en %s', 'auth.emails.invitation.body' => 'es.email.auth.invitation.tpl', 'locale.country.unknown' => 'Desconocido', diff --git a/tests/e2e/ConsoleHealthTest.php b/tests/e2e/ConsoleHealthTest.php index 084f78d77..34b1b5d54 100644 --- a/tests/e2e/ConsoleHealthTest.php +++ b/tests/e2e/ConsoleHealthTest.php @@ -13,8 +13,6 @@ class ConsoleHealthTest extends BaseConsole 'content-type' => 'application/json', ], []); - var_dump($response); - $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('OK', $response['body']['status']); }