Skip to content

Commit

Permalink
Fix revisions loading bug and removed translation button
Browse files Browse the repository at this point in the history
  • Loading branch information
simonprev committed Mar 25, 2024
1 parent ef35833 commit c0c8d83
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 17 deletions.
2 changes: 2 additions & 0 deletions webapp/app/components/translation-edit/helpers/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ interface Args {

export default class TranslationEditHelpers extends Component<Args> {
get machineTranslationLanguages() {
if (!this.args.revisions) return [];

return this.args.revisions.map((revision: any) => ({
name: revision.name || revision.language.name,
slug: revision.slug || revision.language.slug
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default class TranslationEditionsController extends Controller {
@readOnly('globalState.permissions')
permissions: any;

@readOnly('model.revisionModel.project.revisions')
@readOnly('model.translationModel.revisions')
revisions: any;

@equal('model.translations', undefined)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default class TranslationEditionsRoute extends Route {
translationEditionsQuery,
{
props: (data) => ({
revisionModel: this.modelFor('logged-in.project.revision'),
translationModel: this.modelFor('logged-in.project.translation'),
project: data.viewer.project,
prompts: data.viewer.project.prompts,
translations: data.viewer.project.translation.editions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
@onUpdateText={{fn this.onUpdateText}}
/>
</div>
<AsyncButton @onClick={{fn this.save}} @loading={{this.isSaving}} class='button button--filled button--iconOnly'>
{{t 'components.related_translations_list.save_button'}}
</AsyncButton>
{{/unless}}
<AsyncButton @onClick={{fn this.save}} @loading={{this.isSaving}} @disabled={{@translation.isRemoved}} class='button button--filled button--iconOnly'>
{{t 'components.related_translations_list.save_button'}}
</AsyncButton>
</div>
{{/component}}
</TranslationEdit::Form>
Expand Down
26 changes: 14 additions & 12 deletions webapp/app/templates/components/translation-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@
lang={{this.revisionSlug}}
/>

<div local-class='form-improve' data-rtl={{this.revisionTextDirRtl}}>
<TranslationEdit::Helpers
@permissions={{@permissions}}
@project={{@project}}
@revisions={{@revisions}}
@prompts={{@prompts}}
@rtl={{this.revisionTextDirRtl}}
@text={{this.text}}
@onUpdatingText={{fn this.onUpdatingText}}
@onUpdateText={{fn this.onUpdateText}}
/>
</div>
{{#unless @translation.isRemoved}}
<div local-class='form-improve' data-rtl={{this.revisionTextDirRtl}}>
<TranslationEdit::Helpers
@permissions={{@permissions}}
@project={{@project}}
@revisions={{@revisions}}
@prompts={{@prompts}}
@rtl={{this.revisionTextDirRtl}}
@text={{this.text}}
@onUpdatingText={{fn this.onUpdatingText}}
@onUpdateText={{fn this.onUpdateText}}
/>
</div>
{{/unless}}
</div>
{{/if}}

Expand Down

0 comments on commit c0c8d83

Please sign in to comment.