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.

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

Fix missing translation of built-in section names #27645

Merged
merged 1 commit into from May 4, 2017

Conversation

Projects
None yet
4 participants
@vidaren
Contributor

vidaren commented Apr 16, 2017

Description

Changed translation resource from 'core' to 'lib', because translation of section names was not happening even though the code does translate it here: https://github.com/owncloud/core/blob/master/lib/private/Settings/SettingsManager.php#L195

Related Issue

App provided sections with translations and icons? #27327

Motivation and Context

Translation of section names was not happening on the Settings page. See screenshot of Norwegian installation below.

How Has This Been Tested?

Tested in private installation. Manual regression testing:

  • The modified translation resource is used exclusively for translating sections in SettingsManager.php. This works after the fix.
  • The modified translation resource is passed to SecurityWarning.php to translate memcache names. This design was already broken before the fix, because those names are in the 'settings' resource, neither in 'core' nor 'lib'. I leave it to others to decide how this separate issue is best fixed.

Screenshots (if appropriate):

oc-nontrans-a

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

EDIT: Corrected link to SecurityWarning.php.

@CLAassistant

This comment has been minimized.

Show comment
Hide comment
@CLAassistant

CLAassistant Apr 16, 2017

CLA assistant check
All committers have signed the CLA.

CLAassistant commented Apr 16, 2017

CLA assistant check
All committers have signed the CLA.

@DeepDiver1975

This comment has been minimized.

Show comment
Hide comment
@DeepDiver1975
Member

DeepDiver1975 commented Apr 16, 2017

👍

@DeepDiver1975 DeepDiver1975 added this to the 10.0 milestone Apr 24, 2017

@DeepDiver1975

This comment has been minimized.

Show comment
Hide comment
@DeepDiver1975

DeepDiver1975 Apr 24, 2017

Member

@vidaren please sign the CLA - just click on the button above - thx

Member

DeepDiver1975 commented Apr 24, 2017

@vidaren please sign the CLA - just click on the button above - thx

@PVince81 PVince81 modified the milestones: 10.0.1, 10.0 Apr 26, 2017

@vidaren

This comment has been minimized.

Show comment
Hide comment
@vidaren

vidaren Apr 27, 2017

Contributor

CLA signed.

Contributor

vidaren commented Apr 27, 2017

CLA signed.

@DeepDiver1975 DeepDiver1975 merged commit 50262df into owncloud:master May 4, 2017

2 of 4 checks passed

Scrutinizer Errored
Details
continuous-integration/jenkins/pr-head This commit cannot be built
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is not signed yet.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment