Merge pull request #148 from 1enify/main

Fixed some hard coded strings, fixed the be-xo location file

Author: SupertigerDev

src/locales/list/be-xo.json

@@ -34,15 +34,33 @@
     "loginButton": "Login"
   },
   "registerPage": {
+    "header": "Register",
+    "notices": {
+      "title": "Notices",
+      "toxic": "Don't be toxic.",
+      "nsfw": "No NSFW content.",
+      "age": "You must be over the age of 14."
+    },
     "title": "Welcome to {{appName}}",
     "email": "Email",
     "username": "Username",
     "password": "Password",
     "confirmPassword": "Confirm Password",
+    "agreement": "By creating an account, you agree to the Terms And Conditions and the Privacy Policy.",
     "registerButton": "Register",
     "registering": "Registering...",
     "loginInstead": "Login Instead"
   },
+  "resetPassword": {
+    "title": "Reset Password",
+    "resetSuccessful": "Password reset successful.",
+    "passwordsDoNotMatch": "Confirm password does not match.",
+    "resetPasswordButton": "Reset Password",
+    "resetting": "Resetting...",
+    "email": "Email",
+    "sendEmailButton": "Send Email",
+    "sending": "Sending Email..."
+  },
   "dashboard": {
     "title": "Dashboard",
     "activeUsers": "Active Users",
@@ -439,5 +457,16 @@
     "attachments": "Attachments",
     "attachmentsBack": "Back",
     "members": "Members"
+  },
+  "botInvite": {
+    "serverSelect": "Please select a server!",
+    "creator": "Created by ",
+    "selectButton": "Select Server",
+    "addButton": "Add bot",
+    "permissions": "Bot Permissions"
+  },
+  "googleAccountLink": {
+    "linking": "Linking your account with Google...",
+    "success": "Account linked! You may now close this window."
   }
 }

src/locales/list/en-gb.json

@@ -7,6 +7,7 @@ import { Show, createSignal, onMount } from "solid-js";
 import { linkAccountWithGoogle } from "@/chat-api/services/UserService";
 import Text from "@/components/ui/Text";
 import { getOrCreateUploadsFolder } from "@/common/driveAPI";
+import { useTransContext } from "@mbarzda/solid-i18next";
 
 const PageContainer = styled("div")`
   display: flex;
@@ -36,6 +37,7 @@ const CenterContainer = styled(FlexColumn)`
 `;
 
 export default function GoogleRedirectLinkAccountPage() {
+  const [t] = useTransContext();
   const [searchParams] = useSearchParams<{ state: string; code: string }>();
   const [error, setError] = createSignal("");
   const [success, setSuccess] = createSignal(false);
@@ -59,13 +61,13 @@ export default function GoogleRedirectLinkAccountPage() {
       <PageHeader hideAccountInfo />
       <Content class="content">
         <CenterContainer>
-          Linking your account with Google...
+          {t("googleAccountLink.linking")}
           <Show when={error()}>
             <Text color="var(--alert-color)">{error()}</Text>
           </Show>
           <Show when={success()}>
             <Text color="var(--success-color)">
-              Account linked! You may close this window now.
+              {t("googleAccountLink.success")}
             </Text>
           </Show>
         </CenterContainer>

src/pages/GoogleRedirectLinkAccountPage.tsx

@@ -70,7 +70,7 @@ export default function InviteServerBotPage() {
 
   const addBot = async () => {
     if (!serverId()) {
-      alert("Please select a server!");
+      alert(t("botInvite.serverSelect"));
       return;
     }
     inviteBot(serverId()!, params.appId, permissions()!);
@@ -95,7 +95,7 @@ export default function InviteServerBotPage() {
               <Text size={18}>{bot()?.username}</Text>
             </FlexColumn>
             <FlexRow itemsCenter gap={8}>
-              <Text>Creator </Text>
+              <Text>{t("botInvite.creator")}</Text>
               <Avatar
                 animate
                 user={bot()!.application.creatorAccount.user}
@@ -110,7 +110,7 @@ export default function InviteServerBotPage() {
 
             <DropDown
               onChange={(item) => setServerId(item.id)}
-              title="Select Server"
+              title={t("botInvite.selectButton")}
               class={css`
                 width: 240px;
               `}
@@ -120,7 +120,7 @@ export default function InviteServerBotPage() {
               }))}
             />
             <Button
-              label="Add Bot"
+              label={t("botInvite.addButton")}
               styles={{ opacity: serverId() ? 1 : 0.5 }}
               iconName="add"
               primary
@@ -159,7 +159,7 @@ const PermissionList = (props: {
         width: 230px;
       `}
     >
-      <Text opacity={0.8}>Bot Permissions</Text>
+      <Text opacity={0.8}>{t("botInvite.permissions")}</Text>
       <FlexColumn gap={4}>
         <For each={permissionsList}>
           {(permission) => (

src/pages/InviteServerBot.tsx

@@ -86,7 +86,7 @@ export default function LoginPage() {
 
   return (
     <LoginPageContainer class="login-page-container">
-      <MetaTitle>Login</MetaTitle>
+      <MetaTitle>{t("loginPage.login")}</MetaTitle>
       <PageHeader />
       <Content>
         <Container class="container">
@@ -125,7 +125,7 @@ export default function LoginPage() {
             />
           </form>
           <A class={linkStyle} href="/reset-password">
-            Reset Password
+            {t("resetPassword.resetPasswordButton")}
           </A>
           <A class={linkStyle} href="/register">
             {t("loginPage.createAccountInstead")}

src/pages/LoginPage.tsx

@@ -123,14 +123,14 @@ export default function RegisterPage() {
   };
 
   const notices = [
-    "Don't be toxic.",
-    "No NSFW content.",
-    "You must be over the age of 14.",
+    t("registerPage.notices.toxic"),
+    t("registerPage.notices.nsfw"),
+    t("registerPage.notices.age"),
   ];
 
   return (
     <RegisterPageContainer class="register-page-container">
-      <MetaTitle>Register</MetaTitle>
+      <MetaTitle>{t("registerPage.header")}</MetaTitle>
       <PageHeader />
       <Content>
         <Container>
@@ -154,7 +154,7 @@ export default function RegisterPage() {
                   style={{ "font-weight": "bold" }}
                   color="var(--warn-color)"
                 >
-                  Notices
+                  {t("registerPage.notices.title")}
                 </Text>
               </span>
 
@@ -221,8 +221,7 @@ export default function RegisterPage() {
               </Text>
             </Show>
             <Text style={{ "margin-top": "10px" }} size={12} opacity={0.8}>
-              By creating an account, you are agreeing to the Terms and
-              conditions and the privacy policy.
+              {t("registerPage.agreement")}
             </Text>
             <Button
               primary

src/pages/RegisterPage.tsx

@@ -77,7 +77,7 @@ export default function ResetPasswordPage() {
 
     if (newPassword() !== confirmNewPassword()) {
       setError({
-        message: "Confirm password does not match.",
+        message: t("resetPassword.passwordsDoNotMatch"),
         path: "Confirm Password",
       });
       setRequestSent(false);
@@ -94,7 +94,7 @@ export default function ResetPasswordPage() {
     });
 
     if (res && res.token) {
-      setSuccess("Password reset successful.");
+      setSuccess(t("resetPassword.resetSuccessful"));
       setTimeout(() => {
         setStorageString(StorageKeys.USER_TOKEN, res.token);
         navigate(redirectTo);
@@ -115,16 +115,16 @@ export default function ResetPasswordPage() {
                 action="#"
                 onSubmit={resetPasswordClicked}
               >
-                <TitleContainer>Reset Password</TitleContainer>
+                <TitleContainer>{t("resetPassword.title")}</TitleContainer>
                 <Input
                   margin={[10, 0, 10, 0]}
-                  label="New Password"
+                  label={t("settings.account.newPassword")}
                   type="password"
                   onText={setNewPassword}
                 />
                 <Input
                   margin={[10, 0, 10, 0]}
-                  label="Confirm New Password"
+                  label={t("settings.account.confirmNewPassword")}
                   type="password"
                   onText={setConfirmNewPassword}
                 />
@@ -139,7 +139,7 @@ export default function ResetPasswordPage() {
                   styles={{ flex: 1 }}
                   margin={[10, 0, 0, 0]}
                   iconName="key"
-                  label={requestSent() ? "Resetting..." : "Reset Password"}
+                  label={requestSent() ? t("resetPassword.resetting") : t("resetPassword.resetPasswordButton")}
                   onClick={resetPasswordClicked}
                 />
               </form>
@@ -185,10 +185,10 @@ const SendCodePage = () => {
             action="#"
             onSubmit={resetPasswordClicked}
           >
-            <TitleContainer>Reset Password</TitleContainer>
+            <TitleContainer>{t("resetPassword.title")}</TitleContainer>
             <Input
               margin={[10, 0, 10, 0]}
-              label="Email"
+              label={t("resetPassword.email")}
               type="text"
               onText={setEmail}
             />
@@ -203,7 +203,7 @@ const SendCodePage = () => {
               styles={{ flex: 1 }}
               margin={[10, 0, 0, 0]}
               iconName="mail"
-              label={requestSent() ? "Sending Email..." : "Send Email"}
+              label={requestSent() ? t("resetPassword.sending") : t("resetPassword.sendEmailButton")}
               onClick={resetPasswordClicked}
             />
           </form>