From b52e78d1733af383ba248c63130723195c90a185 Mon Sep 17 00:00:00 2001 From: rugk Date: Wed, 4 Mar 2020 15:10:31 +0100 Subject: [PATCH 1/3] Add OpenGraph and Twitter cards Just useless templates/defaults without any content. Fixes https://github.com/PrivateBin/PrivateBin/issues/139 --- tpl/bootstrap.php | 14 ++++++++++++++ tpl/page.php | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index a5474bba..5cafb3e4 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -73,6 +73,7 @@ endif; + @@ -81,6 +82,19 @@ endif; + + + + + + + + + + + + + + @@ -59,6 +60,19 @@ endif; + + + + + + + + + + + + +
From 0cc083042164bc74371c0aa50696ec54dfe5efa7 Mon Sep 17 00:00:00 2001 From: rugk Date: Tue, 10 Mar 2020 09:05:44 +0100 Subject: [PATCH 2/3] Handle review comments Add translation strings and remove/adjust wrong tags --- i18n/bg.json | 6 +++++- i18n/cs.json | 6 +++++- i18n/de.json | 6 +++++- i18n/es.json | 6 +++++- i18n/fr.json | 6 +++++- i18n/hu.json | 6 +++++- i18n/it.json | 6 +++++- i18n/nl.json | 8 ++++++-- i18n/no.json | 6 +++++- i18n/oc.json | 6 +++++- i18n/pl.json | 6 +++++- i18n/pt.json | 6 +++++- i18n/ru.json | 6 +++++- i18n/sl.json | 6 +++++- i18n/uk.json | 6 +++++- i18n/zh.json | 6 +++++- tpl/bootstrap.php | 3 +-- tpl/page.php | 3 +-- 18 files changed, 83 insertions(+), 21 deletions(-) diff --git a/i18n/bg.json b/i18n/bg.json index c87c1afd..b5c3b859 100644 --- a/i18n/bg.json +++ b/i18n/bg.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/cs.json b/i18n/cs.json index a199bc56..85bc64d8 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/de.json b/i18n/de.json index 47e8adc0..3ac88b98 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -184,5 +184,9 @@ "Convert To UTC": "In UTC Umwandeln", "Close": - "Schliessen" + "Schliessen", + "Encrypted note on PrivateBin": + "Verschlüsselte Notiz auf PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Besuche diesen Link um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf diese Notiz zugreifen." } diff --git a/i18n/es.json b/i18n/es.json index df1e054f..a36c1f7c 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/fr.json b/i18n/fr.json index 77ddbe1f..2fe66a01 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -193,5 +193,9 @@ "Convert To UTC": "Convertir en UTC", "Close": - "Fermer" + "Fermer", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/hu.json b/i18n/hu.json index f55efdcb..8a0f7711 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/it.json b/i18n/it.json index 2a2bff50..35d16355 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/nl.json b/i18n/nl.json index d3bdb720..11226192 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -129,7 +129,7 @@ "The cloned file '%s' was attached to this paste.": "Het gekloonde bestand '%s' is bijgevoegd aan de geplakte tekst.", "Attach a file": "Een bestand toevoegen", "alternatively drag & drop a file or paste an image from the clipboard": "U kunt ook een bestand slepen en neerzetten of een afbeelding plakken van het klembord", - "File too large, to display a preview. Please download the attachment.": "Het bestand is te groot om voorbeeld weer te geven. Aub de bijlage downloaden", + "File too large, to display a preview. Please download the attachment.": "Het bestand is te groot om voorbeeld weer te geven. Aub de bijlage downloaden", "Remove attachment": "Bijlage verwijderen", "Your browser does not support uploading encrypted files. Please use a newer browser.": "Uw browser biedt geen ondersteuning voor het uploaden van gecodeerde bestanden. Gebruik alstublieft een nieuwere browser", @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/no.json b/i18n/no.json index f43ef6e4..2d4ce98d 100644 --- a/i18n/no.json +++ b/i18n/no.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/oc.json b/i18n/oc.json index c078faed..ec891ef1 100644 --- a/i18n/oc.json +++ b/i18n/oc.json @@ -193,5 +193,9 @@ "Convert To UTC": "Convertir en UTC", "Close": - "Tampar" + "Tampar", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/pl.json b/i18n/pl.json index 3517b076..a22cbf1c 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -184,5 +184,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/pt.json b/i18n/pt.json index 6dc1f405..2251c8e3 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -184,5 +184,9 @@ "Convert To UTC": "Converter para UTC", "Close": - "Fechar" + "Fechar", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/ru.json b/i18n/ru.json index 8973f24c..8225dec4 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -194,5 +194,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/sl.json b/i18n/sl.json index 15e57289..bcd66862 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -193,5 +193,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/uk.json b/i18n/uk.json index 635495d3..f87b9890 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -194,5 +194,9 @@ "Convert To UTC": "Convert To UTC", "Close": - "Close" + "Close", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/i18n/zh.json b/i18n/zh.json index 749d611a..6ac5bc68 100644 --- a/i18n/zh.json +++ b/i18n/zh.json @@ -184,5 +184,9 @@ "Convert To UTC": "转换为UTC", "Close": - "关闭" + "关闭", + "Encrypted note on PrivateBin": + "Encrypted note on PrivateBin", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too." } diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 5cafb3e4..94b35ccc 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -87,12 +87,11 @@ endif; - - + diff --git a/tpl/page.php b/tpl/page.php index b0a3f068..c848d728 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -65,12 +65,11 @@ endif; - - + From 7e77b941580236862b1d979ca322d5357495271e Mon Sep 17 00:00:00 2001 From: El RIDO Date: Mon, 23 Mar 2020 18:58:26 +0100 Subject: [PATCH 3/3] revert the revert caused by the merge of master --- tpl/bootstrap.php | 13 +++++++++++++ tpl/page.php | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 87faa556..275b027c 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -73,6 +73,7 @@ endif; + @@ -81,6 +82,18 @@ endif; + + + + + + + + + + + + + @@ -59,6 +60,18 @@ endif; + + + + + + + + + + + +