Skip to content
This repository has been archived by the owner on Oct 6, 2019. It is now read-only.

Modules get duplicated when try to localize modules #1162

Merged
merged 6 commits into from
Sep 18, 2019
Merged

Modules get duplicated when try to localize modules #1162

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b5f99e
Merge pull request #2 from dnnsoftware/release/3.0.x
Jul 25, 2019
188d3c9
Merge pull request #4 from dnnsoftware/release/3.0.x
Aug 30, 2019
7246161
Merge pull request #5 from dnnsoftware/release/3.0.x
Sep 16, 2019
02cc015
Modules get duplicated when try to localize modules
Sep 16, 2019
e489571
Merge branch 'release/3.0.x' into bug/DNN-32776
valadas Sep 17, 2019
f15eff7
Merge branch 'release/3.0.x' into bug/DNN-32776
valadas Sep 18, 2019
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
14 changes: 8 additions & 6 deletions ...sonaBar.Extensions/WebApps/Pages.Web/src/components/PageLocalization/PageLocalization.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,14 @@ class PageLocalization extends Component {
}

onUpdateLocalization() {
const {props, state} = this;
const {Locales, Modules, Pages} = state;
const params = { Locales, Modules, Pages };
props.dispatch(LanguagesActions.updateTabLocalization(params, () => {
this.getLanguages();
}));
utils.confirm(Localization.get("UpdateLocalizationWarning"), Localization.get("Continue"), Localization.get("Cancel"), () => {
const {props, state} = this;
const {Locales, Modules, Pages} = state;
const params = { Locales, Modules, Pages };
props.dispatch(LanguagesActions.updateTabLocalization(params, () => {
this.getLanguages();
}));
});
}

renderPageLanguage(local, modules, page, isDefault=false) {
Expand Down
6 changes: 6 additions & 0 deletions ...ontent/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/App_LocalResources/Pages.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@
<data name="Cancel.Text" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="Continue.Text" xml:space="preserve">
<value>Continue</value>
</data>
<data name="UpdateLocalizationWarning.Text" xml:space="preserve">
<value>Updating localization might take a few minutes depending on the number of modules. Please wait until the process finishes completely.</value>
</data>
<data name="DragPageTooltip.Text" xml:space="preserve">
<value>Drag Page into Location</value>
</data>
Expand Down