opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-03-25 21:23:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Stephen Zhou 2025-12-30 11:56:11 +08:00
parent a6b94f11e5
commit 03938be789
No known key found for this signature in database
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
View File

@ -95,20 +95,21 @@ const QuotaPanel: FC<QuotaPanelProps> = ({
return (
<div className={cn('my-2 min-w-[72px] shrink-0 rounded-xl border-[0.5px] pb-2.5 pl-4 pr-2.5 pt-3 shadow-xs', credits <= 0 ? 'border-state-destructive-border hover:bg-state-destructive-hover' : 'border-components-panel-border bg-third-party-model-bg-default')}>
<div className="system-xs-medium-uppercase mb-2 flex h-4 items-center text-text-tertiary">
{t('common.modelProvider.quota')}
<Tooltip popupContent={t('common.modelProvider.card.tip')} />
{t('modelProvider.quota', { ns: 'common' })}
<Tooltip popupContent={t('modelProvider.card.tip', { ns: 'common' })} />
</div>
<div className="flex items-center justify-between">
<div className="flex items-center gap-1 text-xs text-text-tertiary">
<span className="system-md-semibold-uppercase mr-0.5 text-text-secondary">{formatNumber(credits)}</span>
<span>{t('common.modelProvider.credits')}</span>
<span>{t('modelProvider.credits', { ns: 'common' })}</span>
{currentWorkspace.next_credit_reset_date
? (
<>
<span>·</span>
<span>
{t('common.modelProvider.resetDate', {
date: formatTime(currentWorkspace.next_credit_reset_date, t('appLog.dateFormat') as string),
{t('modelProvider.resetDate', {
ns: 'common',
date: formatTime(currentWorkspace.next_credit_reset_date, t('dateFormat', { ns: 'appLog' })),
interpolation: { escapeValue: false },
})}
</span>
@ -122,15 +123,15 @@ const QuotaPanel: FC<QuotaPanelProps> = ({
const usingQuota = providerType === PreferredProviderTypeEnum.system
const getTooltipKey = () => {
if (usingQuota)
return 'common.modelProvider.card.modelSupported'
return 'modelProvider.card.modelSupported'
if (providerType === PreferredProviderTypeEnum.custom)
return 'common.modelProvider.card.modelAPI'
return 'common.modelProvider.card.modelNotSupported'
return 'modelProvider.card.modelAPI'
return 'modelProvider.card.modelNotSupported'
}
return (
<Tooltip
key={key}
popupContent={t(getTooltipKey(), { modelName: modelNameMap[key] })}
popupContent={t(getTooltipKey(), { ns: 'common', modelName: modelNameMap[key] })}
>
<div
className={cn('relative h-6 w-6', !providerType && 'cursor-pointer hover:opacity-80')}

2
web/i18n/en-US/billing.json
View File

@ -96,7 +96,7 @@
"plansCommon.memberAfter": "Member",
"plansCommon.messageRequest.title": "{{count,number}} message credits",
"plansCommon.messageRequest.titlePerMonth": "{{count,number}} message credits/month",
"plansCommon.messageRequest.tooltip": "Message credits are provided to help you easily try out different OpenAI models in Dify. Credits are consumed based on the model type. Once they’re used up, you can switch to your own OpenAI API key.",
"plansCommon.messageRequest.tooltip": "Message credits are provided to help you easily try out different models from OpenAI, Anthropic, Gemini, xAI, DeepSeek and Tongyi in Dify. Credits are consumed based on the model type. Once they're used up, you can switch to your own API key.",
"plansCommon.modelProviders": "Support OpenAI/Anthropic/Llama2/Azure OpenAI/Hugging Face/Replicate",
"plansCommon.month": "month",
"plansCommon.mostPopular": "Popular",

6
web/i18n/en-US/common.json
View File

@ -339,13 +339,16 @@
"modelProvider.callTimes": "Call times",
"modelProvider.card.buyQuota": "Buy Quota",
"modelProvider.card.callTimes": "Call times",
"modelProvider.card.modelAPI": "{{modelName}} models are using the API Key.",
"modelProvider.card.modelNotSupported": "{{modelName}} models are not installed.",
"modelProvider.card.modelSupported": "{{modelName}} models are using this quota.",
"modelProvider.card.onTrial": "On Trial",
"modelProvider.card.paid": "Paid",
"modelProvider.card.priorityUse": "Priority use",
"modelProvider.card.quota": "QUOTA",
"modelProvider.card.quotaExhausted": "Quota exhausted",
"modelProvider.card.removeKey": "Remove API Key",
"modelProvider.card.tip": "Priority will be given to the paid quota. The Trial quota will be used after the paid quota is exhausted.",
"modelProvider.card.tip": "Message Credits supports models from OpenAI, Anthropic, Gemini, xAI, DeepSeek and Tongyi. Priority will be given to the paid quota. The free quota will be used after the paid quota is exhausted.",
"modelProvider.card.tokens": "Tokens",
"modelProvider.collapse": "Collapse",
"modelProvider.config": "Config",
@ -394,6 +397,7 @@
"modelProvider.quotaTip": "Remaining available free tokens",
"modelProvider.rerankModel.key": "Rerank Model",
"modelProvider.rerankModel.tip": "Rerank model will reorder the candidate document list based on the semantic match with user query, improving the results of semantic ranking",
"modelProvider.resetDate": "Reset on {{date}}",
"modelProvider.searchModel": "Search model",
"modelProvider.selectModel": "Select your model",
"modelProvider.selector.emptySetting": "Please go to settings to configure",