diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue index c72598a90..fdab73484 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -45,10 +45,10 @@ :class="getClassButton" type="button" name="button" - :title="trans(getTextButton)" + :title="getTextButton" > {{ - trans(getTextButton) + getTextButton }} @@ -73,10 +73,10 @@ :class="getClassButton" type="button" name="button" - :title="trans(getTextButton)" + :title="getTextButton" > {{ - trans(getTextButton) + getTextButton }} @@ -97,11 +97,9 @@ :class="getClassButton" type="button" name="button" - :title="trans(getTextButton)" + :title="getTextButton" > - {{ - trans(getTextButton) - }} + {{ getTextButton }} @@ -177,16 +175,18 @@ export default { }, getTextButton() { if ( - typeof this.options.button.text !== "undefined" && - (this.options.button.text.edit !== null || - this.options.button.text.create !== null) + typeof this.options.button !== "undefined" && + typeof this.options.button.text !== "undefined" ) { - // console.log('this.options.button.text', this.options.button.text) - return this.context.edit - ? ACTIVITY_EDIT_ADDRESS - : ACTIVITY_CREATE_ADDRESS; + const customText = this.context.edit + ? this.options.button.text.edit + : this.options.button.text.create; + + if (customText !== null) { + return customText; + } } - console.log("defaultz", this.defaultz); + return this.context.edit ? this.defaultz.button.text.edit : this.defaultz.button.text.create;