Skip to content

Unicode changes to support R to L script - #2137

Merged
jzoldak merged 1 commit into
openedx:masterfrom
a-nassif:feature/unicode
Jan 31, 2014
Merged

Unicode changes to support R to L script#2137
jzoldak merged 1 commit into
openedx:masterfrom
a-nassif:feature/unicode

Conversation

@jzoldak

@jzoldak jzoldak commented Jan 10, 2014

Copy link
Copy Markdown
Contributor

We are separating out the QRF PR into discrete features.
This is just the unicode changes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This seems unrelated to the unicode changes.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

it select yaml files based on language. I can remove it to be added till we figure out the yaml files.

@singingwolfboy

Copy link
Copy Markdown
Contributor

@jzoldak, can you rebase this pull request?

@a-nassif

Copy link
Copy Markdown

No prob. Will rebase again tonight.
On 23 Jan 2014 17:51, "David Baumgold" notifications@github.com wrote:

@jzoldak https://github.com/jzoldak, can you rebase this pull request?


Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/2137#issuecomment-33135690
.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why import os? It doesn't look like it's being used anywhere in this file.

@singingwolfboy

Copy link
Copy Markdown
Contributor

Once this PR is rebased and the tests pass, I'm giving it a 👍. The only issues I found were minor nitpicks.

@jzoldak

jzoldak commented Jan 24, 2014

Copy link
Copy Markdown
Contributor Author

@abdoosh00 I will squash commits then rebase to current edx/master.

@a-nassif

Copy link
Copy Markdown

Sounds good Jay...is my rebase messed up again? :s
On 24 Jan 2014 20:42, "Jay Zoldak" notifications@github.com wrote:

@abdoosh00 https://github.com/abdoosh00 I will squash commits then
rebase to current edx/master.


Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/2137#issuecomment-33249153
.

@jzoldak

jzoldak commented Jan 24, 2014

Copy link
Copy Markdown
Contributor Author

@abdoosh00 no, it wasn't messed up, just getting stale. We needed to get it up to date so it could be current with master and also make sure that this branch had some platform changes we needed to continue building correctly on our jenkins server. Please delete the branch locally then pull again (or otherwise force pull) in order to get the rebase changes that I force pushed.

@a-nassif

Copy link
Copy Markdown

Ok, i thought this was #2138 (the html changes one) cuz thats the one i
just rebased. I will rebase this asap, or feel free if you wanna rebase it
yourself.
On 24 Jan 2014 20:57, "Jay Zoldak" notifications@github.com wrote:

@abdoosh00 https://github.com/abdoosh00 no, it wasn't messed up, just
getting stale. We needed to get it up to date so it could be current with
master and also make sure that this branch had some platform changes we
needed to continue building correctly on our jenkins server. Please delete
the branch locally then pull again (or otherwise force pull) in order to
get the rebase changes that I force pushed.


Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/2137#issuecomment-33250465
.

@jzoldak

jzoldak commented Jan 24, 2014

Copy link
Copy Markdown
Contributor Author

@abdoosh00 I rebased but could not get test results because the total number of pylint violations exceeded our threshold that we have set on the Jenkins server. I just added another commit that fixed these.

@a-nassif

Copy link
Copy Markdown

@jzoldak could you please force push your last changes again, I hope you didn't delete it already :s. I forced push to feature/rtl_sass branch and it pushed to both branches. is there a way to specify the exact branch to push to only? or do I have to make sure that everything is up-to-date before doing a force push?

@jzoldak

jzoldak commented Jan 25, 2014

Copy link
Copy Markdown
Contributor Author

@abdoosh00 you need to change your git push default to 'simple' or 'current' so that it will only push the branch that you're on. See https://www.kernel.org/pub/software/scm/git/docs/git-config.html. You can do this with git config --global push.default simple

Unfortunately I'm traveling and won't have access to the machine that I have a copy of your fork of the repo on until Tuesday. :( You might be able to recover with your version of the repo using your git reflog. A git expert should be able to help you with this, maybe ask @singingwolfboy?

@a-nassif

Copy link
Copy Markdown

@singingwolfboy @jzoldak All should be fine now here and on #2138 , tests passed and comments responded to as required.

@ahmadio

ahmadio commented Jan 28, 2014

Copy link
Copy Markdown

I'd like to help with some unicode problems that you didn't cover in this PR, do I need to create new PR or post it here?
sorry if I'm not experienced enough with git or github

@a-nassif

Copy link
Copy Markdown

You can tell me about it to fix it. What problems? Did you test this PR and
got unicode/decode errors?
On 29 Jan 2014 00:29, "ahmadix" notifications@github.com wrote:

I'd like to help with some unicode problems that you didn't cover in this
PR, do I need to create new PR or post it here?
sorry if I'm not experienced enough with git or github

Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/2137#issuecomment-33534524
.

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.

4 participants