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

en-GB User Interface Text review stage 1 #5615

Closed
wants to merge 114 commits into from
Closed

en-GB User Interface Text review stage 1 #5615

wants to merge 114 commits into from

Conversation

brianteeman
Copy link
Contributor

This PR completes the stage 1 review of all the en-GB language files as outline in the announcement

Although there are a lot of changes there is nothing that should effect Translation Teams. For example Descriptions all now end with a period and Labels should now all be capitalised.

I have tried to make sure that I did commits to my branch with sensible labels that match the items in the en-GB User Interface Text.

I have deliberately not included some changes that the WG want to make that people might feel the need to discuss and will introduce them individually and gradually.

@wilsonge
Copy link
Contributor

@phproberto the " does work currently right? It's just raw " that need to be removed correct?

@elkuku
Copy link
Contributor

elkuku commented Jan 28, 2015

@mbabker

For expected results 100% of the time, any double quote within the string should always be escaped regardless of what type of use case.

Could this sentence be included to the (new) style guide?

@mbabker
Copy link
Contributor

mbabker commented Jan 28, 2015

@wilsonge Yes. HTML entities are handled correctly in HTML output.

@elkuku I'd say yes on that.

@brianteeman
Copy link
Contributor Author

I am happy to add that they should be escaped in the style guide once you
decide how they are to be escaped. QQ make is completely unreadable and
" is far more normal escape style and is readable

On 28 January 2015 at 19:04, Michael Babker notifications@github.com
wrote:

@wilsonge https://github.com/wilsonge Yes. HTML entities are handled
correctly in HTML output.

@elkuku https://github.com/elkuku I'd say yes on that.


Reply to this email directly or view it on GitHub
#5615 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

@Bakual
Copy link
Contributor

Bakual commented Jan 28, 2015

+1 for \" instead of _QQ_

@phproberto
Copy link
Contributor

Yes. Anything not a direct " is correct

@phproberto
Copy link
Contributor

Just reviewed it and it looks ok (I haven't checked all the files). Replacing "_QQ_" with \" is ok too if you want to definitely get rid of QQ.

So basically:

  • To add a double quote in text you can use: "_QQ_" or \" or "
  • To add a double quote inside HTML markup like classes, URLs, etc. you can use: "_QQ_" or \". " does not work here.

So I think if we want to get rid of "_QQ_" I'd recommend as a general rule to use always \" because it works everywhere.

@brianteeman
Copy link
Contributor Author

As a general rule it is much easier than that

To display a Quotation Mark use the html character (this is already in
the docs)
To use a quotation mark use the escaped character (hopefully this is
'' with QQ kept for BC)

On 28 January 2015 at 20:25, Roberto Segura notifications@github.com
wrote:

Just reviewed it and it looks ok (I haven't checked all the files).
Replacing "QQ" with " is ok to if you want to definitely get rid of
QQ.

So basically:

  • To add a double quote in text you can use: "QQ" or " or(&)quot;`
    (github does not allow me to put it correctly)
  • To add a double quote inside HTML markup like classes, URLs, etc.
    you can use: "QQ" or ". quot; does not work here.

So I think if we want to get rid of "QQ" I'd recommend as a general
rule to use always " because it works everywhere.


Reply to this email directly or view it on GitHub
#5615 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

@wilsonge
Copy link
Contributor

I think Brian's one makes sense to me

@infograf768
Copy link
Member

@wilsonge

I'll do a final review and hopefully merge tonight

This is not so urgent, please wait we decide how to handle it globally ( #5907 ), so that we also know how to do in com_localise and what to say to TTs.

@brianteeman
Copy link
Contributor Author

This PR does not effect TT
The string has been reverted to QQ
What else can you come up with to stop this being merged

@infograf768
Copy link
Member

Stop the paranoia, Brian. I have nothing against making en-GB better. I am concerned by formats and code.
I am just saying that IF we decide to use escaped doublequotes \" instead of "_QQ_", we could already do it here.

@brianteeman
Copy link
Contributor Author

Just stop it JM you are playing games with your threats/promises to leave
Joomla (again) if this was committed without QQ.

We have done what you asked for
Now lets commit the dam thing so people are able to test that there aren't
any silly mistakes.
When/if a decision is made on escaping characters a new PR can be done for
that in seconds.

(Turning off notifications)

@infograf768 infograf768 added this to the Joomla! 3.4.0 milestone Jan 29, 2015
@infograf768 infograf768 added the RTC This Pull Request is Ready To Commit label Jan 29, 2015
@infograf768
Copy link
Member

When/if a decision is made on escaping characters a new PR can be done for that in seconds.

Correct.
@wilsonge
Ok to merge for me. RTC.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.