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

Update JINVALID_TOKEN text for consistency #8819

Merged
merged 1 commit into from
Jan 17, 2016

Conversation

photodude
Copy link
Contributor

In all other languages (and the en-GB install ini) JINVALID_TOKEN includes additional text beyond "invalid token" This PR makes this Language file consistent with the other language files.

Here is a ruff guidline based on the approved Semantic Versioning used by Joomla, which I think works well for evaluating if a PR is a bug fix for MAJOR.MINOR.PATCH, increment (or in this case for inclusion in the current beta series. Since all bug fixes which would otherwise increment PATCH number generally can and should be included during beta)

Semantic Versioning question Answer for this PR
new API methods (aka endpoints) no
new API functionality no
fixes an existing issue/bug yes
improvement to an existing feature yes.
Backwards compatible yes
changes existing lines of code no
changes existing translation strings yes
internal change that fixes incorrect behavior Yes, as a correction to a translation string it fixes an incorrect internal behavior

Based on those review points I would suggest that this has good qualifications for being a bug fix.

In all other languages (and the en-GB install ini) JINVALID_TOKEN includes additional text beyond "invalid token" The PR makes this Language file consistent with the other language files.
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Dec 31, 2015
@liluxdev
Copy link

liluxdev commented Jan 5, 2016

I have tested this item ✅ successfully on 42c7e6f

+1


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/8819.

@waader
Copy link
Contributor

waader commented Jan 5, 2016

I have tested this item ✅ successfully on 42c7e6f


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/8819.

@brianteeman
Copy link
Contributor

RTC - thanks


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/8819.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jan 6, 2016
@rdeutz rdeutz added this to the Joomla 3.5.1 milestone Jan 6, 2016
@photodude
Copy link
Contributor Author

@rdeutz Is there any reason to hold a text correction back for 3.5.1 rather than including in 3.5.0?

@rdeutz
Copy link
Contributor

rdeutz commented Jan 15, 2016

Beta state means only bug fixes go in, that's the procedure, that's all.

@brianteeman
Copy link
Contributor

This is a bug.
On 15 Jan 2016 8:00 pm, "Robert Deutz" notifications@github.com wrote:

Beta state means only bug fixes go in, that's the procedure, that's all.


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

@rdeutz
Copy link
Contributor

rdeutz commented Jan 15, 2016

In a language file?

@brianteeman
Copy link
Contributor

Yes.
On 15 Jan 2016 8:09 pm, "Robert Deutz" notifications@github.com wrote:

In a language file?


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

@infograf768
Copy link
Member

@rdeutz
I think this can go in 3.5.0 as we are not yet in language freeze. It will be one less to do for 3.5.1.
I personnaly did already correct it in our fr-FR 3.5.0.1 future pack.

@rdeutz
Copy link
Contributor

rdeutz commented Jan 16, 2016

Whatever, this is in no meaning a bug. We have a process and I am following the process. I am open to discuss the process but I am not open to discuss any issue, if that can be merged or not. The reason for having a policy is that
a) Anyone can know how and what we do
b) Not to discuss any issue and wasting time

It wouldn't be the first time we merged a small change and the result was that there was a side effect and we had to release and new release just some days after we released a version. We need to deliver a more stable and better in quality Joomla.

I checked any issue in RTC and I am merging all issues that are bug fixes following the procedure we agreed on usually within hours. But it seems that this is not a way to make people happy so I will stop doing it, there are enough people with merge right that can do the job.

@photodude
Copy link
Contributor Author

@rdeutz it's clearly a mater of interpratation on if a translation string wording is a bug.

I'm not intending to debate the process. Clearly 3.5.0 is in beta, therefore it's in language freeze (i.e. no api end point changes or new feature additions) and only bug fixes should go in (unless a show stopper bug is discovered).

But we unfortunetly don't have good guidlines on when a bug is acceptable for inclusion in a beta state release vs when it has to be help back for the next patch release. Therefore, there is all kinds of opinions going arround on whether this PR or that PR is actually a bug that can be included during the beta state of 3.5.0. Which is where, as you pointed out, some people are not happy with the resulting decisions and interpretations of whether a PR is or isn't the type of bug that can be merged at the point of a beta state.

wilsonge added a commit that referenced this pull request Jan 17, 2016
Update JINVALID_TOKEN text for consistency
@wilsonge wilsonge merged commit 144b9ea into joomla:staging Jan 17, 2016
@wilsonge
Copy link
Contributor

We haven't called language freeze on anything other than the installation folder langs at the moment. So I'm merging this for 3.5.0

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Jan 17, 2016
@wilsonge wilsonge modified the milestones: Joomla! 3.5.0, Joomla 3.5.1 Jan 17, 2016
@photodude photodude deleted the patch-6 branch January 17, 2016 04:42
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.

None yet

8 participants