[atomadminpre@svatomi atom]$ git diff diff --git a/Dockerfile b/Dockerfile index 23dd4ed..8655488 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ FROM php:7.2-fpm-alpine -ENV FOP_HOME=/usr/share/fop-2.1 COMPOSER_ALLOW_SUPERUSER=1 +ENV FOP_HOME=/usr/share/fop-2.1 \ + COMPOSER_ALLOW_SUPERUSER=1 \ + LD_PRELOAD=/usr/lib/preloadable_libiconv.so COPY --from=composer /usr/bin/composer /usr/bin/composer @@ -45,6 +47,7 @@ RUN set -xe \ npm \ make \ bash \ + gnu-libiconv \ && npm install -g "less@<2.0.0" \ && curl -Ls https://archive.apache.org/dist/xmlgraphics/fop/binaries/fop-2.1-bin.tar.gz | tar xz -C /usr/share \ && ln -sf /usr/share/fop-2.1/fop /usr/local/bin/fop \ diff --git a/apps/qubit/config/settings.yml.tmpl b/apps/qubit/config/settings.yml.tmpl index 0c37022..b06f32e 100644 --- a/apps/qubit/config/settings.yml.tmpl +++ b/apps/qubit/config/settings.yml.tmpl @@ -53,11 +53,11 @@ all: # is coded in two uppercase characters, according to # the ISO 3166-1 standard. # Examples: en, en_US, es_ES, fr... - default_culture: en + default_culture: es # List of supported timezones # http://www.php.net/manual/en/timezones.php - default_timezone: America/Vancouver + default_timezone: Europe/Madrid .actions: error_404_module: admin diff --git a/apps/qubit/i18n/es/messages.xml b/apps/qubit/i18n/es/messages.xml index 3c071df..2ceaa31 100755 --- a/apps/qubit/i18n/es/messages.xml +++ b/apps/qubit/i18n/es/messages.xml @@ -1,7 +1,7 @@ - +

@@ -46,7 +46,7 @@

%1 count - + %1 (cant.) https://github.com/artefactual/atom/blob/master/apps/qubit/modules/taxonomy/templates/indexSuccess.php

@@ -66,7 +66,7 @@

%1% %2% results for %3% - + %1% %2% resultados para %3% https://github.com/artefactual/atom/blob/master/apps/qubit/modules/term/templates/relatedAuthoritiesSuccess.php

@@ -1346,7 +1346,7 @@

Descending - + Clasificación en orden descendente https://github.com/artefactual/atom/blob/master/apps/qubit/modules/default/templates/_sortPickers.php

@@ -1416,7 +1416,7 @@

Direction - + Dirección https://github.com/artefactual/atom/blob/master/apps/qubit/modules/default/templates/_sortPickers.php

diff --git a/data/fixtures/taxonomyTerms.yml b/data/fixtures/taxonomyTerms.yml index 93f7876..5058331 100644 --- a/data/fixtures/taxonomyTerms.yml +++ b/data/fixtures/taxonomyTerms.yml @@ -5974,7 +5974,7 @@ QubitTerm: de-CH: Normdatei el: 'Καθιερωμένη εγγραφή' en: 'Authority record' - es: 'Registro de autoridad' + es: 'Personas y organizaciones' eu: 'Autoretza erregistroa' fr: 'Notice d''autorité' gl: 'Rexistro de autoridade' diff --git a/docker/bootstrap.php b/docker/bootstrap.php index 0a70067..03ff517 100644 --- a/docker/bootstrap.php +++ b/docker/bootstrap.php @@ -54,11 +54,11 @@ $CONFIG = array( 'atom.debug_ip' => getenv_default('ATOM_DEBUG_IP', ''), 'php.max_execution_time' => getenv_default('ATOM_PHP_MAX_EXECUTION_TIME', '120'), 'php.max_input_time' => getenv_default('ATOM_PHP_MAX_INPUT_TIME', '120'), - 'php.memory_limit' => getenv_default('ATOM_PHP_MEMORY_LIMIT', '512M'), - 'php.post_max_size' => getenv_default('ATOM_PHP_POST_MAX_SIZE', '72M'), - 'php.upload_max_filesize' => getenv_default('ATOM_PHP_UPLOAD_MAX_FILESIZE', '64M'), + 'php.memory_limit' => getenv_default('ATOM_PHP_MEMORY_LIMIT', '2048M'), + 'php.post_max_size' => getenv_default('ATOM_PHP_POST_MAX_SIZE', '720M'), + 'php.upload_max_filesize' => getenv_default('ATOM_PHP_UPLOAD_MAX_FILESIZE', '640M'), 'php.max_file_uploads' => getenv_default('ATOM_PHP_MAX_FILE_UPLOADS', '20'), - 'php.date.timezone' => getenv_default('ATOM_PHP_DATE_TIMEZONE', 'America/Vancouver') + 'php.date.timezone' => getenv_default('ATOM_PHP_DATE_TIMEZONE', 'Europe/Madrid') ); diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 5735af0..b1366dc 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -22,7 +22,7 @@ services: depends_on: - gearmand - percona - restart: on-failure:5 + restart: unless-stopped volumes: - composer_deps:/atom/src/vendor/composer - ..:/atom/src:rw diff --git a/docker/etc/mysql/mysqld.cnf b/docker/etc/mysql/mysqld.cnf index 40e8ab9..bf1f4a0 100644 --- a/docker/etc/mysql/mysqld.cnf +++ b/docker/etc/mysql/mysqld.cnf @@ -7,3 +7,5 @@ init_connect="SET collation_connection = utf8mb4_0900_ai_ci;SET NAMES utf8mb4" sql_mode=STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION optimizer_switch='block_nested_loop=off' default_authentication_plugin=mysql_native_password +general_log=0 +general_log_file=/var/log/mysql/general.log diff --git a/images/logo.png b/images/logo.png index 838fa78..4fa2f48 100644 Binary files a/images/logo.png and b/images/logo.png differ diff --git a/index.php b/index.php index f851289..61ace19 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,2 @@ dispatch(); +phpinfo();