Skip to content
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

Fall back to the English defaultsMap file if no localisation file can be found. Fixes #1233 #1234

Merged
merged 1 commit into from
Nov 21, 2012

Conversation

pjrobertson
Copy link
Member

I localised this file recently., but of course didn't think of the situation where a user might not even have English as an option in their language system prefs. This ensures the English file is used if no localisation can be found.

Based against the release branch. Should be merged into master once done.

@pjrobertson
Copy link
Member Author

Fixes #1233

@skurfer
Copy link
Member

skurfer commented Nov 21, 2012

Is it based on release or just a pull against release? Because we can't merge it to master if it's an offshoot of release. Not yet, anyway.

In any case, I'll look it over.

@pjrobertson
Copy link
Member Author

It's a branch from master, but the 'base branch' is release :)
So GitHub's wording seems pretty confusing… :(

Just to clarify:

  • it's an offshoot of master
  • It's set to be merged into release

On 21 November 2012 13:20, Rob McBroom notifications@github.com wrote:

In any case, I'll look it over.

skurfer added a commit that referenced this pull request Nov 21, 2012
Fall back to the English defaultsMap file if no localisation file can be found. Fixes #1233
@skurfer skurfer merged commit de38fc1 into quicksilver:release Nov 21, 2012
@skurfer
Copy link
Member

skurfer commented Nov 21, 2012

Go ahead and merge to master.

skurfer added a commit that referenced this pull request Nov 21, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants