Skip to content

Commit b393d88

Browse files
authored
refactor: s/all-langs/i18n/g (freeCodeCamp#48258)
1 parent cf24131 commit b393d88

File tree

22 files changed

+24
-28
lines changed

22 files changed

+24
-28
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ client/static/**
33
client/public/**
44
api-server/src/public/**
55
api-server/lib/**
6-
config/i18n/all-langs.js
6+
config/i18n.js
77
config/certification-settings.js
88
web/**

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ config/client/sass-compile.json
162162
config/client/frame-runner.json
163163
config/client/test-evaluator.json
164164
config/curriculum.json
165-
config/i18n/all-langs.js
165+
config/i18n.js
166166
config/certification-settings.js
167167

168168
### Generated utils files ###

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ client/static
55
curriculum/challenges/_meta/*/*
66
curriculum/challenges/**/*
77
config/**/*.json
8-
config/i18n/all-langs.js
8+
config/i18n.js
99
config/certification-settings.js
1010
docs/i18n
1111
utils/block-nameify.js

api-server/src/server/component-passport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { PassportConfigurator } from '@freecodecamp/loopback-component-passport'
22
import dedent from 'dedent';
33
import passport from 'passport';
44

5-
import { availableLangs } from '../../../config/i18n/all-langs';
5+
import { availableLangs } from '../../../config/i18n';
66
import { jwtSecret } from '../../../config/secrets';
77
import passportProviders from './passport-providers';
88
import { setAccessTokenToResponse } from './utils/getSetAccessToken';

api-server/src/server/utils/redirection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { allowedOrigins } = require('../../../../config/cors-settings');
33
// homeLocation is being used as a fallback here. If the one provided by the
44
// client is invalid we default to this.
55
const { homeLocation } = require('../../../../config/env.json');
6-
const { availableLangs } = require('../../../../config/i18n/all-langs');
6+
const { availableLangs } = require('../../../../config/i18n');
77

88
function getReturnTo(encryptedParams, secret, _homeLocation = homeLocation) {
99
let params;

client/i18n/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import i18n from 'i18next';
44
import { initReactI18next } from 'react-i18next';
55

66
const envData = require('../../config/env.json');
7-
const { i18nextCodes } = require('../../config/i18n/all-langs');
7+
const { i18nextCodes } = require('../../config/i18n');
88

99
const { clientLocale } = envData;
1010

client/i18n/locales.test.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import fs from 'fs';
22
import { setup } from 'jest-json-schema-extended';
3-
import {
4-
availableLangs,
5-
LangNames,
6-
LangCodes
7-
} from '../../config/i18n/all-langs';
3+
import { availableLangs, LangNames, LangCodes } from '../../config/i18n';
84

95
setup();
106

client/i18n/schema-validation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from 'path';
22
import { readFile } from 'fs/promises';
3-
import { availableLangs } from '../../config/i18n/all-langs';
3+
import { availableLangs } from '../../config/i18n';
44
import introSchema from './locales/english/intro.json';
55
import linksSchema from './locales/english/links.json';
66
import metaTagsSchema from './locales/english/meta-tags.json';

client/src/client-only-routes/show-certification.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { bindActionCreators, Dispatch } from 'redux';
77
import { createSelector } from 'reselect';
88

99
import envData from '../../../config/env.json';
10-
import { getLangCode } from '../../../config/i18n/all-langs';
10+
import { getLangCode } from '../../../config/i18n';
1111
import FreeCodeCampLogo from '../assets/icons/FreeCodeCamp-logo';
1212
import DonateForm from '../components/Donation/donate-form';
1313

client/src/components/Header/components/nav-links.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
LangNames,
1818
LangCodes,
1919
hiddenLangs
20-
} from '../../../../../config/i18n/all-langs';
20+
} from '../../../../../config/i18n';
2121
import { hardGoTo as navigate } from '../../../redux/actions';
2222
import { updateMyTheme } from '../../../redux/settings/actions';
2323
import createLanguageRedirect from '../../create-language-redirect';

client/src/components/app-mount-notifier.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from 'react';
33
import { I18nextProvider } from 'react-i18next';
44
import { Provider } from 'react-redux';
55

6-
import { i18nextCodes } from '../../../config/i18n/all-langs';
6+
import { i18nextCodes } from '../../../config/i18n';
77
import i18nTestConfig from '../../i18n/config-for-tests';
88
import { createStore } from '../redux/createStore';
99
import AppMountNotifier from './app-mount-notifier';

client/src/components/profile/components/camper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import React from 'react';
99
import { TFunction, useTranslation } from 'react-i18next';
1010

1111
import envData from '../../../../../config/env.json';
12-
import { getLangCode } from '../../../../../config/i18n/all-langs';
12+
import { getLangCode } from '../../../../../config/i18n';
1313
import { AvatarRenderer } from '../../helpers';
1414
import Link from '../../helpers/link';
1515
import SocialIcons from './social-icons';

