From 6ddbbb4ba00b9885f21ba6974163e87b38052230 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 14 Apr 2019 08:57:48 +0200 Subject: [PATCH 1/2] Restyled error templates and removed copyright --- .../Core/templates/invalid-short-code.phtml | 2 +- module/Core/templates/layout/default.phtml | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/module/Core/templates/invalid-short-code.phtml b/module/Core/templates/invalid-short-code.phtml index 369a168b..2240ce6f 100644 --- a/module/Core/templates/invalid-short-code.phtml +++ b/module/Core/templates/invalid-short-code.phtml @@ -1,7 +1,7 @@ layout('ShlinkCore::layout/default') ?> start('title') ?> - translate('URL Not Found') ?> + translate('Invalid URL') ?> end() ?> start('stylesheets') ?> diff --git a/module/Core/templates/layout/default.phtml b/module/Core/templates/layout/default.phtml index 2a8dcd98..c87472af 100644 --- a/module/Core/templates/layout/default.phtml +++ b/module/Core/templates/layout/default.phtml @@ -5,28 +5,19 @@ - + section('stylesheets', '') ?> - -
+ +
section('main', '') ?>
- - From f27058e2550543a4e048762cabba17a9ee1e2cf5 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 14 Apr 2019 08:59:11 +0200 Subject: [PATCH 2/2] Updated lang files --- CHANGELOG.md | 1 + module/Core/lang/es.mo | Bin 1247 -> 1256 bytes module/Core/lang/es.po | 9 ++++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b7bbff9..295b28ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this #### Removed * [#385](https://github.com/shlinkio/shlink/issues/385) Dropped support for PHP 7.1 +* [#379](https://github.com/shlinkio/shlink/issues/379) Removed copyright from error templates. #### Fixed diff --git a/module/Core/lang/es.mo b/module/Core/lang/es.mo index d1a628d4640df875d0a4df8bb1c6e4bfe17c7b12..746fd5beef0e84b651b1706b64e59c2953902af9 100644 GIT binary patch delta 324 zcmXYrF-rnr7{?z^%Z?DKp%#UAjNstT4D`m(LD5BUXgu+j%@BP68&;NbC%(XdQ9A}<|m{5Qo2@IPz{J3?6i9mk`Olac7}$ZdAqxY87?8FE(nbsno(us%2FQSB zAT0=_*8ph+AiWPr1NAZhDKG$O1_6*G*nk*lHW&cS1v`G?n}41my3R$Zi6xo&dAcr% zC8<^lMh1rFx`qb2hQx&85>OIV!FX-F!?dlzsc{J Ge*yqecq>T& diff --git a/module/Core/lang/es.po b/module/Core/lang/es.po index 9a5d4c45..8f5a2263 100644 --- a/module/Core/lang/es.po +++ b/module/Core/lang/es.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: Shlink 1.0\n" -"POT-Creation-Date: 2017-10-13 12:29+0200\n" -"PO-Revision-Date: 2017-10-13 12:30+0200\n" +"POT-Creation-Date: 2019-04-14 08:58+0200\n" +"PO-Revision-Date: 2019-04-14 08:58+0200\n" "Last-Translator: Alejandro Celaya \n" "Language-Team: \n" "Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.1\n" +"X-Generator: Poedit 2.1.1\n" "X-Poedit-Basepath: ..\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -39,3 +39,6 @@ msgstr "Esta URL acortada no parece ser válida." msgid "Make sure you included all the characters, with no extra punctuation." msgstr "Asegúrate de haber incluído todos los caracteres, sin puntuación extra." + +msgid "Invalid URL" +msgstr "URL inválida"