diff --git a/api/server/routes/endpoints.js b/api/server/routes/endpoints.js
index 9d679528d..b6016244c 100644
--- a/api/server/routes/endpoints.js
+++ b/api/server/routes/endpoints.js
@@ -113,7 +113,6 @@ router.get('/', async function (req, res) {
key = require('../../data/auth.json');
} catch (e) {
if (i === 0) {
- console.log('No \'auth.json\' file (service account key) found in /api/data/ for PaLM models');
i++;
}
}
@@ -121,7 +120,6 @@ router.get('/', async function (req, res) {
if (process.env.PALM_KEY === 'user_provided') {
palmUser = true;
if (i <= 1) {
- console.log('User will provide key for PaLM models');
i++;
}
}
diff --git a/client/src/components/Auth/Login.tsx b/client/src/components/Auth/Login.tsx
index 622f3ec8a..65a119de4 100644
--- a/client/src/components/Auth/Login.tsx
+++ b/client/src/components/Auth/Login.tsx
@@ -2,18 +2,14 @@ import React, { useEffect } from 'react';
import LoginForm from './LoginForm';
import { useAuthContext } from '~/hooks/AuthContext';
import { useNavigate } from 'react-router-dom';
-
-import { useRecoilValue } from 'recoil';
-import store from '~/store';
-import { localize } from '~/localization/Translation';
+import { useLocalize } from '~/hooks';
import { useGetStartupConfig } from 'librechat-data-provider';
import { GoogleIcon, OpenIDIcon, GithubIcon, DiscordIcon } from '~/components';
function Login() {
const { login, error, isAuthenticated } = useAuthContext();
const { data: startupConfig } = useGetStartupConfig();
-
- const lang = useRecoilValue(store.lang);
+ const localize = useLocalize();
const navigate = useNavigate();
@@ -27,23 +23,23 @@ function Login() {
- {localize(lang, 'com_auth_welcome_back')}
+ {localize('com_auth_welcome_back')}
{error && (
- {localize(lang, 'com_auth_error_login')}
+ {localize('com_auth_error_login')}
)}
{startupConfig?.registrationEnabled && (
{' '}
- {localize(lang, 'com_auth_no_account')}{' '}
+ {localize('com_auth_no_account')}{' '}
- {localize(lang, 'com_auth_sign_up')}
+ {localize('com_auth_sign_up')}
)}
@@ -64,7 +60,7 @@ function Login() {
href={`${startupConfig.serverDomain}/oauth/google`}
>
-
{localize(lang, 'com_auth_google_login')}
+
{localize('com_auth_google_login')}
>
@@ -96,7 +92,7 @@ function Login() {
href={`${startupConfig.serverDomain}/oauth/github`}
>
-
{localize(lang, 'com_auth_github_login')}
+
{localize('com_auth_github_login')}
>
@@ -110,7 +106,7 @@ function Login() {
href={`${startupConfig.serverDomain}/oauth/discord`}
>
- {localize(lang, 'com_auth_discord_login')}
+ {localize('com_auth_discord_login')}
>
diff --git a/client/src/components/Auth/LoginForm.tsx b/client/src/components/Auth/LoginForm.tsx
index c205ece32..191e3c72e 100644
--- a/client/src/components/Auth/LoginForm.tsx
+++ b/client/src/components/Auth/LoginForm.tsx
@@ -1,7 +1,5 @@
import { useForm } from 'react-hook-form';
-import { useRecoilValue } from 'recoil';
-import store from '~/store';
-import { localize } from '~/localization/Translation';
+import { useLocalize } from '~/hooks';
import { TLoginUser } from 'librechat-data-provider';
type TLoginFormProps = {
@@ -9,7 +7,7 @@ type TLoginFormProps = {
};
function LoginForm({ onSubmit }: TLoginFormProps) {
- const lang = useRecoilValue(store.lang);
+ const localize = useLocalize();
const {
register,
@@ -30,20 +28,20 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
type="text"
id="email"
autoComplete="email"
- aria-label={localize(lang, 'com_auth_email')}
+ aria-label={localize('com_auth_email')}
{...register('email', {
- required: localize(lang, 'com_auth_email_required'),
+ required: localize('com_auth_email_required'),
minLength: {
value: 3,
- message: localize(lang, 'com_auth_email_min_length'),
+ message: localize('com_auth_email_min_length'),
},
maxLength: {
value: 120,
- message: localize(lang, 'com_auth_email_max_length'),
+ message: localize('com_auth_email_max_length'),
},
pattern: {
value: /\S+@\S+\.\S+/,
- message: localize(lang, 'com_auth_email_pattern'),
+ message: localize('com_auth_email_pattern'),
},
})}
aria-invalid={!!errors.email}
@@ -54,7 +52,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
htmlFor="email"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_email_address')}
+ {localize('com_auth_email_address')}
{errors.email && (
@@ -70,16 +68,16 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
type="password"
id="password"
autoComplete="current-password"
- aria-label={localize(lang, 'com_auth_password')}
+ aria-label={localize('com_auth_password')}
{...register('password', {
- required: localize(lang, 'com_auth_password_required'),
+ required: localize('com_auth_password_required'),
minLength: {
value: 8,
- message: localize(lang, 'com_auth_password_min_length'),
+ message: localize('com_auth_password_min_length'),
},
maxLength: {
value: 40,
- message: localize(lang, 'com_auth_password_max_length'),
+ message: localize('com_auth_password_max_length'),
},
})}
aria-invalid={!!errors.password}
@@ -90,7 +88,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
htmlFor="password"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_password')}
+ {localize('com_auth_password')}
@@ -102,7 +100,7 @@ function LoginForm({ onSubmit }: TLoginFormProps) {
)}
- {localize(lang, 'com_auth_password_forgot')}
+ {localize('com_auth_password_forgot')}
diff --git a/client/src/components/Auth/Registration.tsx b/client/src/components/Auth/Registration.tsx
index e859bbf82..47286f163 100644
--- a/client/src/components/Auth/Registration.tsx
+++ b/client/src/components/Auth/Registration.tsx
@@ -1,9 +1,7 @@
import { useState, useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useForm } from 'react-hook-form';
-import { useRecoilValue } from 'recoil';
-import store from '~/store';
-import { localize } from '~/localization/Translation';
+import { useLocalize } from '~/hooks';
import {
useRegisterUserMutation,
TRegisterUser,
@@ -15,7 +13,7 @@ function Registration() {
const navigate = useNavigate();
const { data: startupConfig } = useGetStartupConfig();
- const lang = useRecoilValue(store.lang);
+ const localize = useLocalize();
const {
register,
@@ -56,7 +54,7 @@ function Registration() {
- {localize(lang, 'com_auth_create_account')}
+ {localize('com_auth_create_account')}
{error && (
- {localize(lang, 'com_auth_error_create')} {errorMessage}
+ {localize('com_auth_error_create')} {errorMessage}
)}
@@ -115,16 +113,16 @@ function Registration() {
- {localize(lang, 'com_auth_username')}
+ {localize('com_auth_username')}
@@ -153,20 +151,20 @@ function Registration() {
type="email"
id="email"
autoComplete="email"
- aria-label={localize(lang, 'com_auth_email')}
+ aria-label={localize('com_auth_email')}
{...register('email', {
- required: localize(lang, 'com_auth_email_required'),
+ required: localize('com_auth_email_required'),
minLength: {
value: 3,
- message: localize(lang, 'com_auth_email_min_length'),
+ message: localize('com_auth_email_min_length'),
},
maxLength: {
value: 120,
- message: localize(lang, 'com_auth_email_max_length'),
+ message: localize('com_auth_email_max_length'),
},
pattern: {
value: /\S+@\S+\.\S+/,
- message: localize(lang, 'com_auth_email_pattern'),
+ message: localize('com_auth_email_pattern'),
},
})}
aria-invalid={!!errors.email}
@@ -177,7 +175,7 @@ function Registration() {
htmlFor="email"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_email')}
+ {localize('com_auth_email')}
{errors.email && (
@@ -194,16 +192,16 @@ function Registration() {
id="password"
data-testid="password"
autoComplete="current-password"
- aria-label={localize(lang, 'com_auth_password')}
+ aria-label={localize('com_auth_password')}
{...register('password', {
- required: localize(lang, 'com_auth_password_required'),
+ required: localize('com_auth_password_required'),
minLength: {
value: 8,
- message: localize(lang, 'com_auth_password_min_length'),
+ message: localize('com_auth_password_min_length'),
},
maxLength: {
value: 128,
- message: localize(lang, 'com_auth_password_max_length'),
+ message: localize('com_auth_password_max_length'),
},
})}
aria-invalid={!!errors.password}
@@ -214,7 +212,7 @@ function Registration() {
htmlFor="password"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_password')}
+ {localize('com_auth_password')}
@@ -231,7 +229,7 @@ function Registration() {
type="password"
id="confirm_password"
data-testid="confirm_password"
- aria-label={localize(lang, 'com_auth_password_confirm')}
+ aria-label={localize('com_auth_password_confirm')}
// uncomment to block pasting in confirm field
// onPaste={(e) => {
// e.preventDefault();
@@ -239,7 +237,7 @@ function Registration() {
// }}
{...register('confirm_password', {
validate: (value) =>
- value === password || localize(lang, 'com_auth_password_not_match'),
+ value === password || localize('com_auth_password_not_match'),
})}
aria-invalid={!!errors.confirm_password}
className="peer block w-full appearance-none rounded-t-md border-0 border-b-2 border-gray-300 bg-gray-50 px-2.5 pb-2.5 pt-5 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0"
@@ -249,7 +247,7 @@ function Registration() {
htmlFor="confirm_password"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_password_confirm')}
+ {localize('com_auth_password_confirm')}
@@ -273,19 +271,19 @@ function Registration() {
aria-label="Submit registration"
className="w-full transform rounded-sm bg-green-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-green-600 focus:bg-green-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-green-500"
>
- {localize(lang, 'com_auth_continue')}
+ {localize('com_auth_continue')}
{' '}
- {localize(lang, 'com_auth_already_have_account')}{' '}
+ {localize('com_auth_already_have_account')}{' '}
- {localize(lang, 'com_auth_login')}
+ {localize('com_auth_login')}
{startupConfig?.socialLoginEnabled && (
@@ -305,7 +303,7 @@ function Registration() {
href={`${startupConfig.serverDomain}/oauth/google`}
>
- {localize(lang, 'com_auth_google_login')}
+ {localize('com_auth_google_login')}
>
@@ -337,7 +335,7 @@ function Registration() {
href={`${startupConfig.serverDomain}/oauth/github`}
>
- {localize(lang, 'com_auth_github_login')}
+ {localize('com_auth_github_login')}
>
@@ -351,7 +349,7 @@ function Registration() {
href={`${startupConfig.serverDomain}/oauth/discord`}
>
- {localize(lang, 'com_auth_discord_login')}
+ {localize('com_auth_discord_login')}
>
diff --git a/client/src/components/Auth/RequestPasswordReset.tsx b/client/src/components/Auth/RequestPasswordReset.tsx
index a46511711..4a97f2e5a 100644
--- a/client/src/components/Auth/RequestPasswordReset.tsx
+++ b/client/src/components/Auth/RequestPasswordReset.tsx
@@ -1,8 +1,6 @@
import React, { useState, useEffect } from 'react';
import { useForm } from 'react-hook-form';
-import { useRecoilValue } from 'recoil';
-import store from '~/store';
-import { localize } from '~/localization/Translation';
+import { useLocalize } from '~/hooks';
import {
useRequestPasswordResetMutation,
useGetStartupConfig,
@@ -11,7 +9,7 @@ import {
} from 'librechat-data-provider';
function RequestPasswordReset() {
- const lang = useRecoilValue(store.lang);
+ const localize = useLocalize();
const {
register,
handleSubmit,
@@ -44,22 +42,22 @@ function RequestPasswordReset() {
useEffect(() => {
if (requestPasswordReset.isSuccess) {
if (config.data?.emailEnabled) {
- setHeaderText(localize(lang, 'com_auth_reset_password_link_sent'));
- setBodyText(localize(lang, 'com_auth_reset_password_email_sent'));
+ setHeaderText(localize('com_auth_reset_password_link_sent'));
+ setBodyText(localize('com_auth_reset_password_email_sent'));
} else {
- setHeaderText(localize(lang, 'com_auth_reset_password'));
+ setHeaderText(localize('com_auth_reset_password'));
setBodyText(
- {localize(lang, 'com_auth_click')}{' '}
+ {localize('com_auth_click')}{' '}
- {localize(lang, 'com_auth_here')}
+ {localize('com_auth_here')}
{' '}
- {localize(lang, 'com_auth_to_reset_your_password')}
+ {localize('com_auth_to_reset_your_password')}
,
);
}
} else {
- setHeaderText(localize(lang, 'com_auth_reset_password'));
+ setHeaderText(localize('com_auth_reset_password'));
setBodyText(undefined);
}
}, [requestPasswordReset.isSuccess, config.data?.emailEnabled, resetLink, lang]);
@@ -73,7 +71,7 @@ function RequestPasswordReset() {
className="relative mt-4 rounded border border-red-400 bg-red-100 px-4 py-3 text-red-700"
role="alert"
>
- {localize(lang, 'com_auth_error_reset_password')}
+ {localize('com_auth_error_reset_password')}
)}
{bodyText ? (
@@ -96,20 +94,20 @@ function RequestPasswordReset() {
type="email"
id="email"
autoComplete="off"
- aria-label={localize(lang, 'com_auth_email')}
+ aria-label={localize('com_auth_email')}
{...register('email', {
- required: localize(lang, 'com_auth_email_required'),
+ required: localize('com_auth_email_required'),
minLength: {
value: 3,
- message: localize(lang, 'com_auth_email_min_length'),
+ message: localize('com_auth_email_min_length'),
},
maxLength: {
value: 120,
- message: localize(lang, 'com_auth_email_max_length'),
+ message: localize('com_auth_email_max_length'),
},
pattern: {
value: /\S+@\S+\.\S+/,
- message: localize(lang, 'com_auth_email_pattern'),
+ message: localize('com_auth_email_pattern'),
},
})}
aria-invalid={!!errors.email}
@@ -120,7 +118,7 @@ function RequestPasswordReset() {
htmlFor="email"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_email_address')}
+ {localize('com_auth_email_address')}
{errors.email && (
@@ -136,7 +134,7 @@ function RequestPasswordReset() {
disabled={!!errors.email}
className="w-full rounded-sm border border-transparent bg-green-500 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-green-600 focus:outline-none active:bg-green-500"
>
- {localize(lang, 'com_auth_continue')}
+ {localize('com_auth_continue')}
diff --git a/client/src/components/Auth/ResetPassword.tsx b/client/src/components/Auth/ResetPassword.tsx
index a8b8ba110..7e587bde4 100644
--- a/client/src/components/Auth/ResetPassword.tsx
+++ b/client/src/components/Auth/ResetPassword.tsx
@@ -4,10 +4,10 @@ import { useResetPasswordMutation, TResetPassword } from 'librechat-data-provide
import { useNavigate, useSearchParams } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import store from '~/store';
-import { localize } from '~/localization/Translation';
+import { useLocalize } from '~/hooks';
function ResetPassword() {
- const lang = useRecoilValue(store.lang);
+ const localize = useLocalize();
const {
register,
handleSubmit,
@@ -33,20 +33,20 @@ function ResetPassword() {
- {localize(lang, 'com_auth_reset_password_success')}
+ {localize('com_auth_reset_password_success')}
- {localize(lang, 'com_auth_login_with_new_password')}
+ {localize('com_auth_login_with_new_password')}
@@ -56,18 +56,18 @@ function ResetPassword() {
- {localize(lang, 'com_auth_reset_password')}
+ {localize('com_auth_reset_password')}
{resetError && (
)}
@@ -132,7 +132,7 @@ function ResetPassword() {
{
e.preventDefault();
@@ -140,7 +140,7 @@ function ResetPassword() {
}}
{...register('confirm_password', {
validate: (value) =>
- value === password || localize(lang, 'com_auth_password_not_match'),
+ value === password || localize('com_auth_password_not_match'),
})}
aria-invalid={!!errors.confirm_password}
className="peer block w-full appearance-none rounded-t-md border-0 border-b-2 border-gray-300 bg-gray-50 px-2.5 pb-2.5 pt-5 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0"
@@ -150,7 +150,7 @@ function ResetPassword() {
htmlFor="confirm_password"
className="absolute left-2.5 top-4 z-10 origin-[0] -translate-y-4 scale-75 transform text-sm text-gray-500 duration-300 peer-placeholder-shown:translate-y-0 peer-placeholder-shown:scale-100 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:text-green-500"
>
- {localize(lang, 'com_auth_password_confirm')}
+ {localize('com_auth_password_confirm')}
{errors.confirm_password && (
@@ -176,10 +176,10 @@ function ResetPassword() {
diff --git a/client/src/components/Auth/__tests__/Registration.spec.tsx b/client/src/components/Auth/__tests__/Registration.spec.tsx
index 6b66f05e4..2b86c9fa0 100644
--- a/client/src/components/Auth/__tests__/Registration.spec.tsx
+++ b/client/src/components/Auth/__tests__/Registration.spec.tsx
@@ -77,6 +77,7 @@ test('renders registration form', () => {
);
});
+// eslint-disable-next-line jest/no-commented-out-tests
// test('calls registerUser.mutate on registration', async () => {
// const mutate = jest.fn();
// const { getByTestId, getByRole, history } = setup({
diff --git a/client/src/components/Input/EndpointMenu/EndpointItem.tsx b/client/src/components/Input/EndpointMenu/EndpointItem.tsx
index c2b699540..38e822a9f 100644
--- a/client/src/components/Input/EndpointMenu/EndpointItem.tsx
+++ b/client/src/components/Input/EndpointMenu/EndpointItem.tsx
@@ -4,6 +4,7 @@ import { Settings } from 'lucide-react';
import { DropdownMenuRadioItem } from '~/components';
import { getIcon } from '~/components/Endpoints';
import { SetTokenDialog } from '../SetTokenDialog';
+import { useLocalize } from '~/hooks';
import store from '~/store';
import { cn, alternateName } from '~/utils';
@@ -29,6 +30,7 @@ export default function ModelItem({
});
const isUserProvided = endpointsConfig?.[endpoint]?.userProvide;
+ const localize = useLocalize();
// regular model
return (
@@ -62,7 +64,7 @@ export default function ModelItem({
}}
>
- Config Token
+ {localize('com_endpoint_config_token')}
) : null}
diff --git a/client/src/components/Input/EndpointMenu/EndpointMenu.jsx b/client/src/components/Input/EndpointMenu/EndpointMenu.jsx
index 85fbb1e0f..d7bbf439e 100644
--- a/client/src/components/Input/EndpointMenu/EndpointMenu.jsx
+++ b/client/src/components/Input/EndpointMenu/EndpointMenu.jsx
@@ -20,6 +20,7 @@ import {
} from '~/components/ui/';
import DialogTemplate from '~/components/ui/DialogTemplate';
import { cn, cleanupPreset, getDefaultConversation } from '~/utils';
+import { useLocalize } from '~/hooks';
import store from '~/store';
@@ -145,6 +146,8 @@ export default function NewConversationMenu() {
button: true,
});
+ const localize = useLocalize();
+
return (