diff --git a/Makefile b/Makefile
index 7dd29cc..599de5e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ 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 9af2b92..2565198 100644
--- a/app/locales/cn.yml
+++ b/app/locales/cn.yml
@@ -38,6 +38,7 @@ gist:
download: '下载'
clone: '克隆'
embed: '引用'
+ embed_copy: '复制'
add: '新建'
date:
diff --git a/app/locales/de.yml b/app/locales/de.yml
index 28a0314..31f8f3f 100644
--- a/app/locales/de.yml
+++ b/app/locales/de.yml
@@ -38,6 +38,7 @@ 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 dd99aba..80a8360 100644
--- a/app/locales/en.yml
+++ b/app/locales/en.yml
@@ -39,6 +39,7 @@ 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 679d0f1..11d89ed 100644
--- a/app/locales/es.yml
+++ b/app/locales/es.yml
@@ -38,6 +38,7 @@ 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 68759cd..e80d9cb 100644
--- a/app/locales/fr.yml
+++ b/app/locales/fr.yml
@@ -38,6 +38,7 @@ 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
deleted file mode 100644
index e250227..0000000
--- a/app/locales/pl.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-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 464be4d..53891e7 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,6 @@
"bootstrap": "3.3.4",
"flag-icon-css": "0.7.1",
"iframe-resizer": "2.8.6",
- "jsdiff": "~2.2.2",
- "Prism": "~1.8.1"
+ "jsdiff": "~2.2.2"
}
}
diff --git a/src/Gist/Controller/ViewController.php b/src/Gist/Controller/ViewController.php
index 44aeedc..fd9f262 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' => mb_strlen($viewOptions['raw_content']),
+ 'Content-Length' => filesize($file),
'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 44ff7df..4e74e30 100644
--- a/src/Gist/Resources/views/View/embed.html.twig
+++ b/src/Gist/Resources/views/View/embed.html.twig
@@ -3,14 +3,6 @@
{% block css %}
{{ parent() }}
-
-
- {% if theme_settings.name == 'dark' %}
-
- {% else %}
-
- {% endif %}
-