Merge lp:~vthompson/music-app/remix-do-not-translate-splash-color into lp:music-app/remix
Status: | Merged |
---|---|
Approved by: | David Planella |
Approved revision: | 657 |
Merged at revision: | 657 |
Proposed branch: | lp:~vthompson/music-app/remix-do-not-translate-splash-color |
Merge into: | lp:music-app/remix |
Diff against target: |
10 lines (+1/-1) 1 file modified
com.ubuntu.music_music.desktop.in.in (+1/-1) |
To merge this branch: | bzr merge lp:~vthompson/music-app/remix-do-not-translate-splash-color |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kill Animals (community) | Approve | ||
David Planella | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Music App Developers | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2014-10-09.
Commit message
Fix Ubuntu-Splash-Color to not get pulled into translations
Description of the change
Commit #650 [1] added a splash screen upon startup with a manually set color. This worked, however, when the pot file is generated the hex color string is being added to the list of translatable strings. This needs to be fixed, as translations should not control the color code.
I'm not updating the POT file here, as that is being done in another MP that is updating the strings. This MP [2] is what surfaced the issue.
[1] http://
[2] https:/
PASSED: Continuous integration, rev:657 91.189. 93.70:8080/ job/music- app-remix- ci/60/ 91.189. 93.70:8080/ job/generic- mediumtests- utopic- python3/ 796 91.189. 93.70:8080/ job/generic- mediumtests- utopic- python3/ 796/artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/music- app-remix- utopic- amd64-ci/ 60
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/music- app-remix- ci/60/rebuild
http://