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 fa-IR installation language #18068

Merged
merged 2 commits into from
Sep 22, 2017
Merged

Update fa-IR installation language #18068

merged 2 commits into from
Sep 22, 2017

Conversation

Bakual
Copy link
Contributor

@Bakual Bakual commented Sep 22, 2017

Please review and merge once Travis passes

@Bakual Bakual added this to the Joomla 3.8.1 milestone Sep 22, 2017
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Sep 22, 2017
@infograf768
Copy link
Member

this ini file has windows EOL instead of Unix

@infograf768
Copy link
Member

Here is a corrected file (for EOL) only.

fa-IR.ini.zip

@infograf768
Copy link
Member

Hmm, I am afraid it can't be used as patch.
@mbabker
I suggest to delete the original file and add the one in the zip to make sure it is now Unix.

@infograf768
Copy link
Member

I.e use this one
fair.ini.diff.zip

@Bakual
Copy link
Contributor Author

Bakual commented Sep 22, 2017

Let me fix it 😄

@Bakual
Copy link
Contributor Author

Bakual commented Sep 22, 2017

Better now?

I thought my Git does change the line endings automatically, but apparenlty it didn't in this case?

@mbabker mbabker merged commit 5e39311 into joomla:staging Sep 22, 2017
@Bakual Bakual deleted the UpdateFaIr branch September 22, 2017 21:00
ethernidee pushed a commit to ethernidee/joomla-cms that referenced this pull request Sep 23, 2017
* Update fa-IR installation language

* Fixing line endings and version
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

4 participants