Skip to content

Commit

Permalink
Merged in feature/SHIBUI-473 (pull request #70)
Browse files Browse the repository at this point in the history
SHIBUI-473 Updated Text to Source from Provider

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
  • Loading branch information
rmathis committed May 17, 2018
1 parent 7da2a7a commit fcb0b88
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 55 deletions.
8 changes: 4 additions & 4 deletions ui/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<img src="/assets/shibboleth_icon_color_130x130.png" width="30" height="30" class="d-inline-block align-top" alt="Shibboleth Logo - Click to be directed to www.shibboleth.net">
<span class="d-lg-inline d-none">Shibboleth</span>
</a>
<span class="navbar-text" i18n="@@label--app">Metadata Provider Management</span>
<span class="navbar-text" i18n="@@label--app">Metadata Source Management</span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down Expand Up @@ -37,14 +37,14 @@
aria-label="Launch wizard to add a new provider"
role="button">
<i class="fa fa-cube" aria-hidden="true"></i>
<ng-container i18n="@@action--add-provider">Metadata Provider</ng-container>
<ng-container i18n="@@action--add-source">Metadata Source</ng-container>
</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" routerLink="/dashboard" routerLinkActive="active" aria-label="Service provider dashboard">
<a class="nav-link" routerLink="/dashboard" routerLinkActive="active" aria-label="Metadata sources dashboard">
<i class="fa fa-th" aria-hidden="true"></i>
<ng-container i18n="@@action--manage-providers">Manage Providers</ng-container>
<ng-container i18n="@@action--manage-sources">Manage Sources</ng-container>
</a>
</li>
<li>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/dashboard/component/delete-dialog.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="modal-header">
<h4 class="modal-title" i18n="@@message--delete-provider-title">Delete Metadata Provider?</h4>
<h4 class="modal-title" i18n="@@message--delete-source-title">Delete Metadata Source?</h4>
</div>
<div class="modal-body"> <!-- [ngSwitch]="message" -->
<p i18n="@@message--delete-provider-body">You are deleting a metadata provider. This cannot be undone. Continue?</p>
<p i18n="@@message--delete-source-body">You are deleting a metadata source. This cannot be undone. Continue?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" (click)="this.activeModal.close()" i18n="@@action--delete">Delete</button>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/edit-provider/container/editor.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<button class="btn btn-info"
(click)="save()"
[disabled]="wizardIsInvalid$ | async"
aria-label="Save changes to the metadata provider. You will return to the dashboard"
aria-label="Save changes to the metadata source. You will return to the dashboard"
role="button">
<i class="fa fa-save"></i>
<ng-container i18n="@@action--save">Save</ng-container>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/edit-provider/container/wizard.component.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="container-fluid p-3" role="main">
<section class="section" *ngIf="provider$ | async" tabindex="0" [attr.aria-label]="'Add a new metadata provider wizard form - ' + (currentPage$ | async).label + ' ' + (provider$ | async).serviceProviderName">
<section class="section" *ngIf="provider$ | async" tabindex="0" [attr.aria-label]="'Add a new metadata source wizard form - ' + (currentPage$ | async).label + ' ' + (provider$ | async).serviceProviderName">
<div class="section-header bg-info p-2 text-white">
<div class="row justify-content-between">
<div class="col-md-12">
<span class="display-6" role="heading" aria-level="1">
<i class="fa fa-plus-square"></i>
<ng-container i18n="@@message--add-new-md-provider">Add a new metadata provider</ng-container>
<ng-container i18n="@@message--add-new-md-provider">Add a new metadata source</ng-container>
&ndash; {{ (currentPage$ | async).label }} ({{ (provider$ | async).serviceProviderName }})
<span class="pull-right">
(<ng-container i18n="@@message--wizard-status">Step {{ wizardIndex$ | async }} of {{ wizard.length + 1 }}</ng-container>)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="section-header bg-info p-2 text-white">
<div class="row justify-content-between">
<div class="col-md-12">
<span class="display-6" i18n="@@label--add-a-new-metadata-provider">Add a new metadata provider</span>
<span class="display-6" i18n="@@label--add-a-new-metadata-provider">Add a new metadata source</span>
</div>
</div>
</div>
Expand Down
46 changes: 23 additions & 23 deletions ui/src/locale/en.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<file source-language="en" datatype="plaintext" original="ng2.template">
<body>
<trans-unit id="label--app" datatype="html">
<source>Metadata Provider Management</source>
<target>Metadata Provider Management</target>
<source>Metadata Source Management</source>
<target>Metadata Source Management</target>
<context-group purpose="location">
<context context-type="sourcefile">app/app.component.ts</context>
<context context-type="linenumber">7</context>
</context-group>
</trans-unit>
<trans-unit id="action--manage-providers" datatype="html">
<source>Manage Providers</source>
<target>Manage Providers</target>
<trans-unit id="action--manage-sources" datatype="html">
<source>Manage Sources</source>
<target>Manage Sources</target>
<context-group purpose="location">
<context context-type="sourcefile">app/app.component.ts</context>
<context context-type="linenumber">17</context>
Expand All @@ -26,9 +26,9 @@
<context context-type="linenumber">23</context>
</context-group>
</trans-unit>
<trans-unit id="action--add-provider" datatype="html">
<source>Metadata Provider</source>
<target>Metadata Provider</target>
<trans-unit id="action--add-source" datatype="html">
<source>Metadata Source</source>
<target>Metadata Source</target>
<context-group purpose="location">
<context context-type="sourcefile">app/app.component.ts</context>
<context context-type="linenumber">40</context>
Expand Down Expand Up @@ -1131,9 +1131,9 @@
<context context-type="linenumber">248</context>
</context-group>
</trans-unit>
<trans-unit id="label--add-a-new-metadata-provider" datatype="html">
<source>Add a new metadata provider</source>
<target>Add a new metadata provider</target>
<trans-unit id="label--add-a-new-metadata-source" datatype="html">
<source>Add a new metadata source</source>
<target>Add a new metadata source</target>
<context-group purpose="location">
<context context-type="sourcefile">app/metadata-provider/container/new-provider.component.ts</context>
<context context-type="linenumber">6</context>
Expand Down Expand Up @@ -1171,12 +1171,12 @@
<context context-type="linenumber">6</context>
</context-group>
</trans-unit>
<trans-unit id="action--save-metadata-provider" datatype="html">
<trans-unit id="action--save-metadata-source" datatype="html">
<source>
Save Metadata Provider
Save Metadata Source
</source>
<target>
Save Metadata Provider
Save Metadata Source
</target>
<context-group purpose="location">
<context context-type="sourcefile">app/metadata-provider/container/upload-provider.component.ts</context>
Expand Down Expand Up @@ -1339,17 +1339,17 @@
<context context-type="linenumber">43</context>
</context-group>
</trans-unit>
<trans-unit id="message--delete-provider-title" datatype="html">
<source>Delete Metadata Provider?</source>
<target>Delete Metadata Provider?</target>
<trans-unit id="message--delete-source-title" datatype="html">
<source>Delete Metadata Source?</source>
<target>Delete Metadata Source?</target>
<context-group purpose="location">
<context context-type="sourcefile">app/dashboard/component/delete-dialog.component.ts</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="message--delete-provider-body" datatype="html">
<source>You are deleting a metadata provider. This cannot be undone. Continue?</source>
<target>You are deleting a metadata provider. This cannot be undone. Continue?</target>
<trans-unit id="message--delete-source-body" datatype="html">
<source>You are deleting a metadata source. This cannot be undone. Continue?</source>
<target>You are deleting a metadata source. This cannot be undone. Continue?</target>
<context-group purpose="location">
<context context-type="sourcefile">app/dashboard/component/delete-dialog.component.ts</context>
<context context-type="linenumber">5</context>
Expand Down Expand Up @@ -1523,9 +1523,9 @@
<context context-type="linenumber">16</context>
</context-group>
</trans-unit>
<trans-unit id="message--add-new-md-provider" datatype="html">
<source>Add a new metadata provider</source>
<target>Add a new metadata provider</target>
<trans-unit id="message--add-new-md-source" datatype="html">
<source>Add a new metadata source</source>
<target>Add a new metadata source</target>
<context-group purpose="location">
<context context-type="sourcefile">app/edit-provider/container/wizard.component.ts</context>
<context context-type="linenumber">8</context>
Expand Down
44 changes: 22 additions & 22 deletions ui/src/locale/es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<file source-language="en" datatype="plaintext" original="ng2.template">
<body>
<trans-unit id="label--app" datatype="html">
<source>Metadata Provider Management</source>
<target>Metadata Provider Management (es)</target>
<source>Metadata Source Management</source>
<target>Metadata Source Management (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/app.component.ts</context>
<context context-type="linenumber">7</context>
</context-group>
</trans-unit>
<trans-unit id="action--manage-providers" datatype="html">
<source>Manage Providers</source>
<target>Manage Providers (es)</target>
<trans-unit id="action--manage-sources" datatype="html">
<source>Manage Sources</source>
<target>Manage Sources (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/app.component.ts</context>
<context context-type="linenumber">17</context>
Expand All @@ -26,9 +26,9 @@
<context context-type="linenumber">23</context>
</context-group>
</trans-unit>
<trans-unit id="action--add-provider" datatype="html">
<source>Metadata Provider</source>
<target>Metadata Provider (es)</target>
<trans-unit id="action--add-source" datatype="html">
<source>Metadata Source</source>
<target>Metadata Source (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/app.component.ts</context>
<context context-type="linenumber">40</context>
Expand Down Expand Up @@ -1132,8 +1132,8 @@
</context-group>
</trans-unit>
<trans-unit id="label--add-a-new-metadata-provider" datatype="html">
<source>Add a new metadata provider</source>
<target>Add a new metadata provider (es)</target>
<source>Add a new metadata source</source>
<target>Add a new metadata source (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/metadata-provider/container/new-provider.component.ts</context>
<context context-type="linenumber">6</context>
Expand Down Expand Up @@ -1171,12 +1171,12 @@
<context context-type="linenumber">6</context>
</context-group>
</trans-unit>
<trans-unit id="action--save-metadata-provider" datatype="html">
<trans-unit id="action--save-metadata-source" datatype="html">
<source>
Save Metadata Provider
Save Metadata Source
</source>
<target>
Save Metadata Provider
Save Metadata Source
(es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/metadata-provider/container/upload-provider.component.ts</context>
Expand Down Expand Up @@ -1339,17 +1339,17 @@
<context context-type="linenumber">43</context>
</context-group>
</trans-unit>
<trans-unit id="message--delete-provider-title" datatype="html">
<source>Delete Metadata Provider?</source>
<target>Delete Metadata Provider? (es)</target>
<trans-unit id="message--delete-source-title" datatype="html">
<source>Delete Metadata Source?</source>
<target>Delete Metadata Source? (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/dashboard/component/delete-dialog.component.ts</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="message--delete-provider-body" datatype="html">
<source>You are deleting a metadata provider. This cannot be undone. Continue?</source>
<target>You are deleting a metadata provider. This cannot be undone. Continue? (es)</target>
<trans-unit id="message--delete-source-body" datatype="html">
<source>You are deleting a metadata source. This cannot be undone. Continue?</source>
<target>You are deleting a metadata source. This cannot be undone. Continue? (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/dashboard/component/delete-dialog.component.ts</context>
<context context-type="linenumber">5</context>
Expand Down Expand Up @@ -1495,9 +1495,9 @@
<context context-type="linenumber">16</context>
</context-group>
</trans-unit>
<trans-unit id="message--add-new-md-provider" datatype="html">
<source>Add a new metadata provider</source>
<target>Add a new metadata provider (es)</target>
<trans-unit id="message--add-new-md-source" datatype="html">
<source>Add a new metadata source</source>
<target>Add a new metadata source (es)</target>
<context-group purpose="location">
<context context-type="sourcefile">app/edit-provider/container/wizard.component.ts</context>
<context context-type="linenumber">8</context>
Expand Down

0 comments on commit fcb0b88

Please sign in to comment.