From 5d79ff40a1c8dc4d763a4fec152220d69fab6a27 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 15 Nov 2013 12:18:14 +0100 Subject: [PATCH 1/3] Prepare version 3.8.1 --- CHANGELOG.md | 2 +- bower.json | 2 +- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cfb334d6c..45ccd2a1aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -* 3.8.1 (2013-xx-xx) +* 3.8.1 (2013-11-15) - BugFix : IE 6 homepage error message is broken. - BugFix : Databox fields administration is broken on firefox. diff --git a/bower.json b/bower.json index 59b58599db..a26fc3b523 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Phraseanet", - "version": "3.8.0", + "version": "3.8.1", "dependencies": { "bootstrap": "~2.2.2", "jquery": "~1.8.3", diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index ee6054ca28..210a77bc8e 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.8.1-alpha.4'; + protected static $number = '3.8.1'; protected static $name = 'Diplodocus'; public static function getNumber() From 60d4ee03e6bb4580644d9e40ab586d66fb9609fb Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 15 Nov 2013 16:09:43 +0100 Subject: [PATCH 2/3] Fix html escaping --- templates/web/admin/index.html.twig | 39 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig index 8b2bf307b7..48e9bbf59c 100644 --- a/templates/web/admin/index.html.twig +++ b/templates/web/admin/index.html.twig @@ -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(){ From 88b4df745b1cbc38e5c64d52b5e2097579eb580f Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 15 Nov 2013 17:44:35 +0100 Subject: [PATCH 3/3] Prepare version 3.8.2 --- CHANGELOG.md | 4 ++++ bower.json | 2 +- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45ccd2a1aa..f4d4641a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +* 3.8.1 (2013-11-15) + + - BugFix : Locale translation may block administration module load. + * 3.8.1 (2013-11-15) - BugFix : IE 6 homepage error message is broken. diff --git a/bower.json b/bower.json index a26fc3b523..e7c108c0c8 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Phraseanet", - "version": "3.8.1", + "version": "3.8.2", "dependencies": { "bootstrap": "~2.2.2", "jquery": "~1.8.3", diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 210a77bc8e..d56752d179 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.8.1'; + protected static $number = '3.8.2'; protected static $name = 'Diplodocus'; public static function getNumber()