From 56951107392caffc938ad3fb40a93593f231818b Mon Sep 17 00:00:00 2001
From: Tobi <tobid7@outlook.de>
Date: Sun, 28 May 2023 22:30:39 +0200
Subject: [PATCH] Simplify lang System

---
 include/renderd7/lang.hpp | 4 +++-
 source/lang.cpp           | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/renderd7/lang.hpp b/include/renderd7/lang.hpp
index 39ada2b..7c3bd29 100644
--- a/include/renderd7/lang.hpp
+++ b/include/renderd7/lang.hpp
@@ -1,6 +1,8 @@
 #pragma once
-#include <renderd7/external/json.hpp>
+// clang-format off
 #include <string>
+#include <renderd7/external/json.hpp>
+// clang-format on
 
 namespace RenderD7 {
 namespace Lang {
diff --git a/source/lang.cpp b/source/lang.cpp
index 26ec5ba..5e63f87 100644
--- a/source/lang.cpp
+++ b/source/lang.cpp
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+
 static nlohmann::json appJson;
 
 std::string RenderD7::Lang::getSys() {
@@ -68,7 +69,7 @@ std::string RenderD7::Lang::get(const std::string &key) {
   if (!appJson.contains(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) {
@@ -77,7 +78,7 @@ void RenderD7::Lang::load(const std::string &lang) {
   if (access(("romfs:/lang/" + lang + "/app.json").c_str(), F_OK) == 0) {
     values = fopen(("romfs:/lang/" + lang + "/app.json").c_str(), "rt");
     if (values) {
-      appJson = nlohmann::json::parse(values, nullptr, false);
+      appJson = nlohmann::json::parse(values);
       fclose(values);
     }
     if (appJson.is_discarded())
@@ -87,7 +88,7 @@ void RenderD7::Lang::load(const std::string &lang) {
   } else {
     values = fopen("romfs:/lang/en/app.json", "rt");
     if (values) {
-      appJson = nlohmann::json::parse(values, nullptr, false);
+      appJson = nlohmann::json::parse(values);
       fclose(values);
     }
     if (appJson.is_discarded())