Skip to content

Commit 652195e

Browse files
shaukeshauke
committed
chore: clean up obsolete html comments and removed unused localization keys
BREAKING CHANGES: Removed unused newsletter localization keys.
1 parent 95d0a71 commit 652195e

File tree

11 files changed

+24
-105
lines changed

11 files changed

+24
-105
lines changed

‎e2e/cypress/integration/specs/account/edit-user-company.b2b.e2e-spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ describe('Changing User', () => {
2323
page.fillForm(_.user.login, _.user.password).submit().its('response.statusCode').should('equal', 200)
2424
);
2525
at(ProfilePage, page => {
26-
page.name.should('have.text', `${_.user.firstName} ${_.user.lastName}`);
27-
page.phone.should('have.text', _.user.phoneHome);
28-
page.companyName.should('have.text', _.user.companyName1);
26+
page.name.should('contain', `${_.user.firstName} ${_.user.lastName}`);
27+
page.phone.should('contain', _.user.phoneHome);
28+
page.companyName.should('contain', _.user.companyName1);
2929
page.taxationId.should('be.empty');
3030
});
3131
});
@@ -37,8 +37,8 @@ describe('Changing User', () => {
3737
page.fillForm(_.newDetails).submit().its('response.statusCode').should('equal', 200)
3838
);
3939
at(ProfilePage, page => {
40-
page.companyName.should('have.text', `${_.newDetails.companyName}${_.newDetails.companyName2}`);
41-
page.taxationId.should('have.text', _.newDetails.taxationID);
40+
page.companyName.should('contain', `${_.newDetails.companyName}${_.newDetails.companyName2}`);
41+
page.taxationId.should('contain', _.newDetails.taxationID);
4242
});
4343
});
4444
});

‎e2e/cypress/integration/specs/account/edit-user-details.b2c.e2e-spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ describe('Changing User', () => {
2525
);
2626

2727
at(ProfilePage, page => {
28-
page.name.should('have.text', `${_.user.firstName} ${_.user.lastName}`);
29-
page.phone.should('have.text', _.user.phoneHome);
28+
page.name.should('contain', `${_.user.firstName} ${_.user.lastName}`);
29+
page.phone.should('contain', _.user.phoneHome);
3030
});
3131
});
3232

@@ -38,8 +38,8 @@ describe('Changing User', () => {
3838
);
3939
at(ProfilePage, page => {
4040
page.header.myAccountLink.should('have.text', `${_.newDetails.firstName} ${_.newDetails.lastName}`);
41-
page.name.should('have.text', `${_.newDetails.title} ${_.newDetails.firstName} ${_.newDetails.lastName}`);
42-
page.phone.should('have.text', _.newDetails.phoneHome);
41+
page.name.should('contain', `${_.newDetails.title} ${_.newDetails.firstName} ${_.newDetails.lastName}`);
42+
page.phone.should('contain', _.newDetails.phoneHome);
4343
});
4444
});
4545
});

‎src/app/extensions/compare/pages/compare/product-compare-list/product-compare-list.component.html

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,6 @@
8282
<td *ngFor="let product of visibleProducts">{{ product.manufacturer }}</td>
8383
</tr>
8484

85-
<!-- TODO: Manufacturer SKU
86-
<tr>
87-
<th>{{'product.manufacturer_sku.label' | translate}}
88-
</th>
89-
<td *ngFor="let product of visibleProducts">
90-
</td>
91-
</tr>
92-
-->
93-
9485
<tr *ngFor="let commonAttributeName of commonAttributeNames$ | async">
9586
<th>{{ commonAttributeName }}</th>
9687
<td *ngFor="let product of visibleProducts">

‎src/app/extensions/quoting/shared/quote-line-item-list/quote-line-item-list.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
<div *ngIf="displayTotal$ | async" class="clearfix section">
2626
<div class="row justify-content-end list-body">
27-
<!-- TODO: remove style attribute -->
2827
<div class="col-sm-4 col-md-3 col-lg-2 text-right pr-0">{{ 'quote.items.total.label' | translate }}</div>
29-
<!-- TODO: remove style attribute -->
3028
<div class="col-sm-4 col-md-2 pr-0">
3129
<div class="total-price text-right">{{ total$ | async | ishPrice }}</div>
3230
</div>

‎src/app/pages/account-profile/account-profile/account-profile.component.html

Lines changed: 12 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h1>{{ 'account.profile.heading' | translate }}</h1>
22

