Skip to content

Commit 423e814

Browse files
authored
Merge pull request #169 from glific/auto_translate
Show default language label instead of generic “Default"
2 parents 2356e90 + f3b3cc7 commit 423e814

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@glific/flow-editor",
33
"license": "AGPL-3.0",
44
"repository": "git://github.com/glific/floweditor.git",
5-
"version": "1.43.0-1",
5+
"version": "1.43.0-2",
66
"description": "'Standalone flow editing tool designed for use within the Glific suite of messaging tools'",
77
"browser": "umd/flow-editor.min.js",
88
"unpkg": "umd/flow-editor.min.js",

src/components/languageselector/LanguageSelector.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
text-decoration: none;
3838
color: $gray;
3939
cursor: default;
40+
font-weight: 500;
4041
}
4142
}
4243

src/components/languageselector/LanguageSelector.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export class LanguageSelector extends React.Component<LanguageSelectorProps> {
5252

5353
const languages = Object.keys(this.props.languages.items)
5454
.map((iso: string) => this.props.languages.items[iso])
55+
.filter((lang: Asset) => !lang.content?.default)
5556
.sort(this.handleLanguageSort);
5657

5758
if (languages.length === 1) {
@@ -101,7 +102,4 @@ const mapDispatchToProps = (dispatch: DispatchWithState) =>
101102
dispatch
102103
);
103104

104-
export default connect(
105-
mapStateToProps,
106-
mapDispatchToProps
107-
)(LanguageSelector);
105+
export default connect(mapStateToProps, mapDispatchToProps)(LanguageSelector);

src/store/thunks.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,18 @@ export const loadFlowDefinition = (details: FlowDetails, assetStore: AssetStore)
371371
language = assetStore.languages.items[definition.language];
372372
}
373373

374+
const defaultLanguage = Object.values(assetStore.languages.items).find(
375+
(lang: any) => lang.content.default
376+
);
377+
374378
if (!language) {
375-
language = DEFAULT_LANGUAGE;
376-
dispatch(mergeEditorState({ language: DEFAULT_LANGUAGE }));
377-
mergeAssetMaps(assetStore.languages.items, { base: DEFAULT_LANGUAGE });
379+
const defaultTab = {
380+
...DEFAULT_LANGUAGE,
381+
name: defaultLanguage ? `Default (${defaultLanguage.name})` : DEFAULT_LANGUAGE.name
382+
};
383+
language = defaultTab;
384+
dispatch(mergeEditorState({ language: defaultTab }));
385+
mergeAssetMaps(assetStore.languages.items, { base: defaultTab });
378386
}
379387

380388
if (details.issues) {

0 commit comments

Comments
 (0)