Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Update themes-settings.html and strings.js #8715

Merged
merged 5 commits into from
Aug 20, 2014

Conversation

Denisov21
Copy link
Contributor

Fix #8712 (part 1 of 2)

@redmunds
Copy link
Contributor

@Denisov21 Please put all of you files in a single pull request. I tried explain this in the Code Review section in this article, but maybe I wasn't clear enough. In you particular case, do this:

  1. After submitting your first pull request (this one), look at the top where it says: "Denisov21 wants to merge 2 commits into adobe:master from Denisov21:patch-12 "
  2. Go to your github fork of brackets page: github.com/Denisov21/brackets
  3. Click on the Branches Tab
  4. Click on the link to branch patch-12
  5. All changes from there will be to this same pull request.

@redmunds
Copy link
Contributor

@Denisov21 FYI, I updated the NLS README file with this section: Updating Existing Branch and Pull Request to make this more clear. Let me know if you have any suggestions for improvements.

@peterflynn
Copy link
Member

Yep. We can't merge this without the changes in #8716 being part of the same merge. There's no reason for this to be split into 2 PRs (or even 2 separate commits, really).

Denisov21 added 2 commits August 11, 2014 20:32
Changes made -- ready for another review
@Denisov21
Copy link
Contributor Author

@redmunds Sorry for the inconvenience, it was my first PR with two different files. Your explanation is very good!
@redmunds @peterflynn Changes made -- ready for another review

@Denisov21 Denisov21 changed the title Update themes-settings.html Update themes-settings.html and strings.js Aug 12, 2014
@@ -1,6 +1,6 @@
<div class="theme-settings modal">
<div class="modal-header">
<h1 class="dialog-title">Themes Settings</h1>
<h1 class="dialog-title">{{Strings.THEME_SETTINGS}}</h1>
Copy link
Contributor

Choose a reason for hiding this comment

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

Strings.THEME_SETTINGS does not match what you have defined in strings.js.

@Denisov21
Copy link
Contributor Author

@MiguelCastillo Changes made -- ready for another review!

@MiguelCastillo
Copy link
Contributor

This one looks good to be merged.

@ingorichter ingorichter self-assigned this Aug 20, 2014
ingorichter added a commit that referenced this pull request Aug 20, 2014
Update themes-settings.html and strings.js
@ingorichter ingorichter merged commit d11f015 into adobe:master Aug 20, 2014
@ingorichter
Copy link
Contributor

Thanks @Denisov21!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wish: Add multi language this string ("Themes Settings")!
5 participants