Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fixing untranslated FR strings #20078

Merged
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f8d1688
fix : Fixing the untranslated strings
aehanno May 16, 2022
20cb2ce
remove some change that will be in an other PR
aehanno May 16, 2022
93151b0
fix : missing tranaltion string
aehanno Jul 13, 2022
69ba230
fix : correction fail import
aehanno Jul 13, 2022
3fc46f1
fix : correction translation
aehanno Jul 14, 2022
83abb1b
fix : correction translation
aehanno Jul 14, 2022
325a7d9
fix : correction translation
aehanno Jul 14, 2022
472c36d
fix
aehanno Jul 22, 2022
f7ef429
Merge branch 'master' into fixing-untranslated-string
aehanno Oct 3, 2022
eea57c0
fix
aehanno Oct 3, 2022
1a0585f
Merge branch 'master' into fixing-untranslated-string
aehanno Oct 5, 2022
b9da4ec
fix: Correction after review
aehanno Oct 5, 2022
e46d5cd
Merge branch 'master' into fixing-untranslated-string
aehanno Jan 25, 2023
961b6c2
Add translation metric pivotTableChart
aehanno Jan 25, 2023
a661ca3
Add translation metric pivotTableChart
aehanno Jan 30, 2023
304e7e9
update translation from pot file
aehanno Jan 30, 2023
433fce3
update translation from pot file
aehanno Jan 30, 2023
df384cc
Merge branch 'master' into fixing-untranslated-string
aehanno Jan 30, 2023
c8771f9
launch prettier on translation file
aehanno Jan 30, 2023
6c17745
launch prettier on translation file
aehanno Jan 30, 2023
1fa4516
remove wrong change
aehanno Feb 1, 2023
d6cc47f
resolve conflict merge
aehanno Feb 1, 2023
f593843
wrong end file
aehanno Feb 1, 2023
ab570e5
Merge branch 'master' into fixing-untranslated-string
aehanno Feb 8, 2023
9334b53
clean translation file
aehanno Feb 9, 2023
cfeaac0
Merge remote-tracking branch 'origin/fixing-untranslated-string' into…
aehanno Feb 9, 2023
b708b37
ajout trad
aehanno Feb 22, 2023
eb5254e
Merge remote-tracking branch 'origin/master' into fixing-untranslated…
aehanno Feb 22, 2023
9d3e6a4
ajout trad
aehanno Feb 23, 2023
baaf38e
ajout trad
aehanno Feb 23, 2023
2954b40
ajout trad
aehanno Feb 23, 2023
d3ced7d
ajout trad
aehanno Feb 23, 2023
b1abb71
ajout trad
aehanno Feb 23, 2023
69823c1
ajout trad
aehanno Feb 23, 2023
6fb8377
test correction erreur build front
aehanno Feb 23, 2023
76d148d
test correction erreur build front
aehanno Feb 23, 2023
662f9e3
test correction erreur build front
aehanno Feb 23, 2023
43eb2c9
test correction erreur build front
aehanno Feb 24, 2023
bb398eb
Merge remote-tracking branch 'origin/master' into fixing-untranslated…
aehanno Jun 29, 2023
2e70a17
Resolve conflicts after merge
aehanno Jun 29, 2023
fed6c03
json file generation from po file
aehanno Aug 1, 2023
bf7c5ff
delete translation on variable
aehanno Aug 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import { t } from '@superset-ui/core';
import { PivotData, flatKey } from './utilities';
import { Styles } from './Styles';

Expand Down Expand Up @@ -47,7 +48,7 @@ function displayHeaderCell(
>
{ArrowIcon}
</span>
<span className="toggle-val">{parseLabel(name)}</span>
<span className="toggle-val">{t(parseLabel(name))}</span>
aehanno marked this conversation as resolved.
Show resolved Hide resolved
</span>
) : (
parseLabel(name)
Expand Down Expand Up @@ -462,7 +463,7 @@ export class TableRenderer extends React.Component {
true,
)}
>
Subtotal
{t(`Subtotal`)}
aehanno marked this conversation as resolved.
Show resolved Hide resolved
</th>,
);
}
Expand Down Expand Up @@ -658,7 +659,7 @@ export class TableRenderer extends React.Component {
true,
)}
>
Subtotal
{t(`Subtotal`)}
aehanno marked this conversation as resolved.
Show resolved Hide resolved
</th>
) : null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ export default function TableChart<D extends DataRecord = DataRecord>(
},
Header: ({ column: col, onClick, style, onDragStart, onDrop }) => (
<th
title="Shift + Click to sort by multiple columns"
title={t("Shift + Click to sort by multiple columns")}
aehanno marked this conversation as resolved.
Show resolved Hide resolved
className={[className, col.isSorted ? 'is-sorted' : ''].join(' ')}
style={{
...sharedStyle,
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/views/CRUD/welcome/Welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ function Welcome({ user, addDangerToast }: WelcomeProps) {
{(!WelcomeTopExtension || !WelcomeMainExtension) && (
<>
<WelcomeNav>
<h1 className="welcome-header">Home</h1>
<h1 className="welcome-header">{t('Home')}</h1>
{isFeatureEnabled(FeatureFlag.THUMBNAILS) ? (
<div className="switch">
<AntdSwitch checked={checked} onChange={handleToggle} />
Expand Down
8 changes: 7 additions & 1 deletion superset/translations/fr/LC_MESSAGES/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3877,7 +3877,13 @@
],
"Scope": ["Périmètre"],
"Dependent on": ["Dépend de"],
"No matching records found": ["Aucun résultat trouvé"]
"No matching records found": ["Aucun résultat trouvé"],
"Trend": ["Tendance"],
"Subtotal": ["Sous-Total"],
"Shift + Click to sort by multiple columns": [
"Maintenir Shift + Clic pour trier plusieurs colonnes"
],
"metrics": ["métrique"]
}
}
}