3-
<!-- Email Template -->
3+
<!-- Email -->
44
<div class="row section">
55
<div class="col-10 col-lg-8">
66
<h3>{{ 'account.profile.email.heading' | translate }}</h3>
@@ -9,20 +9,6 @@ <h3>{{ 'account.profile.email.heading' | translate }}</h3>
99
<dl class="row dl-horizontal dl-separator">
1010
<dt class="col-md-4">{{ 'account.profile.email.label' | translate }}</dt>
1111
<dd class="col-md-8" data-testing-id="email-field">{{ user.email }}</dd>
12-
<!-- TODO: implement logic (extend REST response) to present email subscriptions
13-
cSpell: disable
14-
<dt>{{'account.profile.order_confirmation_subscription.text' | translate}}</dt>
15-
<dd>
16-
17-
<isif condition="#Preferences:OrderConfirmationEmails#">
18-
{{'account.profile.order_confirmation_email.text' | translate}}&nbsp;
19-
</isif>
20-
<isif condition="#isDefined(ReceiveNewsletters) AND ReceiveNewsletters#">
21-
{{'account.profile.newsletter.text' | translate}}
22-
</isif>
23-
</dd>
24-
cSpell: enable
25-
-->
2612
</dl>
2713
</div>
2814
</div>
@@ -40,7 +26,7 @@ <h3>{{ 'account.profile.email.heading' | translate }}</h3>
4026
</div>
4127
</div>
4228

43-
<!-- Password Template -->
29+
<!-- Password -->
4430
<div class="row section" *ishIdentityProviderCapability="'editPassword'">
4531
<div class="col-10 col-lg-8">
4632
<h3>{{ 'account.profile.password.heading' | translate }}</h3>
@@ -72,10 +58,9 @@ <h3>{{ 'account.company_profile.detail.heading' | translate }}</h3>
7258
<div class="col-md-12">
7359
<dl class="row dl-horizontal dl-separator">
7460
<dt class="col-md-4">{{ 'account.company_profile.name.label' | translate }}</dt>
75-
<!-- display: inline -->
76-
<dd class="col-md-8" data-testing-id="company-field"
77-
>{{ customer.companyName }}<br />{{ customer.companyName2 }}</dd
78-
>
61+
<dd class="col-md-8" data-testing-id="company-field">
62+
{{ customer.companyName }}<br />{{ customer.companyName2 }}
63+
</dd>
7964
<ng-container *ngIf="customer.industry">
8065
<dt class="col-md-4">{{ 'account.company_profile.industry.label' | translate }}</dt>
8166
<dd class="col-md-8">{{ customer.industry }}</dd>
@@ -99,27 +84,26 @@ <h3>{{ 'account.company_profile.detail.heading' | translate }}</h3>
9984
</div>
10085
</div>
10186

102-
<!-- Profile Template -->
87+
<!-- Profile -->
10388
<div class="row section">
10489
<div class="col-10 col-lg-8">
10590
<h3>{{ 'account.profile.detail.heading' | translate }}</h3>
10691
<div class="row">
10792
<div class="col-md-12">
10893
<dl class="row dl-horizontal dl-separator">
10994
<dt class="col-md-4">{{ 'account.profile.name.label' | translate }}</dt>
110-
<!-- display: inline -->
111-
<dd class="col-md-8" data-testing-id="name-field"
112-
>{{ user.title ? user.title + ' ' : '' }}{{ user.firstName }} {{ user.lastName }}</dd
113-
>
95+
<dd class="col-md-8" data-testing-id="name-field">
96+
{{ user.title ? user.title + ' ' : '' }}{{ user.firstName }} {{ user.lastName }}
97+
</dd>
11498
<!-- Phone -->
11599
<dt class="col-md-4">{{ 'account.profile.phone.label' | translate }}</dt>
116100
<dd class="col-md-8" data-testing-id="phone-field">{{ user.phoneHome }}</dd>
117101

118102
<!-- Birthday
119103
<dt class="col-md-4">{{ 'account.profile.birthday.label' | translate }}</dt>
120-
<dd class="col-md-8" data-testing-id="birthday-field">{{
121-
user.birthday ? (user.birthday | ishDate) : ('account.profile.birthday.not_available' | translate)
122-
}}</dd>
104+
<dd class="col-md-8" data-testing-id="birthday-field">
105+
{{ user.birthday ? (user.birthday | ishDate) : ('account.profile.birthday.not_available' | translate) }}
106+
</dd>
123107
-->
124108
</dl>
125109
</div>
@@ -138,32 +122,6 @@ <h3>{{ 'account.profile.detail.heading' | translate }}</h3>
138122
</div>
139123
</div>
140124

