From 09d47851211ef533d1d04eef80f53fe772805c99 Mon Sep 17 00:00:00 2001 From: Sandor Nagy Date: Tue, 1 Oct 2019 00:43:07 +0200 Subject: [PATCH 1/2] Added hungarian translations --- app/config/locale/hu.continents.php | 11 + app/config/locale/hu.countries.php | 198 ++++++++++++++++++ app/config/locale/hu.php | 21 ++ .../templates/hu.email.auth.confirm.tpl | 24 +++ .../templates/hu.email.auth.invitation.tpl | 27 +++ .../templates/hu.email.auth.recovery.tpl | 24 +++ docker-compose.yml | 140 ++++++------- 7 files changed, 370 insertions(+), 75 deletions(-) create mode 100644 app/config/locale/hu.continents.php create mode 100644 app/config/locale/hu.countries.php create mode 100644 app/config/locale/hu.php create mode 100644 app/config/locale/templates/hu.email.auth.confirm.tpl create mode 100644 app/config/locale/templates/hu.email.auth.invitation.tpl create mode 100644 app/config/locale/templates/hu.email.auth.recovery.tpl diff --git a/app/config/locale/hu.continents.php b/app/config/locale/hu.continents.php new file mode 100644 index 0000000000..57a88d6f7c --- /dev/null +++ b/app/config/locale/hu.continents.php @@ -0,0 +1,11 @@ + 'Afrika', + 'AN' => 'Antarktika', + 'AS' => 'Ázsia', + 'EU' => 'Európa', + 'NA' => 'Észak-Amerika', + 'OC' => 'Óceánia', + 'SA' => 'Dél-Amerika', +]; diff --git a/app/config/locale/hu.countries.php b/app/config/locale/hu.countries.php new file mode 100644 index 0000000000..949313c35a --- /dev/null +++ b/app/config/locale/hu.countries.php @@ -0,0 +1,198 @@ + 'Afganisztán', + 'AO' => 'Angola', + 'AL' => 'Albánia', + 'AD' => 'Andorra', + 'AE' => 'Egyesült Arab Emírségek', + 'AR' => 'Argentína', + 'AM' => 'Örményország', + 'AG' => 'Antigua és Barbuda', + 'AU' => 'Ausztrália', + 'AT' => 'Ausztria', + 'AZ' => 'Azerbajdzsán', + 'BI' => 'Burundi', + 'BE' => 'Belgium', + 'BJ' => 'Benin', + 'BF' => 'Burkina Faso', + 'BD' => 'Banglades', + 'BG' => 'Bulgaria', + 'BH' => 'Bahrein', + 'BS' => 'Bahamák', + 'BA' => 'Bosznia-Hercegovina', + 'BY' => 'Fehéroroszország', + 'BZ' => 'Belize', + 'BO' => 'Bolívia', + 'BR' => 'Brazília', + 'BB' => 'Barbadosz', + 'BN' => 'Brunei', + 'BT' => 'Bhután', + 'BW' => 'Botswana', + 'CF' => 'Közép-afrikai Köztársaság', + 'CA' => 'Kanada', + 'CH' => 'Svájc', + 'CL' => 'Chile', + 'CN' => 'Kína', + 'CI' => 'Elefántcsontpart', + 'CM' => 'Kamerun', + 'CD' => 'Kongói Demokratikus Köztársaság', + 'CG' => 'Kongói Köztársaság', + 'CO' => 'Kolumbia', + 'KM' => 'Comoros', + 'CV' => 'Zöld-foki Köztársaság', + 'CR' => 'Costa Rica', + 'CU' => 'Kuba', + 'CY' => 'Ciprus', + 'CZ' => 'Csehország', + 'DE' => 'Németország', + 'DJ' => 'Djibouti', + 'DM' => 'Dominika', + 'DK' => 'Dánia', + 'DO' => 'Dominikai Köztársaság', + 'DZ' => 'Algíria', + 'EC' => 'Ecuador', + 'EG' => 'Egyiptom', + 'ER' => 'Eritrea', + 'ES' => 'Spanyolország', + 'EE' => 'Észtország', + 'ET' => 'Etiópia', + 'FI' => 'Finnország', + 'FJ' => 'Fidzsi-szigetek', + 'FR' => 'Franciaország', + 'FM' => 'Mikronéziai Szövetségi Államok', + 'GA' => 'Gabon', + 'GB' => 'Egyesült Királyság', + 'GE' => 'Grúzia', + 'GH' => 'Ghána', + 'GN' => 'Guinea', + 'GM' => 'Gambia', + 'GW' => 'Guinea-Bissau', + 'GQ' => 'Egyenlítői-Guinea', + 'GR' => 'Görögország', + 'GD' => 'Grenada', + 'GT' => 'Guatemala', + 'GY' => 'Guyana', + 'HN' => 'Honduras', + 'HR' => 'Horvátország', + 'HT' => 'Haiti', + 'HU' => 'Magyarország', + 'ID' => 'Indonézia', + 'IN' => 'India', + 'IE' => 'Írország', + 'IR' => 'Irán', + 'IQ' => 'Iraq', + 'IS' => 'Izland', + 'IL' => 'Izrael', + 'IT' => 'Olaszország', + 'JM' => 'Jamaika', + 'JO' => 'Jordánia', + 'JP' => 'Japán', + 'KZ' => 'Kazakhsztán', + 'KE' => 'Kenya', + 'KG' => 'Kirgizisztán', + 'KH' => 'Kambodzsa', + 'KI' => 'Kiribati', + 'KN' => 'Saint Kitts és Nevis', + 'KR' => 'Dél Korea', + 'KW' => 'Kuwait', + 'LA' => 'Laosz', + 'LB' => 'Libanon', + 'LR' => 'Libéria', + 'LY' => 'Líbia', + 'LC' => 'Saint Lucia', + 'LI' => 'Liechtenstein', + 'LK' => 'Sri Lanka', + 'LS' => 'Lesotho', + 'LT' => 'Litvánia', + 'LU' => 'Luxembourg', + 'LV' => 'Lettország', + 'MA' => 'Marokkó', + 'MC' => 'Monaco', + 'MD' => 'Moldova', + 'MG' => 'Madagaszkár', + 'MV' => 'Maldív-szigetek', + 'MX' => 'Mexikó', + 'MH' => 'Marshall-szigetek', + 'MK' => 'Macedónia', + 'ML' => 'Mali', + 'MT' => 'Málta', + 'MM' => 'Mianmar', + 'ME' => 'Montenegró', + 'MN' => 'Mongólia', + 'MZ' => 'Mozambik', + 'MR' => 'Mauritánia', + 'MU' => 'Mauritius', + 'MW' => 'Malawi', + 'MY' => 'Malajzia', + 'NA' => 'Namíbia', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NI' => 'Nikaragua', + 'NL' => 'Hollandia', + 'NO' => 'Norvégia', + 'NP' => 'Nepál', + 'NR' => 'Nauru', + 'NZ' => 'Új-Zéland', + 'OM' => 'Omán', + 'PK' => 'Pakisztán', + 'PA' => 'Panama', + 'PE' => 'Peru', + 'PH' => 'Fülöp-szigetek', + 'PW' => 'Palau', + 'PG' => 'Pápua Új-Guinea', + 'PL' => 'Lengyelország', + 'KP' => 'Észak-Korea', + 'PT' => 'Portugália', + 'PY' => 'Paraguay', + 'QA' => 'Qatar', + 'RO' => 'Románia', + 'RU' => 'Oroszország', + 'RW' => 'Rwanda', + 'SA' => 'Szaúd-Arábia', + 'SD' => 'Szudán', + 'SN' => 'Szenegál', + 'SG' => 'Szingapúr', + 'SB' => 'Salamon-szigetek', + 'SL' => 'Sierra Leone', + 'SV' => 'El Salvador', + 'SM' => 'San Marino', + 'SO' => 'Szomália', + 'RS' => 'Szerbia', + 'SS' => 'Dél-Szudán', + 'ST' => 'São Tomé és Príncipe', + 'SR' => 'Szurinám', + 'SK' => 'Szlovákia', + 'SI' => 'Szlovénia', + 'SE' => 'Svédország', + 'SZ' => 'Swaziland', + 'SC' => 'Seychelles-szigetek', + 'SY' => 'Szíria', + 'TD' => 'Csád', + 'TG' => 'Togo', + 'TH' => 'Tájföld', + 'TJ' => 'Tádzsikisztán', + 'TM' => 'Türkmenisztán', + 'TL' => 'Timor-Leste', + 'TO' => 'Tonga', + 'TT' => 'Trinidad és Tobago', + 'TN' => 'Tunézia', + 'TR' => 'Törökország', + 'TV' => 'Tuvalu', + 'TZ' => 'Tanzania', + 'UG' => 'Uganda', + 'UA' => 'Ukraina', + 'UY' => 'Uruguay', + 'US' => 'Egyesült Államok', + 'UZ' => 'Üzbegisztán', + 'VA' => 'Vatikánváros', + 'VC' => 'Saint Vincent és a Grenadine-szigetek', + 'VE' => 'Venezuela', + 'VN' => 'Vietnám', + 'VU' => 'Vanuatu', + 'WS' => 'Szamoa', + 'YE' => 'Yemen', + 'ZA' => 'Dél-Afrikai Köztársaság', + 'ZM' => 'Zambia', + 'ZW' => 'Zimbabwe', +]; diff --git a/app/config/locale/hu.php b/app/config/locale/hu.php new file mode 100644 index 0000000000..a4ca49b5c2 --- /dev/null +++ b/app/config/locale/hu.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' => 'hu', + 'settings.direction' => 'ltr', + + // Service - Users + 'auth.emails.team' => '%s Csapat', + 'auth.emails.confirm.title' => 'Fiók megerősítés', + 'auth.emails.confirm.body' => 'hu.email.auth.confirm.tpl', + 'auth.emails.recovery.title' => 'Jelszó Visszaállítás', + 'auth.emails.recovery.body' => 'hu.email.auth.recovery.tpl', + 'auth.emails.invitation.title' => 'Meghívás a %s Csapathoz %s', + 'auth.emails.invitation.body' => 'hu.email.auth.invitation.tpl', + + 'locale.country.unknown' => 'Ismeretlen', + + 'countries' => include 'hu.countries.php', + 'continents' => include 'hu.continents.php', +]; diff --git a/app/config/locale/templates/hu.email.auth.confirm.tpl b/app/config/locale/templates/hu.email.auth.confirm.tpl new file mode 100644 index 0000000000..680e0da2ec --- /dev/null +++ b/app/config/locale/templates/hu.email.auth.confirm.tpl @@ -0,0 +1,24 @@ + + +
+ Szia {{name}}, +
+
+ Kattints erre a linkre, hogy megerősítsd az e-mail címed. +
+ {{redirect}} +
+
+ Ha nem kérelmezted, hogy megerősítsük ezt a címet, ignoráld ezt a levelet. +
+
+ Köszönettel, +
+ {{project}} csapat +
diff --git a/app/config/locale/templates/hu.email.auth.invitation.tpl b/app/config/locale/templates/hu.email.auth.invitation.tpl new file mode 100644 index 0000000000..6dce55a639 --- /dev/null +++ b/app/config/locale/templates/hu.email.auth.invitation.tpl @@ -0,0 +1,27 @@ + + +
+ Szia, +
+
+ Azért küldtük ezt az e-mailt {{owner}} mert meg szeretnénk hívni a {{team}} csapatba a következő projektre {{project}}. +
+
+ Kattints erre a linkre, hogy a {{team}} csapat tagja legyél: +
+ {{redirect}} +
+
+ Ha nem vegy ebben érdekelt ignoráld ezt az üzenetet. +
+
+ Köszönettel, +
+ {{project}} csapat +
diff --git a/app/config/locale/templates/hu.email.auth.recovery.tpl b/app/config/locale/templates/hu.email.auth.recovery.tpl new file mode 100644 index 0000000000..564d55bd0b --- /dev/null +++ b/app/config/locale/templates/hu.email.auth.recovery.tpl @@ -0,0 +1,24 @@ + + +
+ Szia {{name}}, +
+
+ Kattints erre a linkre, hogy visszaállítsuk a {{project}} jelszavad. +
+ {{redirect}} +
+
+ Ha nem kérvényezted, hogy visszaállítsuk a jelszavad ignoráld ezt a levelet. +
+
+ Köszönettel, +
+ {{project}} csapat +
diff --git a/docker-compose.yml b/docker-compose.yml index c45a3294f7..9798004826 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,81 +1,71 @@ -version: '3' +version: "3" services: - appwrite: - build: . - restart: unless-stopped - volumes: - - ./app:/usr/share/nginx/html/app - - ./public:/usr/share/nginx/html/public - - ./src:/usr/share/nginx/html/src - - ./vendor:/usr/share/nginx/html/vendor - - ./docker/nginx.conf:/etc/nginx/nginx.conf:rw - - ./storage/uploads:/storage/uploads:rw - - ./storage/cache:/storage/cache:rw - ports: - - "80:80" - - "443:443" - depends_on: - - mariadb - - redis - - smtp - - clamav - - influxdb - - telegraf - environment: - - _APP_ENV=development - - _APP_OPENSSL_KEY_V1=your-secret-key - - _APP_REDIS_HOST=redis - - _APP_REDIS_PORT=6379 - - _APP_DB_HOST=mariadb - - _APP_DB_PORT=3306 - - _APP_DB_SCHEMA=appwrite - - _APP_DB_USER=user - - _APP_DB_PASS=password - - _APP_INFLUXDB_HOST=influxdb - - _APP_INFLUXDB_PORT=8086 - - _APP_STATSD_HOST=telegraf - - _APP_STATSD_PORT=8125 - - mariadb: - image: appwrite/mariadb:1.0.0 # fix issues when upgrading using: mysql_upgrade -u root -p - restart: unless-stopped - environment: - - MYSQL_ROOT_PASSWORD=rootsecretpassword - - MYSQL_DATABASE=appwrite - - MYSQL_USER=user - - MYSQL_PASSWORD=password - volumes: - - ./storage/db:/var/lib/mysql:rw - ports: - - 3306:3306/tcp + appwrite: + image: appwrite/appwrite + restart: unless-stopped + volumes: + - ./storage:/storage:rw + ports: + - "80:80" + depends_on: + - mariadb + - redis + - smtp + - clamav + - influxdb + - telegraf + environment: + - _APP_ENV=development + - _APP_OPENSSL_KEY_V1=your-secret-key + - _APP_REDIS_HOST=redis + - _APP_REDIS_PORT=6379 + - _APP_DB_HOST=mariadb + - _APP_DB_PORT=3306 + - _APP_DB_SCHEMA=appwrite + - _APP_DB_USER=root + - _APP_DB_PASS=password + - _APP_INFLUXDB_HOST=influxdb + - _APP_INFLUXDB_PORT=8086 + - _APP_STATSD_HOST=telegraf + - _APP_STATSD_PORT=8125 - smtp: - image: appwrite/smtp:1.0.0 - environment: - - MAILNAME=appwrite - - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 - ports: - - "25:25" + mariadb: + image: appwrite/mariadb:1.0.0 + restart: unless-stopped + environment: + - MYSQL_ROOT_PASSWORD=password + volumes: + - ./storage/db:/var/lib/mysql:rw + ports: + - 3306:3306/tcp - clamav: - image: appwrite/clamav:1.0.4 - restart: unless-stopped - volumes: - - ./storage:/storage:rw - - redis: - image: redis:5.0 - restart: unless-stopped + smtp: + image: appwrite/smtp:1.0.0 + environment: + - MAILNAME=appwrite + - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 + ports: + - "25:25" - influxdb: - image: influxdb:1.6 - volumes: - - ./storage/influxdb:/var/lib/influxdb - ports: - - "8086:8086" + clamav: + image: appwrite/clamav:1.0.4 + restart: unless-stopped + volumes: + - ./storage:/storage:rw + + redis: + image: redis:5.0 + restart: unless-stopped - telegraf: - image: appwrite/telegraf:1.0.0 - ports: - - "8125:8125/udp" \ No newline at end of file + influxdb: + image: influxdb:1.6 + volumes: + - ./storage/influxdb:/var/lib/influxdb + ports: + - "8086:8086" + + telegraf: + image: appwrite/telegraf:1.0.0 + ports: + - "8125:8125/udp" \ No newline at end of file From 2ba4aa51111adceea81187078aa84d6a7f44b521 Mon Sep 17 00:00:00 2001 From: Sandor Nagy Date: Tue, 1 Oct 2019 23:12:48 +0200 Subject: [PATCH 2/2] revert docker compose --- docker-compose.yml | 138 ++++++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 64 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9798004826..fd9632f0af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,71 +1,81 @@ -version: "3" +version: '3' services: - appwrite: - image: appwrite/appwrite - restart: unless-stopped - volumes: - - ./storage:/storage:rw - ports: - - "80:80" - depends_on: - - mariadb - - redis - - smtp - - clamav - - influxdb - - telegraf - environment: - - _APP_ENV=development - - _APP_OPENSSL_KEY_V1=your-secret-key - - _APP_REDIS_HOST=redis - - _APP_REDIS_PORT=6379 - - _APP_DB_HOST=mariadb - - _APP_DB_PORT=3306 - - _APP_DB_SCHEMA=appwrite - - _APP_DB_USER=root - - _APP_DB_PASS=password - - _APP_INFLUXDB_HOST=influxdb - - _APP_INFLUXDB_PORT=8086 - - _APP_STATSD_HOST=telegraf - - _APP_STATSD_PORT=8125 + appwrite: + build: . + restart: unless-stopped + volumes: + - ./app:/usr/share/nginx/html/app + - ./public:/usr/share/nginx/html/public + - ./src:/usr/share/nginx/html/src + - ./vendor:/usr/share/nginx/html/vendor + - ./docker/nginx.conf:/etc/nginx/nginx.conf:rw + - ./storage/uploads:/storage/uploads:rw + - ./storage/cache:/storage/cache:rw + ports: + - "80:80" + - "443:443" + depends_on: + - mariadb + - redis + - smtp + - clamav + - influxdb + - telegraf + environment: + - _APP_ENV=development + - _APP_OPENSSL_KEY_V1=your-secret-key + - _APP_REDIS_HOST=redis + - _APP_REDIS_PORT=6379 + - _APP_DB_HOST=mariadb + - _APP_DB_PORT=3306 + - _APP_DB_SCHEMA=appwrite + - _APP_DB_USER=user + - _APP_DB_PASS=password + - _APP_INFLUXDB_HOST=influxdb + - _APP_INFLUXDB_PORT=8086 + - _APP_STATSD_HOST=telegraf + - _APP_STATSD_PORT=8125 - mariadb: - image: appwrite/mariadb:1.0.0 - restart: unless-stopped - environment: - - MYSQL_ROOT_PASSWORD=password - volumes: - - ./storage/db:/var/lib/mysql:rw - ports: - - 3306:3306/tcp + mariadb: + image: appwrite/mariadb:1.0.0 # fix issues when upgrading using: mysql_upgrade -u root -p + restart: unless-stopped + environment: + - MYSQL_ROOT_PASSWORD=rootsecretpassword + - MYSQL_DATABASE=appwrite + - MYSQL_USER=user + - MYSQL_PASSWORD=password + volumes: + - ./storage/db:/var/lib/mysql:rw + ports: + - 3306:3306/tcp - smtp: - image: appwrite/smtp:1.0.0 - environment: - - MAILNAME=appwrite - - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 - ports: - - "25:25" + smtp: + image: appwrite/smtp:1.0.0 + environment: + - MAILNAME=appwrite + - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 + ports: + - "25:25" - clamav: - image: appwrite/clamav:1.0.4 - restart: unless-stopped - volumes: - - ./storage:/storage:rw - - redis: - image: redis:5.0 - restart: unless-stopped + clamav: + image: appwrite/clamav:1.0.4 + restart: unless-stopped + volumes: + - ./storage:/storage:rw - influxdb: - image: influxdb:1.6 - volumes: - - ./storage/influxdb:/var/lib/influxdb - ports: - - "8086:8086" + redis: + image: redis:5.0 + restart: unless-stopped - telegraf: - image: appwrite/telegraf:1.0.0 - ports: - - "8125:8125/udp" \ No newline at end of file + influxdb: + image: influxdb:1.6 + volumes: + - ./storage/influxdb:/var/lib/influxdb + ports: + - "8086:8086" + + telegraf: + image: appwrite/telegraf:1.0.0 + ports: + - "8125:8125/udp"