diff --git a/dummy-data/players-sample.csv b/dummy-data/players-sample.csv
index e8af1238..b43df364 100644
--- a/dummy-data/players-sample.csv
+++ b/dummy-data/players-sample.csv
@@ -1,4 +1,4 @@
-Number,Name,Positions,Teams,Competitions,Seasons,Nationality
+Number,Name,Positions,Teams,Leagues,Seasons,Nationality
1,Joe Allen,Goalkeeper,Eagles,Primary League|Secondary League,2014,aus
3,Steven Gerrard,Defender,Kangaroos,Primary League,2014|2013,usa
5,Daniel Sturridge,Midfielder|Forward,Sharks,Primary League|Secondary League,2014|2013,eng
diff --git a/dummy-data/staff-sample.csv b/dummy-data/staff-sample.csv
index 8a73bdf6..53702813 100644
--- a/dummy-data/staff-sample.csv
+++ b/dummy-data/staff-sample.csv
@@ -1,4 +1,4 @@
-Name,Jobs,Teams,Competitions,Seasons,Nationality
+Name,Jobs,Teams,Leagues,Seasons,Nationality
Bobby Brown,Coach,Eagles,Primary League|Secondary League,2014,aus
Charles Johnson,Assistant Coach,Kangaroos,Primary League,2014,eng
Matt Smith,Waterboy,Sharks,Primary League|Secondary League,2013|2014,aus
diff --git a/dummy-data/teams-sample.csv b/dummy-data/teams-sample.csv
index bf8d48f9..52264a75 100644
--- a/dummy-data/teams-sample.csv
+++ b/dummy-data/teams-sample.csv
@@ -1,4 +1,4 @@
-Name,Competitions,Seasons,Site URL,Abbreviation,Home
+Name,Leagues,Seasons,Site URL,Abbreviation,Home
Eagles,Primary League|Secondary League,2014,http://tboy.co/eagles,EAGLES,Little Park
Sharks,Primary League|Secondary League,2014|2013,http://tboy.co/sharks,SHARKS
Kangaroos,Primary League,2014|2013,http://tboy.co/roos,ROOS,Big Stadium
\ No newline at end of file
diff --git a/includes/admin/class-sp-admin-menus.php b/includes/admin/class-sp-admin-menus.php
index 1cbab568..4cae6bdc 100755
--- a/includes/admin/class-sp-admin-menus.php
+++ b/includes/admin/class-sp-admin-menus.php
@@ -58,7 +58,7 @@ class SP_Admin_Menus {
* Add menu item
*/
public function leagues_menu() {
- add_submenu_page( 'sportspress', __( 'Competitions', 'sportspress' ), __( 'Competitions', 'sportspress' ), 'manage_sportspress', 'edit-tags.php?taxonomy=sp_league');
+ add_submenu_page( 'sportspress', __( 'Leagues', 'sportspress' ), __( 'Leagues', 'sportspress' ), 'manage_sportspress', 'edit-tags.php?taxonomy=sp_league');
}
/**
@@ -195,26 +195,26 @@ class SP_Admin_Menus {
$menu[ $separator_position ] = array( '', 'read', 'separator-sportspress', '', 'wp-menu-separator sportspress' );
endif;
- // Remove "Competitions" and "Seasons" links from Events submenu
+ // Remove "Leagues" and "Seasons" links from Events submenu
if ( isset( $submenu['edit.php?post_type=sp_event'] ) ):
$submenu['edit.php?post_type=sp_event'] = array_filter( $submenu['edit.php?post_type=sp_event'], array( $this, 'remove_leagues' ) );
$submenu['edit.php?post_type=sp_event'] = array_filter( $submenu['edit.php?post_type=sp_event'], array( $this, 'remove_seasons' ) );
endif;
- // Remove "Venues", "Competitions" and "Seasons" links from Teams submenu
+ // Remove "Venues", "Leagues" and "Seasons" links from Teams submenu
if ( isset( $submenu['edit.php?post_type=sp_team'] ) ):
$submenu['edit.php?post_type=sp_team'] = array_filter( $submenu['edit.php?post_type=sp_team'], array( $this, 'remove_venues' ) );
$submenu['edit.php?post_type=sp_team'] = array_filter( $submenu['edit.php?post_type=sp_team'], array( $this, 'remove_leagues' ) );
$submenu['edit.php?post_type=sp_team'] = array_filter( $submenu['edit.php?post_type=sp_team'], array( $this, 'remove_seasons' ) );
endif;
- // Remove "Competitions" and "Seasons" links from Players submenu
+ // Remove "Leagues" and "Seasons" links from Players submenu
if ( isset( $submenu['edit.php?post_type=sp_player'] ) ):
$submenu['edit.php?post_type=sp_player'] = array_filter( $submenu['edit.php?post_type=sp_player'], array( $this, 'remove_leagues' ) );
$submenu['edit.php?post_type=sp_player'] = array_filter( $submenu['edit.php?post_type=sp_player'], array( $this, 'remove_seasons' ) );
endif;
- // Remove "Competitions" and "Seasons" links from Staff submenu
+ // Remove "Leagues" and "Seasons" links from Staff submenu
if ( isset( $submenu['edit.php?post_type=sp_staff'] ) ):
$submenu['edit.php?post_type=sp_staff'] = array_filter( $submenu['edit.php?post_type=sp_staff'], array( $this, 'remove_leagues' ) );
$submenu['edit.php?post_type=sp_staff'] = array_filter( $submenu['edit.php?post_type=sp_staff'], array( $this, 'remove_seasons' ) );
@@ -250,7 +250,7 @@ class SP_Admin_Menus {
}
public function remove_leagues( $arr = array() ) {
- return $arr[0] != __( 'Competitions', 'sportspress' );
+ return $arr[0] != __( 'Leagues', '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 50889fa1..b8723471 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', __( 'Competitions', 'sportspress' ) ),
+ array( 'league', __( 'Leagues', '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 5c66a111..2b562187 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();
- // Competitions
+ // Leagues
$taxonomies['sp_league'] = array( _x( 'Primary League', 'example', 'sportspress' ), _x( 'Secondary League', 'example', 'sportspress' ) );
// Seasons
diff --git a/includes/admin/class-sp-admin-setup-wizard.php b/includes/admin/class-sp-admin-setup-wizard.php
index 788cdff8..de0f880e 100644
--- a/includes/admin/class-sp-admin-setup-wizard.php
+++ b/includes/admin/class-sp-admin-setup-wizard.php
@@ -280,7 +280,7 @@ class SP_Admin_Setup_Wizard {
- | |
+ |
|
diff --git a/includes/admin/importers/class-sp-event-importer.php b/includes/admin/importers/class-sp-event-importer.php
index e58e5a9e..ff957cef 100644
--- a/includes/admin/importers/class-sp-event-importer.php
+++ b/includes/admin/importers/class-sp-event-importer.php
@@ -479,7 +479,7 @@ if ( class_exists( 'WP_Importer' ) ) {
-
|
+
|
'sp_league',
diff --git a/includes/admin/importers/class-sp-fixture-importer.php b/includes/admin/importers/class-sp-fixture-importer.php
index 57e6495d..55ab8af3 100644
--- a/includes/admin/importers/class-sp-fixture-importer.php
+++ b/includes/admin/importers/class-sp-fixture-importer.php
@@ -287,7 +287,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 685cd0d2..586b5832 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' => __( 'Competitions', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', '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 5e5f53f7..e46ccd38 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' => __( 'Jobs', 'sportspress' ),
'sp_team' => __( 'Teams', 'sportspress' ),
- 'sp_league' => __( 'Competitions', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', '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 e6d93d09..45d7376e 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' => __( 'Competitions', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', '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 88c589b0..6ec84327 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' => __( 'Competition', 'sportspress' ),
+ 'sp_league' => __( 'League', '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 6334e56b..bcb76cd3 100644
--- a/includes/admin/post-types/class-sp-admin-cpt-event.php
+++ b/includes/admin/post-types/class-sp-admin-cpt-event.php
@@ -119,7 +119,7 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT {
'date' => __( 'Date', 'sportspress' ),
'sp_time' => __( 'Time', 'sportspress' ),
'sp_team' => __( 'Teams', 'sportspress' ),
- 'sp_league' => __( 'Competition', 'sportspress' ),
+ 'sp_league' => __( 'League', 'sportspress' ),
'sp_season' => __( 'Season', 'sportspress' ),
'sp_venue' => __( 'Venue', 'sportspress' ),
'sp_day' => __( 'Match Day', 'sportspress' ),
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 c1d2d021..71b98a47 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' => __( 'Competition', 'sportspress' ),
+ 'sp_league' => __( 'League', '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 2e1c7d24..17a6e6e0 100755
--- a/includes/admin/post-types/class-sp-admin-cpt-player.php
+++ b/includes/admin/post-types/class-sp-admin-cpt-player.php
@@ -74,7 +74,7 @@ class SP_Admin_CPT_Player extends SP_Admin_CPT {
'title' => null,
'sp_position' => __( 'Positions', 'sportspress' ),
'sp_team' => __( 'Teams', 'sportspress' ),
- 'sp_league' => __( 'Competitions', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', '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 8e119c42..cfebb719 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' => __( 'Job', 'sportspress' ),
'sp_team' => __( 'Teams', 'sportspress' ),
- 'sp_league' => __( 'Competitions', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', '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 08e680b8..bbd580eb 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' => __( 'Competition', 'sportspress' ),
+ 'sp_league' => __( 'League', '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 d37ba13e..126ec8eb 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' => __( 'Competitions', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', '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-columns.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-columns.php
index 80777c02..a901cb3e 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-columns.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-columns.php
@@ -47,7 +47,7 @@ class SP_Meta_Box_Calendar_Columns {
$columns['results'] = __( 'Results', 'sportspress' );
}
- $columns['league'] = __( 'Competition', 'sportspress' );
+ $columns['league'] = __( 'League', 'sportspress' );
$columns['season'] = __( 'Season', 'sportspress' );
$columns['venue'] = __( 'Venue', 'sportspress' );
$columns['article'] = __( 'Article', '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 f300d70f..a41dfb55 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
@@ -87,7 +87,7 @@ class SP_Meta_Box_Calendar_Data {
|
|
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php
index ea91bec5..f0bd2f7b 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php
@@ -131,14 +131,14 @@ class SP_Meta_Box_Player_Details {
?>
-
+
'sp_league',
'name' => 'tax_input[sp_league][]',
'selected' => $league_ids,
'values' => 'term_id',
- 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Competitions', 'sportspress' ) ),
+ 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', '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 8cb9f199..8829cdd9 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
@@ -119,14 +119,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' ), __( 'Competitions', 'sportspress' ) ),
+ 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', 'sportspress' ) ),
'class' => 'widefat',
'property' => 'multiple',
'chosen' => true,
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-details.php
index 98325dcf..50d165c7 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-details.php
@@ -57,14 +57,14 @@ class SP_Meta_Box_Team_Details {
?>
-
+
'sp_league',
'name' => 'tax_input[sp_league][]',
'selected' => $league_ids,
'values' => 'term_id',
- 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Competitions', 'sportspress' ) ),
+ 'placeholder' => sprintf( __( 'Select %s', 'sportspress' ), __( 'Leagues', 'sportspress' ) ),
'class' => 'widefat',
'property' => 'multiple',
'chosen' => true,
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-lists.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-lists.php
index 681f90ca..c0cdf9f3 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-lists.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-lists.php
@@ -58,7 +58,7 @@ class SP_Meta_Box_Team_Lists {
-
+
|
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-staff.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-staff.php
index 39501343..7896b06e 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-staff.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-team-staff.php
@@ -58,7 +58,7 @@ class SP_Meta_Box_Team_Staff {
|
-
+
|
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 e00e6606..e18fa388 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-players.php b/includes/admin/settings/class-sp-settings-players.php
index 4361d874..13562c9e 100644
--- a/includes/admin/settings/class-sp-settings-players.php
+++ b/includes/admin/settings/class-sp-settings-players.php
@@ -107,7 +107,7 @@ class SP_Settings_Players extends SP_Settings_Page {
),
array(
- 'desc' => __( 'Competitions', 'sportspress' ),
+ 'desc' => __( 'Leagues', 'sportspress' ),
'id' => 'sportspress_player_show_leagues',
'default' => 'no',
'type' => 'checkbox',
diff --git a/includes/admin/settings/class-sp-settings-status.php b/includes/admin/settings/class-sp-settings-status.php
index d916f08e..918f91e9 100644
--- a/includes/admin/settings/class-sp-settings-status.php
+++ b/includes/admin/settings/class-sp-settings-status.php
@@ -331,7 +331,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 39f77f74..6961acbf 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-ajax.php b/includes/class-sp-ajax.php
index 4154cd2a..92db3539 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -218,7 +218,7 @@ class SP_AJAX {
|