diff --git a/Makefile b/Makefile index 599de5e..7dd29cc 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ update: @echo "-----------------------------------" @echo - sh -c 'test -d app && $(GIT) add app && $(GIT) commit -m "Configuration"' $(GIT) pull origin master ${MKDIR} -p data/git $(COMPOSER) update diff --git a/app/locales/cn.yml b/app/locales/cn.yml index 2565198..9af2b92 100644 --- a/app/locales/cn.yml +++ b/app/locales/cn.yml @@ -38,7 +38,6 @@ gist: download: '下载' clone: '克隆' embed: '引用' - embed_copy: '复制' add: '新建' date: diff --git a/app/locales/de.yml b/app/locales/de.yml index 31f8f3f..28a0314 100644 --- a/app/locales/de.yml +++ b/app/locales/de.yml @@ -38,7 +38,6 @@ gist: download: 'Herunterladen' clone: 'Klonen' embed: 'Einfügen' - embed_copy: 'Kopieren' add: 'Hinzufügen' date: diff --git a/app/locales/en.yml b/app/locales/en.yml index 80a8360..dd99aba 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -39,7 +39,6 @@ gist: download: 'Download' clone: 'Clone' embed: 'Embed' - embed_copy: 'Copy' add: 'New' date: diff --git a/app/locales/es.yml b/app/locales/es.yml index 11d89ed..679d0f1 100644 --- a/app/locales/es.yml +++ b/app/locales/es.yml @@ -38,7 +38,6 @@ gist: download: 'Descargar' clone: 'Clonar' embed: 'Insertar' - embed_copy: 'Dupdo' add: 'Añadir' date: diff --git a/app/locales/fr.yml b/app/locales/fr.yml index e80d9cb..68759cd 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -38,7 +38,6 @@ gist: download: 'Télécharger' clone: 'Clôner' embed: 'Insérer' - embed_copy: 'Copier' add: 'Ajouter' date: diff --git a/app/locales/pl.yml b/app/locales/pl.yml new file mode 100644 index 0000000..e250227 --- /dev/null +++ b/app/locales/pl.yml @@ -0,0 +1,108 @@ +app: + title: '#!GIST' + title_prefix: '#!GIST - ' + + menu: + home: + title: 'Home' + about: + title: 'O projekcie' + my: + login: + title: 'Logowanie' + logout: + title: 'Wylogowanie' + register: + title: 'Rejestracja' + my: + title: 'Konta' + +my: + title: 'Moje wklejki' + nothing: 'Nie ma jeszcze nic!' + api: + title: 'API' + warning: 'Trzymaj to w sekrecie!' + form: + generate: 'Wygeneruj nowy' + + +gist: + untitled: 'Bez tytułu' + 404: + title: 'Oops!' + message: 'Wklejka nie została znaleziona...' + action: + view: 'Podgląd' + history: 'Commit(s)' + raw: 'RAW' + download: 'Pobierz' + clone: 'Sklonuj' + embed: 'Embed' + add: 'Nowa' + +date: + format: 'Y-m-d h:i:s' + +footer: + text: '

Napędzane przez GIST, to jest open source :) - API

' + +login: + login: + title: 'Logowanie' + invalid: 'Nie prawidłowy login lub hasło.' + form: + username: + placeholder: 'Login' + password: + placeholder: 'Hasło' + remember_me: + label: 'Pamiętaj' + register: + title: 'Nowe konto' + already_exists: 'Ta nazwa użytkownika jest już zarejestrowana!' + registred: 'Gratulacje, twoje konto zostało utworzone!' + form: + username: + placeholder: 'Login' + current_password: + placeholder: 'Obecne hasło' + password: + placeholder: 'Hasło' + +form: + error: + password: 'Nie prawidłowe hasło.' + not_blank: 'To pole nie powinno być puste!' + title: + placeholder: 'Tytuł' + cipher: + label: 'Szyfrowanie: %value%' + choice: + anyway: 'Tak czy inaczej' + yes: 'Tak' + no: 'Nie' + submit: 'Wyślij' + filter: 'Filtr' + confirm: 'Potwierdzasz?' + success: + password: 'Hasło zostało zaktualizowane.' + gist: 'Wklejka została usunięta.' + type: + label: 'Język: %value%' + choice: + all: 'All' + html: 'HTML' + xml: 'XML' + css: 'CSS' + javascript: 'JAVASCRIPT' + php: 'PHP' + sql: 'SQL' + yaml: 'YAML' + perl: 'PERL' + c: 'C/C++' + asp: 'ASP' + python: 'PYTHON' + bash: 'BASH' + actionscript3: 'ACTION SCRIPT' + text: 'TEXT' diff --git a/bower.json b/bower.json index 53891e7..464be4d 100644 --- a/bower.json +++ b/bower.json @@ -16,6 +16,7 @@ "bootstrap": "3.3.4", "flag-icon-css": "0.7.1", "iframe-resizer": "2.8.6", - "jsdiff": "~2.2.2" + "jsdiff": "~2.2.2", + "Prism": "~1.8.1" } } diff --git a/src/Gist/Controller/ViewController.php b/src/Gist/Controller/ViewController.php index fd9f262..44aeedc 100644 --- a/src/Gist/Controller/ViewController.php +++ b/src/Gist/Controller/ViewController.php @@ -131,7 +131,7 @@ class ViewController extends Controller 200, array( 'Content-Disposition' => sprintf('filename=%s.%s', $gist->getFile(), $gist->getTypeAsExtension()), - 'Content-Length' => filesize($file), + 'Content-Length' => mb_strlen($viewOptions['raw_content']), 'Content-Type' => 'application/force-download', ) ); diff --git a/src/Gist/Resources/views/View/embed.html.twig b/src/Gist/Resources/views/View/embed.html.twig index 4e74e30..44ff7df 100644 --- a/src/Gist/Resources/views/View/embed.html.twig +++ b/src/Gist/Resources/views/View/embed.html.twig @@ -3,6 +3,14 @@ {% block css %} {{ parent() }} + + + {% if theme_settings.name == 'dark' %} + + {% else %} + + {% endif %} +