Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

[WIP] Use XLIFF resname #17

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[WIP] Use XLIFF resname #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bd4b15
Use XLIFF resname
thewilkybarkid Dec 21, 2018
3951cb4
Try using Flex
thewilkybarkid Feb 5, 2019
e84afa4
Matrix didn't work
thewilkybarkid Feb 5, 2019
4aad069
Try a double pass
thewilkybarkid Feb 5, 2019
95a7104
Try newer Flex
thewilkybarkid Feb 5, 2019
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
19 changes: 11 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,22 @@ script:
jobs:
include:

- stage: Test
name: Symfony 4.0
- &Symfony
stage: Test
name: Symfony 4.1
Copy link
Contributor Author

@thewilkybarkid thewilkybarkid Dec 21, 2018

Choose a reason for hiding this comment

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

This is the problem with using the full stack, individual components are versioned (and symfony/translation won't work with 4.0). Would prefer a way to use each component at that version where possible.

Copy link
Contributor Author

@thewilkybarkid thewilkybarkid Feb 5, 2019

Choose a reason for hiding this comment

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

Symfony specific, but wonder if symfony/force-lowest#2 (comment) works...

Copy link
Contributor Author

@thewilkybarkid thewilkybarkid Feb 5, 2019

Choose a reason for hiding this comment

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

Nope: https://travis-ci.com/libero/content-api-bundle/jobs/175361549

Copy link
Contributor Author

@thewilkybarkid thewilkybarkid Feb 5, 2019

Choose a reason for hiding this comment

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

Wondered if symfony/flex#412 would fix, but didn't (https://travis-ci.com/libero/content-api-bundle/jobs/175370448). Opened symfony/flex#473.

env: SYMFONY_REQUIRE=~4.1.0
before_install:
- *Xdebug
- composer require --dev --no-update symfony/symfony=4.0.*
- travis_retry composer global require --no-scripts symfony/flex:^1.2@dev
php: 7.2

- stage: Test
- << : *Symfony
name: Symfony 4.0
env: SYMFONY_REQUIRE=~4.0.0

- << : *Symfony
name: Symfony 3.4
before_install:
- *Xdebug
- composer require --dev --no-update symfony/symfony=3.4.*
php: 7.2
env: SYMFONY_REQUIRE=~3.4.0

- stage: Test
name: Lowest dependency versions
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"phpunit/phpunit": "^7.2",
"symfony/console": "^3.4 || ^4.0",
"symfony/filesystem": "^3.4 || ^4.0",
"symfony/translation": "^3.4 || ^4.0"
"symfony/translation": "^3.4.19 || ^4.1.8"
},
"suggest": {
"doctrine/dbal": "To use the DoctrineItems adapter",
Expand Down
52 changes: 21 additions & 31 deletions src/Resources/translations/api_problem.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,48 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">

<file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
<file source-language="en" datatype="plaintext" original="file.ext">

<body>

<trans-unit id="libero.content.item.not_found.title">
<source>libero.content.item.not_found.title</source>
<target>Item not found</target>
<trans-unit id="1" resname="libero.content.item.not_found.title">
<source>Item not found</source>
</trans-unit>

<trans-unit id="libero.content.item.not_found.details">
<source>libero.content.item.not_found.details</source>
<target>An item with the ID "%id%" could not be found.</target>
<trans-unit id="2" resname="libero.content.item.not_found.details">
<source>An item with the ID "%id%" could not be found.</source>
</trans-unit>

<trans-unit id="libero.content.item.invalid_id.title">
<source>libero.content.item.invalid_id.title</source>
<target>Invalid ID</target>
<trans-unit id="3" resname="libero.content.item.invalid_id.title">
<source>Invalid ID</source>
</trans-unit>

<trans-unit id="libero.content.item.invalid_id.details">
<source>libero.content.item.invalid_id.details</source>
<target>"%id%" is not a valid ID.</target>
<trans-unit id="4" resname="libero.content.item.invalid_id.details">
<source>"%id%" is not a valid ID.</source>
</trans-unit>

<trans-unit id="libero.content.item.invalid_version.title">
<source>libero.content.item.invalid_version.title</source>
<target>Invalid version number</target>
<trans-unit id="5" resname="libero.content.item.invalid_version.title">
<source>Invalid version number</source>
</trans-unit>

<trans-unit id="libero.content.item.invalid_version.details">
<source>libero.content.item.invalid_version.details</source>
<target>"%version%" is not a valid version number.</target>
<trans-unit id="6" resname="libero.content.item.invalid_version.details">
<source>"%version%" is not a valid version number.</source>
</trans-unit>

<trans-unit id="libero.content.item.unexpected_version.title">
<source>libero.content.item.unexpected_version.title</source>
<target>Unexpected version number</target>
<trans-unit id="7" resname="libero.content.item.unexpected_version.title">
<source>Unexpected version number</source>
</trans-unit>

<trans-unit id="libero.content.item.unexpected_version.details">
<source>libero.content.item.unexpected_version.details</source>
<target>Expected version %expected% for item "%id%", not %version%.</target>
<trans-unit id="8" resname="libero.content.item.unexpected_version.details">
<source>Expected version %expected% for item "%id%", not %version%.</source>
</trans-unit>

<trans-unit id="libero.content.item.version_not_found.title">
<source>libero.content.item.version_not_found.title</source>
<target>Item version not found</target>
<trans-unit id="9" resname="libero.content.item.version_not_found.title">
<source>Item version not found</source>
</trans-unit>

<trans-unit id="libero.content.item.version_not_found.details">
<source>libero.content.item.version_not_found.details</source>
<target>Item "%id%" does not have a version %version%.</target>
<trans-unit id="10" resname="libero.content.item.version_not_found.details">
<source>Item "%id%" does not have a version %version%.</source>
</trans-unit>

</body>
Expand Down