141-
<!-- Newsletter Template -->
142-
<!--
143-
cSpell: disable-next-line
144-
TODO: Newsletter configuration currently not available via REST API, need to get information for <isif condition="#isDefined(ReceiveNewsletters) AND ReceiveNewsletters#"><istext key="account.newsletter.subscribed"/><iselse> <istext key="account.newsletter.unsubscribed"/></isif>
145-
<div class="row section">
146-
<div class="col-10 col-lg-8">
147-
<h3>{{'account.newsletter.label' | translate}}</h3>
148-
<div class="row">
149-
<div class="col-md-12">
150-
<dl class="row">
151-
<dt class="col-md-4">{{'account.newsletter.label' | translate}}</dt>
152-
<dd class="col-md-8">
153-
154-
</dd>
155-
</dl>
156-
</div>
157-
</div>
158-
</div>
159-
<div class="col-2 col-lg-4">
160-
<a class="btn-tool" title="{{'account.profile.update.link' | translate}}">
161-
<fa-icon [icon]="['fas', 'pencil-alt']"></fa-icon>
162-
</a>
163-
</div>
164-
</div>
165-
-->
166-
167125
<!-- Note -->
168126
<p class="form-text">
169127
{{ 'account.overview.note.heading' | translate }}:

‎src/app/shared/cms/components/cms-standard-page/cms-standard-page.component.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<!-- NOTE:
2-
For the PWA the 'app_sf_base_cm:pagevariant.standard.pagelet2-Pagevariant' model only renders the content of the 'content' slot.
3-
'header' and 'footer' slot content is not relevant for the PWA while the content of the Responsive Starter Store is reused.
4-
-->
51
<ish-content-slot
62
[slot]="'app_sf_base_cm:slot.pagevariant.content.pagelet2-Slot'"
73
[pagelet]="pagelet"

‎src/app/shared/components/line-item/line-item-list/line-item-list.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525

2626
<div *ngIf="total?.value && lineItems.length > 0" class="clearfix section">
2727
<div class="row justify-content-end list-body">
28-
<!-- TODO: remove style attribute -->
2928
<div class="col-sm-4 col-md-3 col-lg-2 text-right pr-0">{{ 'quote.items.total.label' | translate }}</div>
30-
<!-- TODO: remove style attribute -->
3129
<div class="col-sm-4 col-md-2 pr-0">
3230
<div class="total-price text-right">{{ total | ishPrice }}</div>
3331
</div>

‎src/app/shared/components/product/product-bundle-display/product-bundle-display.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<ng-container *ngIf="visible$ | async">
22
<ul>
3-
<!-- display: inline -->
4-
<li *ngFor="let item of parts$ | async"
5-
>{{ item.quantity }} x <ish-product-name ishProductContext [sku]="item.sku" [link]="false"></ish-product-name
6-
></li>
3+
<li *ngFor="let item of parts$ | async">
4+
{{ item.quantity }} x <ish-product-name ishProductContext [sku]="item.sku" [link]="false"></ish-product-name>
5+
</li>
76
</ul>
87
</ng-container>

‎src/assets/i18n/de_DE.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,6 @@
189189
"account.navigation.logout.link": "Abmelden",
190190
"account.navigation.quotes.link": "Preisangebote",
191191
"account.new_user.heading": "Neue Benutzer",
192-
"account.newsletter.label": "Newsletter",
193-
"account.newsletter.subscribed": "Abonniert",
194-
"account.newsletter.unsubscribed": "Nicht abonniert",
195192
"account.option.select.text": "Bitte auswählen",
196193
"account.order.most_recent.heading": "Letzte Bestellungen",
197194
"account.order.questions.note": "Besuchen Sie die <a href=\"{{0}}\">Hilfe</a> auf unserer Website für umfassende Bestell- und Versandinformationen oder <a href=\"{{1}}\">kontaktieren Sie uns</a> rund um die Uhr.",
@@ -296,9 +293,6 @@
296293
"account.profile.heading": "Profileinstellungen",
297294
"account.profile.link": "Profileinstellungen",
298295
"account.profile.name.label": "Name",
299-
"account.profile.newsletter.text": "Newsletter",
300-
"account.profile.order_confirmation_email.text": "Bestellbestätigungs-E-Mails",
301-
"account.profile.order_confirmation_subscription.text": "Aktuelle Abonnements",
302296
"account.profile.password.heading": "Kennwort",
303297
"account.profile.password.label": "Kennwort",
304298
"account.profile.phone.label": "Telefon",
@@ -857,7 +851,6 @@
857851
"product.itemNumber.label": "Artikelnummer:",
858852
"product.items.label": "{{0, plural, one{# Element} other{# Elemente}}}",
859853
"product.manufacturer_name.label": "Herstellername",
860-
"product.manufacturer_sku.label": "Hersteller-SKU",
861854
"product.out_of_stock.text": "Nicht verfügbar",
862855
"product.price.listPriceFallback.text": "{{0}}",
863856
"product.price.na.text": "k. A.",

