github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-01-22 07:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

convert more promise chains to async await

Browse source 
Signed-off-by: Tilman Vatteroth <tilman.vatteroth@tu-dortmund.de>
This commit is contained in:
Tilman Vatteroth 2020-05-24 23:37:01 +02:00 committed by mrdrogdrog
parent 23cfcacd09
commit 8636391a73
2 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/initializers/configLoader.ts
View file

@ -3,22 +3,18 @@ import {setFrontendConfig} from "../redux/frontend-config/methods";
import {setBackendConfig} from "../redux/backend-config/methods";
import {getAndSetUser} from "../utils/apiUtils";
export function loadAllConfig() {
return getFrontendConfig()
.then((frontendConfig) => {
if (!frontendConfig) {
return Promise.reject("Frontend config empty!");
}
setFrontendConfig(frontendConfig);
return getBackendConfig()
})
.then((backendConfig) => {
if (!backendConfig) {
return Promise.reject("Backend config empty!");
}
setBackendConfig(backendConfig)
}).then(() => {
getAndSetUser();
})
}
export async function loadAllConfig() {
const frontendConfig = await getFrontendConfig();
if (!frontendConfig) {
return Promise.reject("Frontend config empty!");
}
setFrontendConfig(frontendConfig);
const backendConfig = await getBackendConfig()
if (!backendConfig) {
return Promise.reject("Backend config empty!");
}
setBackendConfig(backendConfig)
await getAndSetUser();
}

15
src/initializers/i18n.ts
View file

@ -31,18 +31,11 @@ import "moment/locale/vi";
import "moment/locale/zh-cn";
import "moment/locale/zh-tw";
export function setUpI18n() {
return i18n
// load translation using http -> see /public/locales
// learn more: https://github.com/i18next/i18next-http-backend
export async function setUpI18n() {
await i18n
.use(Backend)
// detect user language
// learn more: https://github.com/i18next/i18next-browser-languageDetector
.use(LanguageDetector)
// pass the i18n instance to react-i18next.
.use(initReactI18next)
// init i18next
// for all options read: https://www.i18next.com/overview/configuration-options
.init({
fallbackLng: 'en',
debug: true,
@ -53,9 +46,9 @@ export function setUpI18n() {
interpolation: {
escapeValue: false, // not needed for react as it escapes by default
},
}).then(() => {
moment.locale(i18n.language);
})
moment.locale(i18n.language);
}