Merge branch 'master' into phan

hueitan · web-flow · commit 793a53c2f02f · 2025-12-04T00:18:00.000+01:00
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,26 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.12"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - requirements: docs/requirements.txt
diff --git a/docs/conf.py b/docs/conf.py
@@ -20,7 +20,7 @@
 # -- Project information -----------------------------------------------------
 
 project = u'LanguageData'
-copyright = u'2020, Wikimedia Foundation'
+copyright = u'2025, Wikimedia Foundation'
 author = u'Wikimedia Foundation'
 
 # The short X.Y version
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,4 @@
-Sphinx==1.8.4
-sphinx-rtd-theme==0.4.2
-sphinxcontrib-phpdomain==0.6.3
+Sphinx>=7.0
+sphinx-rtd-theme>=1.2
+sphinxcontrib-phpdomain>=0.8.0
 doxyphp2sphinx>=1.0.1
diff --git a/src/index.js b/src/index.js
@@ -243,7 +243,7 @@ function sortByScriptGroup( languages ) {
 function sortByAutonym( a, b ) {
 	const autonymA = getAutonym( a ) || a,
 		autonymB = getAutonym( b ) || b;
-	return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1;
+	return autonymA.localeCompare( autonymB );
 }
 
 /**
diff --git a/tests/js/index.js b/tests/js/index.js
@@ -153,7 +153,7 @@ describe( 'languagedata', () => {
 		const languagesAM = [ 'atj', 'chr', 'chy', 'cr', 'en', 'es', 'fr', 'gn', 'haw', 'ike-cans', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'yi' ];
 		assert.deepEqual(
 			languageData.sortByScriptGroup( languagesAM.sort( languageData.sortByAutonym ) ),
-			[ 'atj', 'gn', 'en', 'es', 'fr', 'haw', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'chy', 'yi', 'ike-cans', 'cr', 'chr' ],
+			[ 'atj', 'gn', 'en', 'es', 'fr', 'haw', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'chy', 'yi', 'chr', 'ike-cans', 'cr' ],
 			'languages in region AM are ordered correctly by script group'
 		);
 

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ function sortByScriptGroup( languages ) {`
`243`	`243`	`function sortByAutonym( a, b ) {`
`244`	`244`	`const autonymA = getAutonym( a ) \|\| a,`
`245`	`245`	`autonymB = getAutonym( b ) \|\| b;`
`246`		`- return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1;`
	`246`	`+ return autonymA.localeCompare( autonymB );`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`/**`