From cf1725788183f2da895d41ab5af5619a63d809c2 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Tue, 21 Oct 2014 02:28:12 +1100 Subject: [PATCH] League => Competition --- includes/admin/class-sp-admin-menus.php | 4 ++-- .../admin/class-sp-admin-permalink-settings.php | 2 +- includes/admin/class-sp-admin-sample-data.php | 2 +- .../admin/importers/class-sp-event-importer.php | 2 +- .../admin/importers/class-sp-player-importer.php | 2 +- .../admin/importers/class-sp-staff-importer.php | 2 +- .../admin/importers/class-sp-team-importer.php | 2 +- .../post-types/class-sp-admin-cpt-calendar.php | 2 +- .../admin/post-types/class-sp-admin-cpt-event.php | 15 ++++++--------- .../admin/post-types/class-sp-admin-cpt-list.php | 2 +- .../post-types/class-sp-admin-cpt-player.php | 2 +- .../admin/post-types/class-sp-admin-cpt-staff.php | 2 +- .../admin/post-types/class-sp-admin-cpt-table.php | 2 +- .../admin/post-types/class-sp-admin-cpt-team.php | 2 +- .../class-sp-meta-box-calendar-data.php | 2 +- .../class-sp-meta-box-calendar-details.php | 2 +- .../meta-boxes/class-sp-meta-box-list-details.php | 2 +- .../class-sp-meta-box-player-details.php | 4 ++-- .../class-sp-meta-box-staff-details.php | 4 ++-- .../class-sp-meta-box-table-details.php | 2 +- .../meta-boxes/class-sp-meta-box-team-details.php | 7 +++---- .../meta-boxes/class-sp-meta-box-team-lists.php | 2 +- .../meta-boxes/class-sp-meta-box-team-tables.php | 2 +- .../admin/settings/class-sp-settings-status.php | 2 +- includes/admin/views/html-admin-page-status.php | 2 +- includes/class-sp-formats.php | 2 +- includes/class-sp-post-types.php | 8 ++++---- includes/sp-core-functions.php | 2 +- templates/event-list.php | 2 +- wpml-config.xml | 2 +- 30 files changed, 43 insertions(+), 47 deletions(-) diff --git a/includes/admin/class-sp-admin-menus.php b/includes/admin/class-sp-admin-menus.php index a285f21e..5c77bc0e 100755 --- a/includes/admin/class-sp-admin-menus.php +++ b/includes/admin/class-sp-admin-menus.php @@ -67,7 +67,7 @@ class SP_Admin_Menus { * Add menu item */ public function leagues_menu() { - add_submenu_page( 'sportspress', __( 'Leagues', 'sportspress' ), __( 'Leagues', 'sportspress' ), 'manage_sportspress', 'edit-tags.php?taxonomy=sp_league'); + add_submenu_page( 'sportspress', __( 'Competitions', 'sportspress' ), __( 'Competitions', 'sportspress' ), 'manage_sportspress', 'edit-tags.php?taxonomy=sp_league'); } /** @@ -271,7 +271,7 @@ class SP_Admin_Menus { } public function remove_leagues( $arr = array() ) { - return $arr[0] != __( 'Leagues', 'sportspress' ); + return $arr[0] != __( 'Competitions', 'sportspress' ); } public function remove_positions( $arr = array() ) { diff --git a/includes/admin/class-sp-admin-permalink-settings.php b/includes/admin/class-sp-admin-permalink-settings.php index 7b144519..d991e6b6 100644 --- a/includes/admin/class-sp-admin-permalink-settings.php +++ b/includes/admin/class-sp-admin-permalink-settings.php @@ -26,7 +26,7 @@ class SP_Admin_Permalink_Settings { array( 'venue', __( 'Venues', 'sportspress' ) ), array( 'calendar', __( 'Calendars', 'sportspress' ) ), array( 'team', __( 'Teams', 'sportspress' ) ), - array( 'league', __( 'Leagues', 'sportspress' ) ), + array( 'league', __( 'Competitions', 'sportspress' ) ), array( 'season', __( 'Seasons', 'sportspress' ) ), array( 'table', __( 'League Tables', 'sportspress' ) ), array( 'player', __( 'Players', 'sportspress' ) ), diff --git a/includes/admin/class-sp-admin-sample-data.php b/includes/admin/class-sp-admin-sample-data.php index 5fb35e2a..a6dee501 100644 --- a/includes/admin/class-sp-admin-sample-data.php +++ b/includes/admin/class-sp-admin-sample-data.php @@ -40,7 +40,7 @@ class SP_Admin_Sample_Data { // Terms to insert $taxonomies = array(); - // Leagues + // Competitions $taxonomies['sp_league'] = array( _x( 'Primary League', 'example', 'sportspress' ), _x( 'Secondary League', 'example', 'sportspress' ) ); // Seasons diff --git a/includes/admin/importers/class-sp-event-importer.php b/includes/admin/importers/class-sp-event-importer.php index aa021aa3..62c28e15 100644 --- a/includes/admin/importers/class-sp-event-importer.php +++ b/includes/admin/importers/class-sp-event-importer.php @@ -475,7 +475,7 @@ if ( class_exists( 'WP_Importer' ) ) { -
+
'sp_league', diff --git a/includes/admin/importers/class-sp-player-importer.php b/includes/admin/importers/class-sp-player-importer.php index db6cc91d..fe3aedf7 100644 --- a/includes/admin/importers/class-sp-player-importer.php +++ b/includes/admin/importers/class-sp-player-importer.php @@ -27,7 +27,7 @@ if ( class_exists( 'WP_Importer' ) ) { 'post_title' => __( 'Name', 'sportspress' ), 'sp_position' => __( 'Positions', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), - 'sp_league' => __( 'Leagues', 'sportspress' ), + 'sp_league' => __( 'Competitions', 'sportspress' ), 'sp_season' => __( 'Seasons', 'sportspress' ), 'sp_nationality' => __( 'Nationality', 'sportspress' ), ); diff --git a/includes/admin/importers/class-sp-staff-importer.php b/includes/admin/importers/class-sp-staff-importer.php index 2d3e0f75..b94d1c8e 100644 --- a/includes/admin/importers/class-sp-staff-importer.php +++ b/includes/admin/importers/class-sp-staff-importer.php @@ -26,7 +26,7 @@ if ( class_exists( 'WP_Importer' ) ) { 'post_title' => __( 'Name', 'sportspress' ), 'sp_role' => __( 'Roles', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), - 'sp_league' => __( 'Leagues', 'sportspress' ), + 'sp_league' => __( 'Competitions', 'sportspress' ), 'sp_season' => __( 'Seasons', 'sportspress' ), 'sp_nationality' => __( 'Nationality', 'sportspress' ), ); diff --git a/includes/admin/importers/class-sp-team-importer.php b/includes/admin/importers/class-sp-team-importer.php index 0aa97d5c..0f50b207 100644 --- a/includes/admin/importers/class-sp-team-importer.php +++ b/includes/admin/importers/class-sp-team-importer.php @@ -24,7 +24,7 @@ if ( class_exists( 'WP_Importer' ) ) { $this->import_label = __( 'Import Teams', 'sportspress' ); $this->columns = array( 'post_title' => __( 'Name', 'sportspress' ), - 'sp_league' => __( 'Leagues', 'sportspress' ), + 'sp_league' => __( 'Competitions', 'sportspress' ), 'sp_season' => __( 'Seasons', 'sportspress' ), 'sp_url' => __( 'Site URL', 'sportspress' ), 'sp_abbreviation' => __( 'Abbreviation', 'sportspress' ), diff --git a/includes/admin/post-types/class-sp-admin-cpt-calendar.php b/includes/admin/post-types/class-sp-admin-cpt-calendar.php index c2891f9f..edfc1aa6 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-calendar.php +++ b/includes/admin/post-types/class-sp-admin-cpt-calendar.php @@ -46,7 +46,7 @@ class SP_Admin_CPT_Calendar extends SP_Admin_CPT { $columns = array_merge( array( 'cb' => '', 'title' => __( 'Title', 'sportspress' ), - 'sp_league' => __( 'League', 'sportspress' ), + 'sp_league' => __( 'Competition', 'sportspress' ), 'sp_season' => __( 'Season', 'sportspress' ), 'sp_venue' => __( 'Venue', 'sportspress' ), 'sp_team' => __( 'Team', 'sportspress' ), diff --git a/includes/admin/post-types/class-sp-admin-cpt-event.php b/includes/admin/post-types/class-sp-admin-cpt-event.php index df50a1a8..e45a470f 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-event.php +++ b/includes/admin/post-types/class-sp-admin-cpt-event.php @@ -92,7 +92,7 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT { 'date' => __( 'Date', 'sportspress' ), 'sp_time' => __( 'Time', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), - 'sp_league' => __( 'League', 'sportspress' ), + 'sp_league' => __( 'Competition', 'sportspress' ), 'sp_season' => __( 'Season', 'sportspress' ), 'sp_venue' => __( 'Venue', 'sportspress' ), ), $existing_columns, array( @@ -109,14 +109,11 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT { switch ( $column ): case 'sp_format': $format = get_post_meta( $post_id, 'sp_format', true ); - switch ( $format ): - case 'league': - echo ''; - break; - case 'friendly': - echo ''; - break; - endswitch; + $formats = new SP_Formats(); + $event_formats = $formats->event; + if ( array_key_exists( $format, $event_formats ) ): + echo ''; + endif; break; case 'sp_time': echo get_post_time( 'H:i', false, $post_id, true ); diff --git a/includes/admin/post-types/class-sp-admin-cpt-list.php b/includes/admin/post-types/class-sp-admin-cpt-list.php index bede9d9b..3ef5d7b2 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-list.php +++ b/includes/admin/post-types/class-sp-admin-cpt-list.php @@ -46,7 +46,7 @@ class SP_Admin_CPT_List extends SP_Admin_CPT { $columns = array_merge( array( 'cb' => '', 'title' => __( 'Title', 'sportspress' ), - 'sp_league' => __( 'League', 'sportspress' ), + 'sp_league' => __( 'Competition', 'sportspress' ), 'sp_season' => __( 'Season', 'sportspress' ), 'sp_team' => __( 'Team', 'sportspress' ), 'sp_player' => __( 'Players', 'sportspress' ), diff --git a/includes/admin/post-types/class-sp-admin-cpt-player.php b/includes/admin/post-types/class-sp-admin-cpt-player.php index 5ab82cf1..dd9e203f 100755 --- a/includes/admin/post-types/class-sp-admin-cpt-player.php +++ b/includes/admin/post-types/class-sp-admin-cpt-player.php @@ -65,7 +65,7 @@ class SP_Admin_CPT_Player extends SP_Admin_CPT { 'title' => null, 'sp_position' => __( 'Positions', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), - 'sp_league' => __( 'Leagues', 'sportspress' ), + 'sp_league' => __( 'Competitions', 'sportspress' ), 'sp_season' => __( 'Seasons', 'sportspress' ), ), $existing_columns, array( 'title' => __( 'Name', 'sportspress' ) diff --git a/includes/admin/post-types/class-sp-admin-cpt-staff.php b/includes/admin/post-types/class-sp-admin-cpt-staff.php index bed88e9c..2cf32ec5 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-staff.php +++ b/includes/admin/post-types/class-sp-admin-cpt-staff.php @@ -64,7 +64,7 @@ class SP_Admin_CPT_Staff extends SP_Admin_CPT { 'title' => null, 'sp_role' => __( 'Role', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), - 'sp_league' => __( 'Leagues', 'sportspress' ), + 'sp_league' => __( 'Competitions', 'sportspress' ), 'sp_season' => __( 'Seasons', 'sportspress' ), ), $existing_columns, array( 'title' => __( 'Name', 'sportspress' ) diff --git a/includes/admin/post-types/class-sp-admin-cpt-table.php b/includes/admin/post-types/class-sp-admin-cpt-table.php index 963eb706..896d9fd7 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-table.php +++ b/includes/admin/post-types/class-sp-admin-cpt-table.php @@ -46,7 +46,7 @@ class SP_Admin_CPT_Table extends SP_Admin_CPT { $columns = array_merge( array( 'cb' => '', 'title' => __( 'Title', 'sportspress' ), - 'sp_league' => __( 'League', 'sportspress' ), + 'sp_league' => __( 'Competition', 'sportspress' ), 'sp_season' => __( 'Season', 'sportspress' ), 'sp_team' => __( 'Teams', 'sportspress' ), ), $existing_columns ); diff --git a/includes/admin/post-types/class-sp-admin-cpt-team.php b/includes/admin/post-types/class-sp-admin-cpt-team.php index 23e3811c..d6d548c1 100644 --- a/includes/admin/post-types/class-sp-admin-cpt-team.php +++ b/includes/admin/post-types/class-sp-admin-cpt-team.php @@ -64,7 +64,7 @@ class SP_Admin_CPT_Team extends SP_Admin_CPT { 'title' => null, 'sp_url' => __( 'URL', 'sportspress' ), 'sp_abbreviation' => __( 'Abbreviation', 'sportspress' ), - 'sp_league' => __( 'Leagues', 'sportspress' ), + 'sp_league' => __( 'Competitions', 'sportspress' ), 'sp_season' => __( 'Seasons', 'sportspress' ), ), $existing_columns, array( 'title' => __( 'Team', 'sportspress' ), diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php index 7acdd754..f5b13539 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php @@ -67,7 +67,7 @@ class SP_Meta_Box_Calendar_Data { diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php index cc355c1c..1613c9e0 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php @@ -50,7 +50,7 @@ class SP_Meta_Box_Calendar_Details { sp_dropdown_dates( $args ); ?>

-

+

ID, 'sp_order', true ); ?>

-

+

-

+

'sp_league', 'name' => 'tax_input[sp_league][]', 'selected' => $league_ids, 'values' => 'term_id', - 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', 'sportspress' ) ), + 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Competitions', 'sportspress' ) ), 'class' => 'widefat', 'property' => 'multiple', 'chosen' => true, diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php index 791ccc3c..e127e123 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php @@ -111,14 +111,14 @@ class SP_Meta_Box_Staff_Details { sp_dropdown_pages( $args ); ?>

-

+

'sp_league', 'name' => 'tax_input[sp_league][]', 'selected' => $league_ids, 'values' => 'term_id', - 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', 'sportspress' ) ), + 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Competitions', 'sportspress' ) ), 'class' => 'widefat', 'property' => 'multiple', 'chosen' => true, diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php index 8eae3583..ee0c72d3 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-details.php @@ -24,7 +24,7 @@ class SP_Meta_Box_Table_Details { $season_id = sp_get_the_term_id( $post->ID, 'sp_season', 0 ); ?>

-

+

ID, 'sp_abbreviation', true ); $url = get_post_meta( $post->ID, 'sp_url', true ); ?> -

+

'sp_league', 'name' => 'tax_input[sp_league][]', 'selected' => $league_ids, 'values' => 'term_id', - 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', 'sportspress' ) ), + 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Competitions', 'sportspress' ) ), 'class' => 'widefat', 'property' => 'multiple', 'chosen' => true, @@ -69,7 +69,7 @@ class SP_Meta_Box_Team_Details { 'name' => 'tax_input[sp_season][]', 'selected' => $season_ids, 'values' => 'term_id', - 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', 'sportspress' ) ), + 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Competitions', 'sportspress' ) ), 'class' => 'widefat', 'property' => 'multiple', 'chosen' => true, @@ -100,7 +100,6 @@ class SP_Meta_Box_Team_Details {

-

- + diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-tables.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-tables.php index 931d383b..783e394f 100644 --- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-tables.php +++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-tables.php @@ -58,7 +58,7 @@ class SP_Meta_Box_Team_Tables { - + diff --git a/includes/admin/settings/class-sp-settings-status.php b/includes/admin/settings/class-sp-settings-status.php index 04b40a8e..36a0c0b9 100644 --- a/includes/admin/settings/class-sp-settings-status.php +++ b/includes/admin/settings/class-sp-settings-status.php @@ -329,7 +329,7 @@ class SP_Settings_Status extends SP_Settings_Page { - : + : 0 ) ); diff --git a/includes/admin/views/html-admin-page-status.php b/includes/admin/views/html-admin-page-status.php index ae03ddf2..b2bc9b94 100644 --- a/includes/admin/views/html-admin-page-status.php +++ b/includes/admin/views/html-admin-page-status.php @@ -293,7 +293,7 @@ - : + : 0 ) ); diff --git a/includes/class-sp-formats.php b/includes/class-sp-formats.php index 869faec8..588af539 100644 --- a/includes/class-sp-formats.php +++ b/includes/class-sp-formats.php @@ -24,7 +24,7 @@ class SP_Formats { public function __construct() { $this->data = apply_filters( 'sportspress_formats', array( 'event' => array( - 'league' => __( 'League', 'sportspress' ), + 'league' => __( 'Competition', 'sportspress' ), 'friendly' => __( 'Friendly', 'sportspress' ), ), 'calendar' => array( diff --git a/includes/class-sp-post-types.php b/includes/class-sp-post-types.php index af0c8fcd..04835735 100644 --- a/includes/class-sp-post-types.php +++ b/includes/class-sp-post-types.php @@ -33,10 +33,10 @@ class SP_Post_types { do_action( 'sportspress_register_taxonomy' ); $labels = array( - 'name' => __( 'Leagues', 'sportspress' ), - 'singular_name' => __( 'League', 'sportspress' ), + 'name' => __( 'Competitions', 'sportspress' ), + 'singular_name' => __( 'Competition', 'sportspress' ), 'all_items' => __( 'All', 'sportspress' ), - 'edit_item' => __( 'Edit League', 'sportspress' ), + 'edit_item' => __( 'Edit Competition', 'sportspress' ), 'view_item' => __( 'View', 'sportspress' ), 'update_item' => __( 'Update', 'sportspress' ), 'add_new_item' => __( 'Add New', 'sportspress' ), @@ -47,7 +47,7 @@ class SP_Post_types { 'not_found' => __( 'No results found.', 'sportspress' ), ); $args = array( - 'label' => __( 'Leagues', 'sportspress' ), + 'label' => __( 'Competitions', 'sportspress' ), 'labels' => $labels, 'public' => true, 'show_in_nav_menus' => false, diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php index be874ef4..df71ab3c 100644 --- a/includes/sp-core-functions.php +++ b/includes/sp-core-functions.php @@ -1089,7 +1089,7 @@ function sp_get_text_options() { __( 'Date', 'sportspress' ), __( 'Details', 'sportspress' ), __( 'Event', 'sportspress' ), - __( 'League', 'sportspress' ), + __( 'Competition', 'sportspress' ), __( 'Nationality', 'sportspress' ), __( 'Outcome', 'sportspress' ), __( 'Past Teams', 'sportspress' ), diff --git a/templates/event-list.php b/templates/event-list.php index 5d3c61d1..62c3f625 100644 --- a/templates/event-list.php +++ b/templates/event-list.php @@ -77,7 +77,7 @@ endif; echo '' . __( 'Away', 'sportspress' ) . ''; if ( $usecolumns == null || in_array( 'league', $usecolumns ) ) - echo '' . __( 'League', 'sportspress' ) . ''; + echo '' . __( 'Competition', 'sportspress' ) . ''; if ( $usecolumns == null || in_array( 'season', $usecolumns ) ) echo '' . __( 'Season', 'sportspress' ) . ''; diff --git a/wpml-config.xml b/wpml-config.xml index de3fb1b7..d7e825db 100644 --- a/wpml-config.xml +++ b/wpml-config.xml @@ -2,12 +2,12 @@ + -