tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify lang System

Browse Source
This commit is contained in:
tobid7 2023-05-28 22:30:39 +02:00
parent 476bd93aa7
commit 5695110739
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/renderd7/lang.hpp
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <renderd7/external/json.hpp> // clang-format off
#include <string> #include <string>
#include <renderd7/external/json.hpp>
// clang-format on
namespace RenderD7 { namespace RenderD7 {
namespace Lang { namespace Lang {

7
source/lang.cpp
View File

@ -3,6 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
static nlohmann::json appJson; static nlohmann::json appJson;
std::string RenderD7::Lang::getSys() { std::string RenderD7::Lang::getSys() {
@ -68,7 +69,7 @@ std::string RenderD7::Lang::get(const std::string &key) {
if (!appJson.contains(key)) if (!appJson.contains(key))
return key; return key;
return appJson.at(key).get_ref<const std::string &>(); return appJson.at(key).get<std::string>();
} }
void RenderD7::Lang::load(const std::string &lang) { void RenderD7::Lang::load(const std::string &lang) {
@ -77,7 +78,7 @@ void RenderD7::Lang::load(const std::string &lang) {
if (access(("romfs:/lang/" + lang + "/app.json").c_str(), F_OK) == 0) { if (access(("romfs:/lang/" + lang + "/app.json").c_str(), F_OK) == 0) {
values = fopen(("romfs:/lang/" + lang + "/app.json").c_str(), "rt"); values = fopen(("romfs:/lang/" + lang + "/app.json").c_str(), "rt");
if (values) { if (values) {
appJson = nlohmann::json::parse(values, nullptr, false); appJson = nlohmann::json::parse(values);
fclose(values); fclose(values);
} }
if (appJson.is_discarded()) if (appJson.is_discarded())
@ -87,7 +88,7 @@ void RenderD7::Lang::load(const std::string &lang) {
} else { } else {
values = fopen("romfs:/lang/en/app.json", "rt"); values = fopen("romfs:/lang/en/app.json", "rt");
if (values) { if (values) {
appJson = nlohmann::json::parse(values, nullptr, false); appJson = nlohmann::json::parse(values);
fclose(values); fclose(values);
} }
if (appJson.is_discarded()) if (appJson.is_discarded())