Skip to content

Use old language file selection when no default file exists#3110

Merged
JLHwung merged 1 commit intohexojs:masterfrom
bobd91:default-language
Apr 6, 2018
Merged

Use old language file selection when no default file exists#3110
JLHwung merged 1 commit intohexojs:masterfrom
bobd91:default-language

Conversation

@bobd91
Copy link
Copy Markdown
Contributor

@bobd91 bobd91 commented Apr 4, 2018

Issue #3108 points out that many existing themes rely on the old but incorrect way of selecting language files prior to the pull request #3069 which fixes the incorrect behaviour.

This PR makes a small change so that when no language is configured and no default language file exists then the fallback is to use the old method of selecting a language file rather than not selecting any file.

A single test has been added to confirm that the first language file added will be used as the fallback.

@coveralls
Copy link
Copy Markdown

coveralls commented Apr 4, 2018

Coverage Status

Coverage remained the same at 97.267% when pulling 3dcd291 on bobd91:default-language into e1ebf43 on hexojs:master.

@ivan-nginx
Copy link
Copy Markdown

Thank's. Looks better. 👍

@JLHwung JLHwung merged commit f15d1ce into hexojs:master Apr 6, 2018
@JLHwung
Copy link
Copy Markdown
Collaborator

JLHwung commented Apr 6, 2018

Will land in next patch release. Thanks.

ivan-nginx added a commit to theme-next/hexo-theme-next that referenced this pull request Apr 9, 2018
After complete fix with language file selection in Hexo we can use old method with no bugs.

Issue: hexojs/hexo#3108
Fix 1: hexojs/hexo#3069
Fix 2: hexojs/hexo#3110
@curbengh curbengh mentioned this pull request Sep 28, 2019
@NoahDragon NoahDragon mentioned this pull request Sep 28, 2019
53 tasks
thom4parisot pushed a commit to thom4parisot/hexo that referenced this pull request Jan 17, 2020
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.

4 participants