hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 22:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	CHANGELOG.md
	bower.json
	lib/Alchemy/Phrasea/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-15 19:04:45 +01:00
parent d2054f5909 88b4df745b
commit b973e40577
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -8,6 +8,10 @@
- Convert Ftp Export custom adapter to Doctrine entity.
- Convert Ftp Export custom adapter to Doctrine entity.
* 3.8.1 (2013-11-15)
- BugFix : Locale translation may block administration module load.
* 3.8.1 (2013-xx-xx)
- BugFix : IE 6 homepage error message is broken.

39
templates/web/admin/index.html.twig
View File

@@ -23,25 +23,26 @@
var bodySize = {x:0,y:0};
var language = {
serverName: '{{ app['phraseanet.registry'].get('GV_ServerName') }}',
serverError: '{% trans 'phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique' %}',
serverTimeout: '{% trans 'phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible' %}',
serverDisconnected: '{% trans 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' %}',
check_all : '{% trans 'Cocher toute la colonne' %}',
uncheck_all : '{% trans 'Decocher toute la colonne' %}',
create_template : '{% trans 'Creer un model' %}',
create_user : '{% trans 'Creer un utilisateur' %}',
annuler : '{% trans 'boutton::annuler' %}',
errorFileApiTooBig : '{% trans 'This file is too big' %}',
requiredValue: '{% trans 'This field is required' %}',
attention: '{% trans 'Attention' %}',
reset_template_do_reset_apply_button: '{% trans 'Reset and apply' %}',
reset_template_confirm_dialog_title: '{% trans 'Confirm reset users rights before applying template' %}',
reset_template_do_confirm_choice: '{% trans 'Rights will be erased before applying template, do you confirm?' %}',
reset_template_do_reset_button: '{% trans 'Reset and apply template' %}',
reset_template_do_not_reset_button: '{% trans 'Apply template' %}',
reset_template_dialog_title: '{% trans 'Reset rights before applying template?' %}',
reset_template_ask_choice: '{% trans 'Would you like to reset rights before applying the template?' %}'
serverName: '{{ app['phraseanet.registry'].get('GV_ServerName') | e('js') }}',
serverError: '{{ 'phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique' | trans | e('js') }}',
serverTimeout: '{{ 'phraseanet::erreur: La connection au serveur Phraseanet semble etre indisponible' | trans | e('js') }}',
serverDisconnected: '{{ 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' | trans | e('js') }}',
check_all : '{{ 'Cocher toute la colonne' | trans | e('js') }}',
uncheck_all : '{{ 'Decocher toute la colonne' | trans | e('js') }}',
create_template : '{{ 'Creer un model' | trans | e('js') }}',
create_user : '{{ 'Creer un utilisateur' | trans | e('js') }}',
annuler : '{{ 'boutton::annuler' | trans | e('js') }}',
errorFileApiTooBig : '{{ 'This file is too big' | trans | e('js') }}',
requiredValue: '{{ 'This field is required' | trans | e('js') }}',
attention: '{{ 'Attention' | trans | e('js') }}',
reset_template_do_reset_apply_button: '{{ 'Reset and apply' | trans | e('js') }}',
reset_template_confirm_dialog_title: '{{ 'Confirm reset users rights before applying template' | trans | e('js') }}',
reset_template_do_confirm_choice: '{{ 'Rights will be erased before applying template, do you confirm?' | trans | e('js') }}',
reset_template_do_reset_button: '{{ 'Reset and apply template' | trans | e('js') }}',
reset_template_do_not_reset_button: '{{ 'Apply template' | trans | e('js') }}',
reset_template_dialog_title: '{{ 'Reset rights before applying template?' | trans | e('js') }}',
reset_template_ask_choice: '{{ 'Would you like to reset rights before applying the template?' | trans | e('js') }}',
reset_template_ask_choice: '{{ 'Would you like to reset rights before applying the template?' | trans | e('js') }}'
};
function sessionactive(){