Skip to content

Add Meta Informations to the common Message object #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 1, 2017
Merged

Add Meta Informations to the common Message object #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf45f51
Add Meta Informations to the common Message object
damienalexandre May 14, 2017
28247db
Clean up the parameters to only have one occurence of each key
damienalexandre May 31, 2017
d9b16a1
Fix coding style
damienalexandre May 31, 2017
dd8b563
Drop HHVM support \o/
damienalexandre May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ php:
- 5.6
- 7.0
- 7.1
- hhvm

env:
global:
Expand Down
14 changes: 9 additions & 5 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# Change Log

The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.

## UNRELEASED

### Changed

- Add meta informations from the profiler to `Translation\Common\Model\Message`

## 0.3.2

### Changed
Expand Down Expand Up @@ -58,19 +62,19 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
### Changed

- `Translation\Bundle\Service\CatalogueFetcher` moved to `Translation\Bundle\Catalogue\CatalogueFetcher`
- Made most (if not all) classes final.
- Made most (if not all) classes final.
- `CatalogueFetcher` requires a `Configuration` object.

### Removed

- Dead code in the `SymfonyProfilerController`
- `FileStorage` was moved to `php-translation/symfony-storage`
- `FileStorage` was moved to `php-translation/symfony-storage`

### Fixed

- The bundle works without any configuration.
- The bundle works without any configuration.
- You may have an config named "default".

## 0.1.0

First release.
First release.
44 changes: 30 additions & 14 deletions Model/SfProfilerMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,36 @@ public static function create(array $data)
return $message;
}

/**
* Convert to a Common\Message.
*
* @return Message
*/
public function convertToMessage()
{
return new Message(
$this->key,
$this->domain,
$this->locale,
$this->translation
);
}
/**
* Convert to a Common\Message.
*
* @return Message
*/
public function convertToMessage()
{
$meta = [];

if (!empty($this->getParameters())) {
// Reduce to only get one value of each parameter, not all the usages.
$meta['parameters'] = array_reduce($this->getParameters(), 'array_merge', []);
}

if (!empty($this->getCount())) {
$meta['count'] = $this->getCount();
}

if (!empty($this->getTransChoiceNumber())) {
$meta['transChoiceNumber'] = $this->getTransChoiceNumber();
}

return new Message(
$this->key,
$this->domain,
$this->locale,
$this->translation,
$meta
Copy link
Member

@rvanlaak rvanlaak May 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems better to me to add parameters, count and transChoiceNumber to the Message value object as fields.

Copy link
Contributor Author

@damienalexandre damienalexandre May 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe, I'm not sure: the Message object is a common objet used to represent a translation on the storage, and those parameters, count and transChoiceNumber information are only needed when displaying a translation.

);
}

/**
* @return int
Expand Down