Joomla! Issue Tracker - CMS

Download
Launch
Feeling Lucky

[#12381] - CS: convert CRLF to LF

? ? Success

User tests: Successful: Unsuccessful:

avatar piotr-cz
piotr-cz
10 Oct 2016

Summary of Changes

Changed EOL from CRLF (Windows) to LF (Unix/ OSX) format

Didn't change for:

  • libraries/phputf8/README (external library)
  • media/editors/codemirror/lib/addons.css (false positive)
  • media/editors/codemirror/lib/addons.js (false positive)

Script I've used:

find . -not -type d -exec file "{}" ";" | grep CRLF

credit: http://stackoverflow.com/a/73969/1012616

Testing Instructions

none

Documentation Changes Required

none

avatar piotr-cz piotr-cz - open - 10 Oct 2016
avatar piotr-cz piotr-cz - change - 10 Oct 2016
Status New ⇒ Pending
avatar joomla-cms-bot joomla-cms-bot - change - 10 Oct 2016
Labels Added: ? ? ?
avatar joomla-cms-bot joomla-cms-bot - change - 10 Oct 2016
Category ⇒ SQL Administration Components Installation Language & Strings MS SQL Unit Tests
avatar zero-24
zero-24 - comment - 10 Oct 2016

@piotr-cz can you tak a look inti the merge conflicts?

avatar piotr-cz piotr-cz - change - 10 Oct 2016
The description was changed
avatar piotr-cz piotr-cz - change - 10 Oct 2016
The description was changed
avatar piotr-cz
piotr-cz - comment - 10 Oct 2016

resolved

avatar brianteeman
brianteeman - comment - 12 Oct 2016

Shouldnt the language files be fixed at the source and not here. Otherwise the changes will probably be undone when they are next updated

avatar piotr-cz
piotr-cz - comment - 13 Oct 2016

Yes, should be fixed at the source.
I wasn't sure if installation language files are updated by to Joomla or language contributors.
How can I contact contributors to ckb-IQ installation language?

There are links to translation teams on community page.

I've tried to contact contributors to pl-PL but there are links to forum profile and no email, and I haven't received a reply yet.

avatar infograf768
infograf768 - comment - 13 Oct 2016

@piotr-cz
It is OK to solve these here and merge.
The TT Coordination will remind TTs to make sure they save their ini files with LF.

Note: ini files saved with CRLF do work fine but it is good indeed to normalise.

avatar photodude
photodude - comment - 1 Dec 2016

You probably can skip making the changes to use $this->getMockBuilder() rather than $this->getMock() directly. and just fix the merge conflicts after #12990 is merged into staging.

avatar brianteeman
brianteeman - comment - 5 Dec 2016

@piotr-cz can you look at the merge conflicts please

32b203f 7 Dec 2016 avatar alikon cs
d546e7a 7 Dec 2016 avatar alikon ops
avatar photodude
photodude - comment - 30 Dec 2016

@piotr-cz can you fix the merge conflicts please... once that is done this PR can move forward

avatar joomla-cms-bot joomla-cms-bot - change - 2 Jan 2017
Category SQL Administration Components Installation Language & Strings MS SQL Unit Tests ⇒ Repository Unit Tests Administration com_admin SQL Postgresql Components
avatar piotr-cz
piotr-cz - comment - 2 Jan 2017

Rebased on latest staging branch again.

avatar laoneo
laoneo - comment - 3 Jan 2017

You still want to merge 890 commits with over 2000 file changes? Did you rewrite Joomla during holiday ? ?

avatar infograf768
infograf768 - comment - 3 Jan 2017

This PR also changes some stuff else than EOL

avatar rdeutz
rdeutz - comment - 3 Jan 2017

This PR does more than it says in the desc. It needs to be re-done

avatar rdeutz rdeutz - change - 3 Jan 2017
Status Pending ⇒ Closed
Closed_Date 0000-00-00 00:00:00 ⇒ 2017-01-03 09:42:12
Closed_By ⇒ rdeutz
avatar rdeutz rdeutz - close - 3 Jan 2017
avatar piotr-cz
piotr-cz - comment - 3 Jan 2017

I'll prepare new one then

Add a Comment

Login with GitHub to post a comment