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

UIORGS-425 Fixed UX Consistency Issue #632

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -55,7 +55,7 @@ const OrganizationIntegrationForm = ({
disabled={pristine || submitting}
onClick={handleSubmit}
>
<FormattedMessage id="ui-organizations.button.saveAndClose" />
<FormattedMessage id="stripes-components.saveAndClose" />
</Button>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,7 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
<span
class="inner"
>
ui-organizations.button.saveAndClose
stripes-components.saveAndClose
</span>
</button>
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/Organizations/OrganizationForm/OrganizationForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const OrganizationForm = ({
const paneFooter = (
<FormFooter
id="organization-form-save"
label={<FormattedMessage id="ui-organizations.button.saveAndClose" />}
label={<FormattedMessage id="stripes-components.saveAndClose" />}
pristine={pristine}
submitting={submitting}
handleSubmit={handleSubmit}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
<span
class="inner"
>
ui-organizations.button.saveAndClose
stripes-components.saveAndClose
</span>
</button>
</span>
Expand Down Expand Up @@ -792,7 +792,7 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
<span
class="inner"
>
ui-organizations.button.saveAndClose
stripes-components.saveAndClose
</span>
</button>
</span>
Expand Down Expand Up @@ -1375,7 +1375,7 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
<span
class="inner"
>
ui-organizations.button.saveAndClose
stripes-components.saveAndClose
</span>
</button>
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/contacts/EditContact/EditContact.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const EditContact = ({
disabled={pristine || submitting}
onClick={handleSubmit}
>
<FormattedMessage id="ui-organizations.button.saveAndClose" />
<FormattedMessage id="stripes-components.saveAndClose" />
</Button>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37833,7 +37833,7 @@ exports[`EditContact should render correct form structure 1`] = `
<span
class="inner"
>
ui-organizations.button.saveAndClose
stripes-components.saveAndClose
</span>
</button>
</span>
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "عرض الوسوم",
"search.keyword": "الكل",
"button.cancel": "إلغاء",
"button.saveAndClose": "حفظ وإغلاق",
"interface.url": "عنوان URL",
"interface.type": "النوع",
"edit.hideCredentials": "إخفاء البيانات",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ber.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/cs_CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Zobrazit štítky",
"search.keyword": "Všechny",
"button.cancel": "Zrušit",
"button.saveAndClose": "Uložit a zavřít",
"interface.url": "URL",
"interface.type": "Typ",
"edit.hideCredentials": "Skrýt přihlašovací údaje",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Gem & luk",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Skjul legitimationsoplysninger",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Tags anzeigen",
"search.keyword": "Alles",
"button.cancel": "Abbrechen",
"button.saveAndClose": "Speichern & schließen",
"interface.url": "URL",
"interface.type": "Typ",
"edit.hideCredentials": "Anmeldeinformationen ausblenden",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@

"button.bankingInformation.add": "Add banking information",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",

"contacts.actions.load.error": "Failed to load contacts data",

Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/en_SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Mostrar Etiquetas",
"search.keyword": "Todo",
"button.cancel": "Cancelar",
"button.saveAndClose": "Guardar y cerrar",
"interface.url": "URL",
"interface.type": "Tipo",
"edit.hideCredentials": "Ocultar credenciales",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/es_419.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Mostrar Etiquetas",
"search.keyword": "Todo",
"button.cancel": "Cancelar",
"button.saveAndClose": "Guardar y cerrar",
"interface.url": "URL",
"interface.type": "Tipo",
"edit.hideCredentials": "Ocultar credenciales",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Mostrar Etiquetas",
"search.keyword": "Todo",
"button.cancel": "Cancelar",
"button.saveAndClose": "Guardar y cerrar",
"interface.url": "URL",
"interface.type": "Tipo",
"edit.hideCredentials": "Ocultar credenciales",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Afficher les mots-clés",
"search.keyword": "Tout",
"button.cancel": "Annuler",
"button.saveAndClose": "Sauvegarder et fermer",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Masquer les informations d'identification",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/hi_IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/it_IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Mostra tag",
"search.keyword": "Tutto",
"button.cancel": "Annulla",
"button.saveAndClose": "Salva e chiudi",
"interface.url": "URL",
"interface.type": "Tipo",
"edit.hideCredentials": "Nascondi credenziali",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "タグを表示",
"search.keyword": "全部",
"button.cancel": "キャンセル",
"button.saveAndClose": "保存して閉じる",
"interface.url": "URL",
"interface.type": "種類",
"edit.hideCredentials": "資格情報を非表示にする",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "태그 표시",
"search.keyword": "모두",
"button.cancel": "취소",
"button.saveAndClose": "저장 후 닫기",
"interface.url": "URL",
"interface.type": "유형",
"edit.hideCredentials": "인증정보 숨기기",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/nn.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Pokaż etykiety",
"search.keyword": "Wszystkie",
"button.cancel": "Anuluj",
"button.saveAndClose": "Zapisz i zamknij",
"interface.url": "URL",
"interface.type": "Rodzaj",
"edit.hideCredentials": "Ukryj dane uwierzytelniające",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Mostrar tags",
"search.keyword": "Todos",
"button.cancel": "Cancelar",
"button.saveAndClose": "Salvar e fechar",
"interface.url": "URL",
"interface.type": "Tipo",
"edit.hideCredentials": "Ocultar credenciais",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/pt_PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Показать теги",
"search.keyword": "Все",
"button.cancel": "Отмена",
"button.saveAndClose": "Сохранить и закрыть",
"interface.url": "URL",
"interface.type": "Тип",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/sk.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/ur.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "Show tags",
"search.keyword": "All",
"button.cancel": "Cancel",
"button.saveAndClose": "Save & close",
"interface.url": "URL",
"interface.type": "Type",
"edit.hideCredentials": "Hide credentials",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "显示标签",
"search.keyword": "所有",
"button.cancel": "取消",
"button.saveAndClose": "保存并关闭",
"interface.url": "URL",
"interface.type": "类型",
"edit.hideCredentials": "隐藏凭证",
Expand Down
1 change: 0 additions & 1 deletion translations/ui-organizations/zh_TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
"showTags": "顯示標籤",
"search.keyword": "全部",
"button.cancel": "取消",
"button.saveAndClose": "儲存並關閉",
"interface.url": "URL",
"interface.type": "類型",
"edit.hideCredentials": "隱藏憑證",
Expand Down
Loading