Skip to content

Commit d5586d2

Browse files
ealeksandrovealeksandrov
authored
Merge pull request #6663 from woocommerce/issue/6615-add-address-form-hints
Order Creation: Add hints to all fields in address form
2 parents ade6ab7 + a40396e commit d5586d2

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/EditOrderAddressForm.swift‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ struct SingleAddressForm: View {
215215
VStack(spacing: 0) {
216216
TitleAndTextFieldRow(title: Localization.firstNameField,
217217
titleWidth: $titleWidth,
218-
placeholder: "",
218+
placeholder: Localization.firstNameHint,
219219
text: $fields.firstName,
220220
symbol: nil,
221221
fieldAlignment: .leading,
@@ -224,7 +224,7 @@ struct SingleAddressForm: View {
224224
.padding(.leading, Constants.dividerPadding)
225225
TitleAndTextFieldRow(title: Localization.lastNameField,
226226
titleWidth: $titleWidth,
227-
placeholder: "",
227+
placeholder: Localization.lastNameHint,
228228
text: $fields.lastName,
229229
symbol: nil,
230230
fieldAlignment: .leading,
@@ -235,7 +235,7 @@ struct SingleAddressForm: View {
235235
if showEmailField {
236236
TitleAndTextFieldRow(title: Localization.emailField,
237237
titleWidth: $titleWidth,
238-
placeholder: "",
238+
placeholder: Localization.emailHint,
239239
text: $fields.email,
240240
symbol: nil,
241241
fieldAlignment: .leading,
@@ -248,7 +248,7 @@ struct SingleAddressForm: View {
248248

249249
TitleAndTextFieldRow(title: Localization.phoneField,
250250
titleWidth: $titleWidth,
251-
placeholder: "",
251+
placeholder: Localization.phoneHint,
252252
text: $fields.phone,
253253
symbol: nil,
254254
fieldAlignment: .leading,
@@ -265,7 +265,7 @@ struct SingleAddressForm: View {
265265
Group {
266266
TitleAndTextFieldRow(title: Localization.companyField,
267267
titleWidth: $titleWidth,
268-
placeholder: Localization.placeholderOptional,
268+
placeholder: Localization.hintOptional,
269269
text: $fields.company,
270270
symbol: nil,
271271
fieldAlignment: .leading,
@@ -274,7 +274,7 @@ struct SingleAddressForm: View {
274274
.padding(.leading, Constants.dividerPadding)
275275
TitleAndTextFieldRow(title: Localization.address1Field,
276276
titleWidth: $titleWidth,
277-
placeholder: "",
277+
placeholder: Localization.address1Hint,
278278
text: $fields.address1,
279279
symbol: nil,
280280
fieldAlignment: .leading,
@@ -283,7 +283,7 @@ struct SingleAddressForm: View {
283283
.padding(.leading, Constants.dividerPadding)
284284
TitleAndTextFieldRow(title: Localization.address2Field,
285285
titleWidth: $titleWidth,
286-
placeholder: Localization.placeholderOptional,
286+
placeholder: Localization.hintOptional,
287287
text: $fields.address2,
288288
symbol: nil,
289289
fieldAlignment: .leading,
@@ -292,7 +292,7 @@ struct SingleAddressForm: View {
292292
.padding(.leading, Constants.dividerPadding)
293293
TitleAndTextFieldRow(title: Localization.cityField,
294294
titleWidth: $titleWidth,
295-
placeholder: "",
295+
placeholder: Localization.cityHint,
296296
text: $fields.city,
297297
symbol: nil,
298298
fieldAlignment: .leading,
@@ -301,7 +301,7 @@ struct SingleAddressForm: View {
301301
.padding(.leading, Constants.dividerPadding)
302302
TitleAndTextFieldRow(title: Localization.postcodeField,
303303
titleWidth: $titleWidth,
304-
placeholder: "",
304+
placeholder: Localization.postcodeHint,
305305
text: $fields.postcode,
306306
symbol: nil,
307307
fieldAlignment: .leading,
@@ -334,7 +334,7 @@ struct SingleAddressForm: View {
334334

335335
TitleAndValueRow(title: Localization.countryField,
336336
titleWidth: $titleWidth,
337-
value: .init(placeHolder: Localization.placeholderSelectOption, content: fields.country),
337+
value: .init(placeHolder: Localization.hintSelectOption, content: fields.country),
338338
valueTextAlignment: .leading,
339339
selectionStyle: .disclosure) {
340340
showCountrySelector = true
@@ -355,15 +355,15 @@ struct SingleAddressForm: View {
355355
if showStateFieldAsSelector {
356356
TitleAndValueRow(title: Localization.stateField,
357357
titleWidth: $titleWidth,
358-
value: .init(placeHolder: Localization.placeholderSelectOption, content: fields.state),
358+
value: .init(placeHolder: Localization.hintSelectOption, content: fields.state),
359359
valueTextAlignment: .leading,
360360
selectionStyle: .disclosure) {
361361
showStateSelector = true
362362
}
363363
} else {
364364
TitleAndTextFieldRow(title: Localization.stateField,
365365
titleWidth: $titleWidth,
366-
placeholder: "",
366+
placeholder: Localization.stateHint,
367367
text: $fields.state,
368368
symbol: nil,
369369
fieldAlignment: .leading,
@@ -386,21 +386,28 @@ private enum Localization {
386386
static let detailsSection = NSLocalizedString("DETAILS", comment: "Details section title in the Edit Address Form")
387387

388388
static let firstNameField = NSLocalizedString("First name", comment: "Text field name in Edit Address Form")
389+
static let firstNameHint = NSLocalizedString("Enter Name", comment: "Name field placeholder in Edit Address Form")
389390
static let lastNameField = NSLocalizedString("Last name", comment: "Text field name in Edit Address Form")
391+
static let lastNameHint = NSLocalizedString("Enter Last Name", comment: "Last name field placeholder in Edit Address Form")
390392
static let emailField = NSLocalizedString("Email", comment: "Text field email in Edit Address Form")
393+
static let emailHint = NSLocalizedString("Enter Email", comment: "Email field placeholder in Edit Address Form")
391394
static let phoneField = NSLocalizedString("Phone", comment: "Text field phone in Edit Address Form")
395+
static let phoneHint = NSLocalizedString("Enter Phone", comment: "Phone field placeholder in Edit Address Form")
392396

393397
static let companyField = NSLocalizedString("Company", comment: "Text field company in Edit Address Form")
394398
static let address1Field = NSLocalizedString("Address 1", comment: "Text field address 1 in Edit Address Form")
399+
static let address1Hint = NSLocalizedString("Enter Address", comment: "Address field placeholder in Edit Address Form")
395400
static let address2Field = NSLocalizedString("Address 2", comment: "Text field address 2 in Edit Address Form")
396401
static let cityField = NSLocalizedString("City", comment: "Text field city in Edit Address Form")
402+
static let cityHint = NSLocalizedString("Enter City", comment: "City field placeholder in Edit Address Form")
397403
static let postcodeField = NSLocalizedString("Postcode", comment: "Text field postcode in Edit Address Form")
404+
static let postcodeHint = NSLocalizedString("Enter Postcode", comment: "Postcode field placeholder in Edit Address Form")
398405
static let countryField = NSLocalizedString("Country", comment: "Text field country in Edit Address Form")
399406
static let stateField = NSLocalizedString("State", comment: "Text field state in Edit Address Form")
407+
static let stateHint = NSLocalizedString("Enter State", comment: "State field placeholder in Edit Address Form")
400408

401-
static let placeholderRequired = NSLocalizedString("Required", comment: "Text field placeholder in Edit Address Form")
402-
static let placeholderOptional = NSLocalizedString("Optional", comment: "Text field placeholder in Edit Address Form")
403-
static let placeholderSelectOption = NSLocalizedString("Select an option", comment: "Text field placeholder in Edit Address Form")
409+
static let hintOptional = NSLocalizedString("Optional", comment: "Text field placeholder in Edit Address Form")
410+
static let hintSelectOption = NSLocalizedString("Select an option", comment: "Text field placeholder in Edit Address Form")
404411
}
405412

406413
#if DEBUG

0 commit comments

Comments
 (0)