Skip to content

Commit

Permalink
state placeholders. closes #7729
Browse files Browse the repository at this point in the history
  • Loading branch information
@jameskoster
jameskoster committed Mar 16, 2015
1 parent e7429e2 commit 90a7878
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions includes/class-wc-countries.php
View file
Expand Up @@ -520,7 +520,7 @@ public function get_default_address_fields() {
'state' => array(
'type' => 'state',
'label' => __( 'State / County', 'woocommerce' ),
'placeholder' => __( 'State / County', 'woocommerce' ),
'placeholder' => __( 'Make a selection', 'woocommerce' ),
'required' => true,
'class' => array( 'form-row-first', 'address-field' ),
'validate' => array( 'state' )
Expand Down Expand Up @@ -556,6 +556,7 @@ public function get_country_locale_field_selectors() {
/**
* Get country locale settings.
* @return array
* @todo [2.4] Check select2 4.0.0 compatibility with `placeholder` attribute and uncomment relevant lines. https://github.com/woothemes/woocommerce/issues/7729
*/
public function get_country_locale() {
if ( ! $this->locale ) {
Expand Down Expand Up @@ -590,7 +591,7 @@ public function get_country_locale() {
),
'state' => array(
'label' => __( 'State', 'woocommerce' ),
'placeholder' => __( 'State', 'woocommerce' ),
//'placeholder' => __( 'State', 'woocommerce' ),
)
),
'BD' => array(
Expand All @@ -599,15 +600,15 @@ public function get_country_locale() {
),
'state' => array(
'label' => __( 'District', 'woocommerce' ),
'placeholder' => __( 'District', 'woocommerce' ),
//'placeholder' => __( 'District', 'woocommerce' ),
)
),
'BE' => array(
'postcode_before_city' => true,
'state' => array(
'required' => false,
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
),
),
'BI' => array(
Expand All @@ -630,14 +631,14 @@ public function get_country_locale() {
'CA' => array(
'state' => array(
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'CH' => array(
'postcode_before_city' => true,
'state' => array(
'label' => __( 'Canton', 'woocommerce' ),
'placeholder' => __( 'Canton', 'woocommerce' ),
//'placeholder' => __( 'Canton', 'woocommerce' ),
'required' => false
)
),
Expand All @@ -651,13 +652,13 @@ public function get_country_locale() {
),
'state' => array(
'label' => __( 'Region', 'woocommerce' ),
'placeholder' => __( 'Region', 'woocommerce' )
//'placeholder' => __( 'Region', 'woocommerce' )
)
),
'CN' => array(
'state' => array(
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'CO' => array(
Expand Down Expand Up @@ -710,19 +711,19 @@ public function get_country_locale() {
),
'state' => array(
'label' => __( 'Region', 'woocommerce' ),
'placeholder' => __( 'Region', 'woocommerce' ),
//'placeholder' => __( 'Region', 'woocommerce' ),
)
),
'HU' => array(
'state' => array(
'label' => __( 'County', 'woocommerce' ),
'placeholder' => __( 'County', 'woocommerce' ),
//'placeholder' => __( 'County', 'woocommerce' ),
)
),
'ID' => array(
'state' => array(
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'IS' => array(
Expand All @@ -742,7 +743,7 @@ public function get_country_locale() {
'state' => array(
'required' => true,
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'JP' => array(
Expand All @@ -760,7 +761,7 @@ public function get_country_locale() {
'state' => array(
'required' => false,
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'NZ' => array(
Expand All @@ -778,7 +779,7 @@ public function get_country_locale() {
'postcode_before_city' => true,
'state' => array(
'label' => __( 'District', 'woocommerce' ),
'placeholder' => __( 'District', 'woocommerce' ),
//'placeholder' => __( 'District', 'woocommerce' ),
),
'postcode' => array(
'required' => false,
Expand Down Expand Up @@ -822,14 +823,14 @@ public function get_country_locale() {
'postcode_before_city' => true,
'state' => array(
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'LI' => array(
'postcode_before_city' => true,
'state' => array(
'label' => __( 'Municipality', 'woocommerce' ),
'placeholder' => __( 'Municipality', 'woocommerce' ),
//'placeholder' => __( 'Municipality', 'woocommerce' ),
'required' => false
)
),
Expand All @@ -848,7 +849,7 @@ public function get_country_locale() {
'postcode_before_city' => true,
'state' => array(
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'US' => array(
Expand All @@ -858,7 +859,7 @@ public function get_country_locale() {
),
'state' => array(
'label' => __( 'State', 'woocommerce' ),
'placeholder' => __( 'State', 'woocommerce' ),
//'placeholder' => __( 'State', 'woocommerce' ),
)
),
'GB' => array(
Expand All @@ -868,7 +869,7 @@ public function get_country_locale() {
),
'state' => array(
'label' => __( 'County', 'woocommerce' ),
'placeholder' => __( 'County', 'woocommerce' ),
//'placeholder' => __( 'County', 'woocommerce' ),
'required' => false
)
),
Expand All @@ -895,7 +896,7 @@ public function get_country_locale() {
'ZA' => array(
'state' => array(
'label' => __( 'Province', 'woocommerce' ),
'placeholder' => __( 'Province', 'woocommerce' ),
//'placeholder' => __( 'Province', 'woocommerce' ),
)
),
'ZW' => array(
Expand All @@ -908,7 +909,7 @@ public function get_country_locale() {

$this->locale = array_intersect_key( $this->locale, array_merge( $this->get_allowed_countries(), $this->get_shipping_countries() ) );

// Default Locale Can be filters to override fields in get_address_fields().
// Default Locale Can be filtered to override fields in get_address_fields().
// Countries with no specific locale will use default.
$this->locale['default'] = apply_filters('woocommerce_get_country_locale_default', $this->get_default_address_fields() );

Expand Down

0 comments on commit 90a7878

Please sign in to comment.