adam/lutim
1
0
Fork 0
mirror of https://framagit.org/fiat-tux/hat-softwares/lutim.git synced 2026-06-26 13:01:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-39' into 'development'

Browse Source 
Issue 39

See merge request !14
This commit is contained in:
Luc Didry
2017-06-05 11:05:29 +02:00
parent 3f21ddb35a 028961113c
commit ef1463f8c9
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/lib/Lutim/I18N/de.po
+2 -2
View File
@@ -67,7 +67,7 @@ msgstr "Klicken um den Dateibrowser zu öffnen"
msgid "Contributors"
msgstr "Mitwirkende"
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441
msgid "Copy all view links to clipboard"
msgstr "Alle Links zum Anschauen in die Zwischenablage kopieren"
@@ -331,7 +331,7 @@ msgstr "Die Datei %1 ist kein Bild."
#. ($tx->res->max_message_size)
#. ($c->req->max_message_size)
#. ($max_file_size)
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336
msgid "The file exceed the size limit (%1)"
msgstr "Die Datei überschreitet die Größenbeschränkung (%1)"
themes/default/lib/Lutim/I18N/en.po
+2 -2
View File
@@ -65,7 +65,7 @@ msgstr "Click to open the file browser"
msgid "Contributors"
msgstr "Contributors"
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441
msgid "Copy all view links to clipboard"
msgstr ""
@@ -327,7 +327,7 @@ msgstr "The file %1 is not an image."
#. ($tx->res->max_message_size)
#. ($c->req->max_message_size)
#. ($max_file_size)
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336
msgid "The file exceed the size limit (%1)"
msgstr "The file exceed the size limit (%1)"
themes/default/lib/Lutim/I18N/es.po
+2 -2
View File
@@ -67,7 +67,7 @@ msgstr "Clic para abrir el explorador de archivos"
msgid "Contributors"
msgstr "Contribuidores"
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441
msgid "Copy all view links to clipboard"
msgstr "Copiar todos los enlaces de visualización al portapapeles"
@@ -329,7 +329,7 @@ msgstr "El archivo %1 no es una imagen."
#. ($tx->res->max_message_size)
#. ($c->req->max_message_size)
#. ($max_file_size)
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336
msgid "The file exceed the size limit (%1)"
msgstr "El archivo supera el límite de tamaño (%1)"
themes/default/lib/Lutim/I18N/fr.po
+2 -2
View File
@@ -67,7 +67,7 @@ msgstr "Cliquez pour utiliser le navigateur de fichier"
msgid "Contributors"
msgstr "Contributeurs"
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441
msgid "Copy all view links to clipboard"
msgstr "Copier tous les liens de visualisation dans le presse-papier"
@@ -331,7 +331,7 @@ msgstr "Le fichier %1 n’est pas une image."
#. ($tx->res->max_message_size)
#. ($c->req->max_message_size)
#. ($max_file_size)
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336
msgid "The file exceed the size limit (%1)"
msgstr "Le fichier dépasse la limite de taille (%1)"
themes/default/lib/Lutim/I18N/oc.po
+2 -2
View File
@@ -66,7 +66,7 @@ msgstr "Clicatz per utilizar lo navigador de fichièr"
msgid "Contributors"
msgstr "Contributors"
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:359 themes/default/templates/partial/lutim.js.ep:437
#: themes/default/templates/partial/lutim.js.ep:310 themes/default/templates/partial/lutim.js.ep:363 themes/default/templates/partial/lutim.js.ep:441
msgid "Copy all view links to clipboard"
msgstr "Copiar totes los ligams de visualizacion dins lo quichapapièrs"
@@ -328,7 +328,7 @@ msgstr "Lo fichièr %1 es pas un imatge."
#. ($tx->res->max_message_size)
#. ($c->req->max_message_size)
#. ($max_file_size)
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:332
#: lib/Lutim/Controller.pm:271 lib/Lutim/Controller.pm:340 themes/default/templates/partial/lutim.js.ep:336
msgid "The file exceed the size limit (%1)"
msgstr "Lo fichièr depassa lo limit de talha (%1)"
themes/default/public/css/markdown.css
+5 -5
View File
@@ -1,10 +1,10 @@
@font-face {
font-family: 'markdown';
src:url('../font/markdown.eot?-6fnbp5');
src:url('../font/markdown.eot?#iefix-6fnbp5') format('embedded-opentype'),
url('../font/markdown.woff?-6fnbp5') format('woff'),
url('../font/markdown.ttf?-6fnbp5') format('truetype'),
url('../font/markdown.svg?-6fnbp5#markdown') format('svg');
src:url('../../font/markdown.eot?-6fnbp5');
src:url('../../font/markdown.eot?#iefix-6fnbp5') format('embedded-opentype'),
url('../../font/markdown.woff?-6fnbp5') format('woff'),
url('../../font/markdown.ttf?-6fnbp5') format('truetype'),
url('../../font/markdown.svg?-6fnbp5#markdown') format('svg');
font-weight: normal;
font-style: normal;
}
themes/default/templates/partial/lutim.js.ep
+4
View File
@@ -314,6 +314,10 @@
);
}
$('.messages').append(buildMessage(data.success, data.msg));
$('#del-'+data.msg.real_short).on('click', function() {
rmFromShortHash(data.msg.short+'.'+data.msg.ext)
rmFromZipHash(data.msg.short);
});
$('#del-'+data.msg.real_short).on('click', delImage);
if (data.success) {
addToShortHash(data.msg.short+'.'+data.msg.ext);