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

Globalize:Provide Bidi structured text support to MessageFormat #539 #598

Closed
wants to merge 813 commits into from

Conversation

ashensis
Copy link

As per discussion in #539 (comment)
this PR is based on corresponding feature been recently introduced in SlexAxton/messageFormatter.js
(see messageformat/messageformat#129)
It provides an ability to enforce Bidi structured text in message being formatted by using Unicode Bidi control characters. The upgrading qualities are:

  • Prevents intermingling of text contained in placeholders with the rest of message text.
    
  • Maintains the integrity of Bidi text flowing according to directionality of language script. For reference to Bidi structured text see: http://cldr.unicode.org/development/development-process/design-proposals/bidi-handling-of-structured-text
    

parndt and others added 30 commits October 14, 2013 08:02
to return results from translation table for translated attributes.
This reverts commit 28653bb571052768158c84eaf98448e22e796df7.
@jquerybot
Copy link

Thank you for your pull request. It looks like this may be your first contribution to a jQuery Foundation project, if so we need you to sign our Contributor License Agreement (CLA).

📝 Please visit http://contribute.jquery.org/CLA/ to sign.

After you signed, the PR is checked again automatically after a minute. If there's still an issue, please reply here to let us know.


If you've already signed our CLA, it's possible your git author information doesn't match your CLA signature (both your name and email have to match), for more information, check the status of your CLA check.

@tomerm
Copy link

tomerm commented Mar 21, 2016

@rxaviers after contribution to SlexAxton/messageformat.js we are back to Globalize to finalize this task. Can you please review this submission ? I would also appreciate your guidance on CLA error we currently experience with this PR. Thanks a lot in advance.

@jzaefferer
Copy link
Contributor

It looks like you've filed this against the wrong repository. Even if this is on purpose, its definitely very wrong in some other way.

@jzaefferer jzaefferer closed this Mar 21, 2016
@jzaefferer
Copy link
Contributor

This commit looks fine: c48e22b - everything else doesn't belong here. Please create a new PR with only relevant commits.

@ashensis
Copy link
Author

Hi @jzaefferer . I got somewhat confused, excuse me for ignorance.
I created this PR basing on branch MF539 in my fork.
When you say "everything else doesn't belong here", what do you mean by ELSE?
To my humble understanding there is nothing else in my branch MF539 that had been created yesterday, apparently I am missing some point?
I didn't understand your comment about wrong repository either, what was wrong about all this?

@ashensis
Copy link
Author

I see this creepy title
"ashensis wants to merge 813 commits into jquery:master from ashensis:MF539" but I have no idea where this 813 commits came from to my branch. May be I missed some crutial synchronization step?

@jzaefferer
Copy link
Contributor

It seems like you branched globalize/globalize instead of jquery/globalize (this repo), then added a commit on top.

@ashensis
Copy link
Author

Thank you , yes, I confess doing this once upon a time on my master branch by mistake, so I would kindly ask your advice, should this pattern work for me?:
git checkout master
git pull upstream master
$ git reset --hard upstream/master
(I already did this on my master branch to get synchronized with upstream repository)
$ git checkout (this branch)
$ git rebase HEAD
Should this work for getting reed of all that mess?

@rxaviers
Copy link
Member

Considering upstream is the name you give for this repo, you could git rebase -i upstream/master inside your branch and leave the commits you have implemented only (discard the ones unrelated to this branch). Alternatively, you could git checkout upstram/master && git checkout -b my-new-branch && git cherry-pick <commit-1> <commit-2> ..., where commit-1, commit-2, etc are the ones you've implemented. Then, you push that new branch and create a PR on top of that. I hope that helps.

@ashensis
Copy link
Author

Thank you, I created new PR #599 instead of this one

@rxaviers
Copy link
Member

👍

@ashensis ashensis deleted the MF539 branch March 23, 2016 12:30
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.