client/src/components/profile/components/heat-map.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import './heatmap.css';
1616
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
1717
// @ts-ignore
1818
import envData from '../../../../../config/env.json';
19-
import { getLangCode } from '../../../../../config/i18n/all-langs';
19+
import { getLangCode } from '../../../../../config/i18n';
2020
import { User } from '../../../redux/prop-types';
2121
import FullWidthRow from '../../helpers/full-width-row';
2222
import Spacer from '../../helpers/spacer';

client/src/components/profile/components/time-line.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { TFunction, withTranslation } from 'react-i18next';
77
import { connect } from 'react-redux';
88

99
import envData from '../../../../../config/env.json';
10-
import { getLangCode } from '../../../../../config/i18n/all-langs';
10+
import { getLangCode } from '../../../../../config/i18n';
1111
import {
1212
getCertIds,
1313
getPathFromID,

config/i18n/all-langs.ts renamed to config/i18n.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------
2-
import { SuperBlocks } from '../certification-settings';
2+
import { SuperBlocks } from './certification-settings';
33
/*
44
* List of languages with localizations enabled for builds.
55
*

curriculum/getChallenges.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const readDirP = require('readdirp');
88
const { helpCategoryMap } = require('../client/utils/challenge-types');
99
const { showUpcomingChanges } = require('../config/env.json');
1010
const { curriculum: curriculumLangs } =
11-
require('../config/i18n/all-langs').availableLangs;
11+
require('../config/i18n').availableLangs;
1212
const { parseMD } = require('../tools/challenge-parser/parser');
1313
/* eslint-disable max-len */
1414
const {

curriculum/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require('dotenv').config({ path: path.resolve(__dirname, '../.env') });
44
const {
55
availableLangs,
66
languagesWithAuditedBetaReleases
7-
} = require('../config/i18n/all-langs');
7+
} = require('../config/i18n');
88
const curriculumLangs = availableLangs.curriculum;
99

1010
exports.testedLang = function testedLang() {

curriculum/utils.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import fs from 'fs';
55
import path from 'path';
66
import { config } from 'dotenv';
77
import { SuperBlocks } from '../config/certification-settings';
8-
import { languagesWithAuditedBetaReleases } from '../config/i18n/all-langs';
8+
import { languagesWithAuditedBetaReleases } from '../config/i18n';
99
import { getSuperOrder, getSuperBlockFromDir } from './utils';
1010

1111
config({ path: path.resolve(__dirname, '../.env') });

cypress/e2e/default/learn/header/universal-navigation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
availableLangs,
33
hiddenLangs,
44
LangNames
5-
} from '../../../../../config/i18n/all-langs';
5+
} from '../../../../../config/i18n';
66
import envData from '../../../../../config/env.json';
77

88
const { clientLocale } = envData;

tools/challenge-auditor/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { config } from 'dotenv';
77
const envPath = resolve(__dirname, '../../.env');
88
config({ path: envPath });
99

10-
import { availableLangs, auditedCerts } from '../../config/i18n/all-langs';
10+
import { availableLangs, auditedCerts } from '../../config/i18n';
1111
import { getChallengesForLang } from '../../curriculum/getChallenges';
1212
import { SuperBlocks } from '../../config/certification-settings';
1313
import { ChallengeNode } from '../../client/src/redux/prop-types';

tools/scripts/build/ensure-env.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { spawn } from 'child_process';
22
import * as fs from 'fs';
33
import * as path from 'path';
44

5-
import { availableLangs } from '../../../config/i18n/all-langs';
5+
import { availableLangs } from '../../../config/i18n';
66
import env from '../../../config/read-env';
77

88
const globalConfigPath = path.resolve(__dirname, '../../../config');
@@ -14,7 +14,7 @@ function checkClientLocale() {
1414
if (!availableLangs.client.includes(process.env.CLIENT_LOCALE)) {
1515
throw Error(`
1616
17-
CLIENT_LOCALE, ${process.env.CLIENT_LOCALE}, is not an available language in config/i18n/all-langs.ts
17+
CLIENT_LOCALE, ${process.env.CLIENT_LOCALE}, is not an available language in config/i18n.ts
1818
1919
`);
2020
}
@@ -26,7 +26,7 @@ function checkCurriculumLocale() {
2626
if (!availableLangs.curriculum.includes(process.env.CURRICULUM_LOCALE)) {
2727
throw Error(`
2828
29-
CURRICULUM_LOCALE, ${process.env.CURRICULUM_LOCALE}, is not an available language in config/i18n/all-langs.ts
29+
CURRICULUM_LOCALE, ${process.env.CURRICULUM_LOCALE}, is not an available language in config/i18n.ts
3030
3131
`);
3232
}

utils/is-audited.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// translated, but when they are they can be included by adding 'certificates'
1010
// to the arrays below
1111

12-
const { auditedCerts } = require('../config/i18n/all-langs');
12+
const { auditedCerts } = require('../config/i18n');
1313

1414
function isAuditedCert(lang, cert) {
1515
if (!lang || !cert)

0 commit comments

Comments
 (0)