Fix some oddities esp. with lib/misc/countries, and change all the defaults and migrations to en-GB instead of en since the locales rename

configs/template.js.example

@@ -24,7 +24,7 @@ module.exports = {
 		url: ''
 	},
 
-	language: 'en',
+	language: 'en-GB',
 
 	filters: [],
 	strictFiltering: false,
@@ -366,7 +366,7 @@ module.exports = {
 
 	//default board settings when a board is created
 	boardDefaults: {
-		language: 'en',
+		language: 'en-GB',
 		theme: 'yotsuba-b',
 		codeTheme: 'ir-black',
 		sfw: false, //safe for work board

lib/converter/timeutils.test.js

@@ -3,7 +3,7 @@ const { relativeString, relativeColor, durationString } = require('./timeutils.j
 describe('timeutils relativeString, relativeColor, durationString', () => {
 
 	const i18n = require(__dirname+'/../locale/locale.js');
-	i18n.setLocale('en');
+	i18n.setLocale('en-GB');
 
 	const relativeStringCases = [
 		{ in: { start: new Date('2022-04-07T08:00:00.000Z'), end: new Date('2022-04-07T08:00:00.000Z') }, out: 'Now'},

lib/locale/locale.js

@@ -6,8 +6,7 @@ const i18n = require('i18n')
 
 i18n.configure({
 	directory: path.join(__dirname, '/../../locales'),
-	//locales: ['en', 'pt', 'fr'],
-	defaultLocale: 'en',
+	defaultLocale: 'en-GB',
 	retryInDefaultLocale: false,
 	updateFiles: false, //holy FUCK why is that an option
 	cookie: null,

lib/misc/countries.js

@@ -26,10 +26,11 @@ i18n.getLocales()
 		}
 		/* We are basically overwriting the existing locales in countries,
 		but with translated extra codes added */
+		const splitLocale = locale.split('-')[0]; //i18n-iso-countries doesnt have variants
 		countries.registerLocale({
-			locale,
+			locale: locale.toLowerCase(), //i18n-iso-countries toLowerCases these internally... ffs
 			countries: {
-				...countries.getNames(locale, { select: 'official' }),
+				...countries.getNames(splitLocale, { select: 'official' }),
 				...localeExtraCodesMap,
 			},
 		});

migrations/1.0.0.js

@@ -12,12 +12,12 @@ module.exports = async(db, redis) => {
 	console.log('Updating db for language settings');
 	await db.collection('globalsettings').updateOne({ _id: 'globalsettings' }, {
 		'$set': {
-			'language': 'en',
+			'language': 'en-GB',
 		},
 	});
 	await db.collection('boards').updateMany({}, {
 		'$set': {
-			'settings.language': 'en',
+			'settings.language': 'en-GB',
 		},
 	});	
 	console.log('Clearing globalsettings cache');