From ad71316999a6ad50675403a3f1f73925db58943b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quent=C3=AD?= <33203663+Quenty31@users.noreply.github.com> Date: Thu, 11 Jul 2019 17:42:36 +0200 Subject: [PATCH 1/4] Create helpcenter.php --- resources/lang/oc/helpcenter.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 resources/lang/oc/helpcenter.php diff --git a/resources/lang/oc/helpcenter.php b/resources/lang/oc/helpcenter.php new file mode 100644 index 000000000..447635153 --- /dev/null +++ b/resources/lang/oc/helpcenter.php @@ -0,0 +1,26 @@ + 'Seccion d'ajuda', + 'whatsnew' => 'Qué de nòu', + + 'gettingStarted' => 'Començar', + 'sharingMedia' => 'Partatge de mèdias', + 'profile' => 'Perfil', + 'stories' => 'Stories', + 'hashtags' => 'Etiquetas', + 'discover' => 'Descobrir', + 'directMessages' => 'Messatges dirèctes', + 'timelines' => 'Cronologias', + 'embed' => 'Integrar', + + 'communityGuidelines' => 'Linhas directrises de la comunitat', + 'whatIsTheFediverse' => 'Qu'es aquò lo Fedivers ?', + 'controllingVisibility' => 'Contraròtle de la visibilitat', + 'blockingAccounts' => 'Blocatge de compte', + 'safetyTips' => 'Astúcias de seguretat', + 'reportSomething' => 'Senhalar quicòm', + 'dataPolicy' => 'Politica de donadas' + +]; From df52009e7b4c343221eba80d19baa08c43bba9d1 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 11 Jul 2019 13:08:58 -0600 Subject: [PATCH 2/4] Revert "[i18n] Update for Occitan" --- resources/lang/oc/helpcenter.php | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 resources/lang/oc/helpcenter.php diff --git a/resources/lang/oc/helpcenter.php b/resources/lang/oc/helpcenter.php deleted file mode 100644 index 447635153..000000000 --- a/resources/lang/oc/helpcenter.php +++ /dev/null @@ -1,26 +0,0 @@ - 'Seccion d'ajuda', - 'whatsnew' => 'Qué de nòu', - - 'gettingStarted' => 'Començar', - 'sharingMedia' => 'Partatge de mèdias', - 'profile' => 'Perfil', - 'stories' => 'Stories', - 'hashtags' => 'Etiquetas', - 'discover' => 'Descobrir', - 'directMessages' => 'Messatges dirèctes', - 'timelines' => 'Cronologias', - 'embed' => 'Integrar', - - 'communityGuidelines' => 'Linhas directrises de la comunitat', - 'whatIsTheFediverse' => 'Qu'es aquò lo Fedivers ?', - 'controllingVisibility' => 'Contraròtle de la visibilitat', - 'blockingAccounts' => 'Blocatge de compte', - 'safetyTips' => 'Astúcias de seguretat', - 'reportSomething' => 'Senhalar quicòm', - 'dataPolicy' => 'Politica de donadas' - -]; From 1d167294f19bc9269855bd29db124e978266e185 Mon Sep 17 00:00:00 2001 From: monkeyless <52392953+monkeyless@users.noreply.github.com> Date: Sat, 13 Jul 2019 15:10:38 +0200 Subject: [PATCH 3/4] Add Debian "buster" compatibility --- contrib/docker/Dockerfile.apache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index a70c069cd..162397168 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -1,4 +1,4 @@ -FROM php:7.3-apache +FROM php:7.3-apache-buster ARG COMPOSER_VERSION="1.8.5" ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" @@ -7,13 +7,13 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends apt-utils \ && apt-get install -y --no-install-recommends git gosu \ optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \ - libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-3 \ + libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ && locale-gen && update-locale \ && docker-php-source extract \ && docker-php-ext-configure gd \ - --with-freetype-dir=/usr/lib/x86_64-linux-gnu/ \ + --enable-freetype \ --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ --with-webp-dir=/usr/lib/x86_64-linux-gnu/ \ From 79b231aeb9654a698cc0a9abba9b0b9737d40d22 Mon Sep 17 00:00:00 2001 From: monkeyless <52392953+monkeyless@users.noreply.github.com> Date: Sat, 13 Jul 2019 15:11:04 +0200 Subject: [PATCH 4/4] Update to latest the PHP7.3 version --- contrib/docker/Dockerfile.fpm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 3cc9a3f46..a402726a3 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -1,24 +1,25 @@ -FROM php:7.2-fpm +FROM php:7.3-fpm-buster ARG COMPOSER_VERSION="1.8.5" ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" RUN apt-get update \ + && apt-get install -y --no-install-recommends apt-utils \ && apt-get install -y --no-install-recommends git gosu \ - optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev \ - libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libmagickwand-6.q16-3 \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ + optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \ + libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \ && sed -i '/en_US/s/^#//g' /etc/locale.gen \ && locale-gen && update-locale \ && docker-php-source extract \ && docker-php-ext-configure gd \ - --with-freetype-dir=/usr/lib/x86_64-linux-gnu/ \ + --enable-freetype \ --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ - --with-vpx-dir=/usr/lib/x86_64-linux-gnu/ \ - && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip \ + --with-webp-dir=/usr/lib/x86_64-linux-gnu/ \ + && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ && pecl install imagick \ - && docker-php-ext-enable imagick pcntl imagick gd exif zip \ + && docker-php-ext-enable imagick pcntl imagick gd exif zip curl \ && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \ && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \ && chmod 755 /usr/bin/composer \ @@ -32,7 +33,7 @@ ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" COPY . /var/www/ WORKDIR /var/www/ -RUN cp -r storage storage.skel \ +RUN mkdir public.ext && cp -r storage storage.skel \ && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ && composer install --prefer-dist --no-interaction \ && rm -rf html && ln -s public html