‎src/assets/i18n/en_US.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,6 @@
189189
"account.navigation.logout.link": "Logout",
190190
"account.navigation.quotes.link": "Quoting",
191191
"account.new_user.heading": "New Users",
192-
"account.newsletter.label": "Newsletter",
193-
"account.newsletter.subscribed": "Subscribed",
194-
"account.newsletter.unsubscribed": "Not Subscribed",
195192
"account.option.select.text": "Please select",
196193
"account.order.most_recent.heading": "Most Recent Orders",
197194
"account.order.questions.note": "Please visit the <a href=\"{{0}}\">Help</a> area of our website for comprehensive order and shipping information or <a href=\"{{1}}\">Contact Us</a> 24 hours a day.",
@@ -296,9 +293,6 @@
296293
"account.profile.heading": "Profile Settings",
297294
"account.profile.link": "Profile Settings",
298295
"account.profile.name.label": "Name",
299-
"account.profile.newsletter.text": "Newsletter E-mails",
300-
"account.profile.order_confirmation_email.text": "Order Confirmation E-mails",
301-
"account.profile.order_confirmation_subscription.text": "Current Subscriptions",
302296
"account.profile.password.heading": "Password",
303297
"account.profile.password.label": "Password",
304298
"account.profile.phone.label": "Phone",
@@ -857,7 +851,6 @@
857851
"product.itemNumber.label": "Product ID:",
858852
"product.items.label": "{{0, plural, one{# list item} other{# list items}}}",
859853
"product.manufacturer_name.label": "Manufacturer Name",
860-
"product.manufacturer_sku.label": "Manufacturer SKU",
861854
"product.out_of_stock.text": "Out of Stock",
862855
"product.price.listPriceFallback.text": "{{0}}",
863856
"product.price.na.text": "N/A",

‎src/assets/i18n/fr_FR.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,6 @@
189189
"account.navigation.logout.link": "Déconnexion",
190190
"account.navigation.quotes.link": "Devis",
191191
"account.new_user.heading": "Nouveaux utilisateurs",
192-
"account.newsletter.label": "Newsletter",
193-
"account.newsletter.subscribed": "Abonné",
194-
"account.newsletter.unsubscribed": "Non abonné",
195192
"account.option.select.text": "Veuillez sélectionner",
196193
"account.order.most_recent.heading": "Les commandes les plus récentes",
197194
"account.order.questions.note": "Merci de consulter la section <a href=\"{{0}}\">Aide</a> de notre site Web pour des renseignements détaillés sur votre commande et l’expédition ou <a href=\"{{1}}\">Contactez-nous</a> 24 heures sur 24.",
@@ -296,9 +293,6 @@
296293
"account.profile.heading": "Paramètres de profil",
297294
"account.profile.link": "Paramètres de profil",
298295
"account.profile.name.label": "Nom",
299-
"account.profile.newsletter.text": "Courriels newsletter",
300-
"account.profile.order_confirmation_email.text": "Courriels de confirmation de commande",
301-
"account.profile.order_confirmation_subscription.text": "Abonnements actuels",
302296
"account.profile.password.heading": "Mot de passe",
303297
"account.profile.password.label": "Mot de passe",
304298
"account.profile.phone.label": "Téléphone",
@@ -857,7 +851,6 @@
857851
"product.itemNumber.label": "ID produit :",
858852
"product.items.label": "{{0, plural, one{# article} other{# articles}}}",
859853
"product.manufacturer_name.label": "Nom du fabricant",
860-
"product.manufacturer_sku.label": "UGS du fabricant",
861854
"product.out_of_stock.text": "Stock épuisé",
862855
"product.price.listPriceFallback.text": "{{0}}",
863856
"product.price.na.text": "n.c.",

0 commit comments

Comments
 (0)