Update displaySettings.template.html

[WWWesten]

Synchronize language names list with jelliyfin core and language codes in list with language resource file names. Native names of the languages, exposed the language codes, order by the language codes.

Changes

Issues

[WWWesten]

Related to jellyfin/jellyfin#6839

[WWWesten]

@dmitrylyzo Can You, if you take a moment, review the PR? Thanks.

[dmitrylyzo]

@WWWesten Do you mind if I rebase your master branch after we are done?
Again, please create a separate branch next time: that way you don't have to constantly merge the upstream master, unless there is a conflict.

[WWWesten]

I rebase your master branch
I'm afraid I don't understand what that means. I don't have much experience with Github.

create a separate branch
I can't do it. I don't see any button to imply this.

[dmitrylyzo]

I'm afraid I don't understand what that means. I don't have much experience with Github.

I will do it via git CLI. But then you will have to reset HEAD of your working directory (cloned repo).
Or do you work directly on GitHub?

I can't do it. I don't see any button to imply this.

If you're not using git CLI or other tools, I see it this way:

1. Fetch upstream being on your master. master should be just fast-forwarded - no merge commits
2. Click Switch branch and type the name of the new branch.
   
3. You are on the new branch (switch it if you are not).
   

[dmitrylyzo]

I have rebased your master - now history is cleaner.

[dmitrylyzo]

What happened? It was merged again 😕

[WWWesten]

I have Github Desktop 2.9.4. (x64) installed and I do not see what you have in the picture.

[WWWesten]

What happened? It was merged again 😕
What You mean?

[dmitrylyzo]

I have Github Desktop 2.9.4. (x64) installed and I do not see what you have in the picture.

Oh, I believe that is in the Current branch dropdown.

What You mean?

I think this how Github Desktop pulled force pushed master.
How did you move your master after thornbill rebased your previous PR?

[WWWesten]

Hi @thornbill, can You take a look and merge PR? Thanks.

[thornbill]

I would prefer that all the merge commits were not included in this. I'm not sure how you are updating the branch, but it's typically not necessary unless there is a conflict with the base branch. Even then it would be "cleaner" to rebase and force push instead.

I will try to get it cleaned up and merged soon.

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information