[stable9] Read available l10n files also from theme folder #23567

Merged
merged 2 commits into from Apr 4, 2016

Projects

None yet

4 participants

@MorrisJobke
Member

I tested it and it works fine :)

MorrisJobke added some commits Mar 17, 2016
@MorrisJobke MorrisJobke Read available l10n files also from theme folder
The old behaviour was that only languages could be used for an app
that are already present in the apps/$app/l10n folder. If there is
a themed l10n that is not present in the apps default l10n folder
the language could not be used and the texts are not translated.

With this change this is possible and also the l10n files are
loaded even if the default l10n doesn't contain the l10n file.
4a3a9d9
@MorrisJobke MorrisJobke Inject server root - allows proper testing and separation of concerns
6d8f803
@MorrisJobke MorrisJobke added this to the 9.0.1-current-maintenance milestone Mar 24, 2016
@MorrisJobke
Member

cc @nickvergessen @LukasReschke @DeepDiver1975

It would be super nice to get this reviewed ;)

also @PVince81 maybe ;)

@nickvergessen
Contributor

👍

@LukasReschke
Member

👍

@DeepDiver1975 DeepDiver1975 merged commit 85a0dd3 into stable9 Apr 4, 2016

22 checks passed

cla-bot-core Build #2644 succeeded in 12 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #59999 succeeded in 23 sec
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #53989 succeeded in 8 min 43 sec
Details
core-ci-linux/database=mysql,label=SLAVE Build #28557 succeeded in 18 min
Details
core-ci-linux/database=oci,label=SLAVE Build #28557 succeeded in 39 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #28557 succeeded in 16 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #28557 succeeded in 8 min 22 sec
Details
ocs-api-integration-tests-ci Build #8904 succeeded in 6 min 56 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #8675 succeeded in 1 min 4 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #8675 succeeded in 2 min 29 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #8675 succeeded in 2 min 36 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #9507 succeeded in 2 min 24 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #1371 succeeded in 3 min 27 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #36816 succeeded in 2 min 22 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 16 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 1 hr 7 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 1 hr 4 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 36 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 1 hr 1 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 24 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #13019 succeeded in 20 min
Details
@DeepDiver1975 DeepDiver1975 deleted the stable9-backport-23362 branch Apr 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment