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

Use symfony translator

Browse Source
This commit is contained in:
Romain Neutron
2013-11-25 09:07:16 +01:00
parent 71df6e96a3
commit 2ba164701d
325 changed files with 1946 additions and 2145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/classes/API/OAuth2/Form/DevAppDesktop.php
View File

@@ -133,13 +133,12 @@ class API_OAuth2_Form_DevAppDesktop
*/
public static function loadValidatorMetadata(ClassMetadata $metadata)
{
$blank = ['message' => _('Cette valeur ne peut être vide')];
$url = ['message' => _('Url non valide')];
// supprimer avant merge : verifier que les contraintes URL et NotBlank sont bien analysées dans le dump
$metadata->addPropertyConstraint('name', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('description', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\Url($url));
$metadata->addPropertyConstraint('name', new Constraints\NotBlank());
$metadata->addPropertyConstraint('description', new Constraints\NotBlank());
$metadata->addPropertyConstraint('urlwebsite', new Constraints\NotBlank());
$metadata->addPropertyConstraint('urlwebsite', new Constraints\Url());
return;
}

15
lib/classes/API/OAuth2/Form/DevAppInternet.php
View File

@@ -136,15 +136,12 @@ class API_OAuth2_Form_DevAppInternet
*/
public static function loadValidatorMetadata(ClassMetadata $metadata)
{
$blank = ['message' => _('Cette valeur ne peut être vide')];
$url = ['message' => _('Url non valide')];
$metadata->addPropertyConstraint('name', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('description', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlwebsite', new Constraints\Url($url));
$metadata->addPropertyConstraint('urlcallback', new Constraints\NotBlank($blank));
$metadata->addPropertyConstraint('urlcallback', new Constraints\Url($url));
$metadata->addPropertyConstraint('name', new Constraints\NotBlank());
$metadata->addPropertyConstraint('description', new Constraints\NotBlank());
$metadata->addPropertyConstraint('urlwebsite', new Constraints\NotBlank());
$metadata->addPropertyConstraint('urlwebsite', new Constraints\Url());
$metadata->addPropertyConstraint('urlcallback', new Constraints\NotBlank());
$metadata->addPropertyConstraint('urlcallback', new Constraints\Url());
return;
}

19
lib/classes/API/V1/adapter.php
View File

@@ -675,12 +675,12 @@ class API_V1_adapter extends API_V1_Abstract
$reasons = $output = null;
$callback = function ($element, $visa, $code) use (&$reasons, &$output) {
$callback = function ($element, $visa, $code) use ($app, &$reasons, &$output) {
if (!$visa->isValid()) {
$reasons = [];
foreach ($visa->getResponses() as $response) {
$reasons[] = $response->getMessage();
$reasons[] = $response->getMessage($app['translator']);
}
}
@@ -788,7 +788,7 @@ class API_V1_adapter extends API_V1_Abstract
if ($file->getChecks()) {
foreach ($file->getChecks() as $checker) {
$checks[] = $checker->getMessage();
$checks[] = $checker->getMessage($this->app['translator']);
}
}
@@ -1096,7 +1096,7 @@ class API_V1_adapter extends API_V1_Abstract
$record->set_metadatas($metadatas);
$result->set_datas(["record_metadatas" => $this->list_record_caption($record->get_caption())]);
} catch (Exception $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('An error occured'));
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, $this->app->trans('An error occured'));
}
return $result;
@@ -1142,7 +1142,7 @@ class API_V1_adapter extends API_V1_Abstract
]
);
} catch (Exception $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('An error occured'));
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, $this->app->trans('An error occured'));
}
return $result;
@@ -1190,9 +1190,9 @@ class API_V1_adapter extends API_V1_Abstract
$record = $databox->get_record($record_id);
$result->set_datas(['record' => $this->list_record($record)]);
} catch (NotFoundHttpException $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('Record Not Found'));
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, $this->app->trans('Record Not Found'));
} catch (Exception $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('An error occured'));
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, $this->app->trans('An error occured'));
}
return $result;
@@ -1214,9 +1214,9 @@ class API_V1_adapter extends API_V1_Abstract
$story = $databox->get_record($story_id);
$result->set_datas(['story' => $this->list_story($story)]);
} catch (NotFoundHttpException $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('Story Not Found'));
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, $this->app->trans('Story Not Found'));
} catch (Exception $e) {
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, _('An error occured'));
$result->set_error_message(API_V1_result::ERROR_BAD_REQUEST, $this->app->trans('An error occured'));
}
return $result;
@@ -1703,6 +1703,7 @@ class API_V1_adapter extends API_V1_Abstract
'created_on' => $permalink->get_created_on()->format(DATE_ATOM),
'id' => $permalink->get_id(),
'is_activated' => $permalink->get_is_activated(),
/** @Ignore */
'label' => $permalink->get_label(),
'updated_on' => $permalink->get_last_modified()->format(DATE_ATOM),
'page_url' => $permalink->get_page(),