-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from cmanon/feature/hide-time
Added Hide Time option;
- Loading branch information
Showing
6 changed files
with
77 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,7 +33,10 @@ public static function get_activities_html( $args ) { | |
if ( ! empty( $activity->start_date_local ) ) { | ||
$unixtime = strtotime( $activity->start_date_local ); | ||
// Translators: Shows something like "On <date> <[went 10 miles] [during 2 hours] [climbing 100 feet]>." | ||
$response .= sprintf( __( 'On %1$s %2$s', 'wp-strava' ), date_i18n( get_option( 'date_format' ), $unixtime ), date_i18n( get_option( 'time_format' ), $unixtime ) ); | ||
$response .= sprintf( __( 'On %1$s %2$s', 'wp-strava' ), | ||
date_i18n( get_option( 'date_format' ), $unixtime ), | ||
self::get_activity_time( $unixtime ) | ||
); | ||
} | ||
|
||
if ( is_numeric( $args['strava_club_id'] ) ) { | ||
|
@@ -54,4 +57,20 @@ public static function get_activities_html( $args ) { | |
$response .= '</ul>'; | ||
return $response; | ||
} | ||
|
||
/** | ||
* Get the activity time, possibly hiding it. | ||
* | ||
* @param int $unixtime | ||
* @return string Formatted time, or empty string depending on hide_time option. | ||
* @author Justin Foell <[email protected]> | ||
* @since 1.7.1 | ||
*/ | ||
public static function get_activity_time( $unixtime ) { | ||
if ( WPStrava::get_instance()->settings->hide_time ) { | ||
return ''; | ||
} | ||
|
||
return date_i18n( get_option( 'time_format' ), $unixtime ); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,6 +125,10 @@ public function register_strava_settings() { | |
add_settings_section( 'strava_options', __( 'Options', 'wp-strava' ), null, 'wp-strava' ); | ||
add_settings_field( 'strava_som', __( 'System of Measurement', 'wp-strava' ), array( $this, 'print_som_input' ), 'wp-strava', 'strava_options' ); | ||
|
||
// Hide Time Option. | ||
register_setting( $this->option_page, 'strava_hide_time', array( $this, 'sanitize_hide_time' ) ); | ||
add_settings_field( 'strava_hide_time', __( 'Hide Activity Time', 'wp-strava' ), array( $this, 'print_hide_time_input' ), 'wp-strava', 'strava_options' ); | ||
|
||
// Clear cache. | ||
register_setting( $this->option_page, 'strava_cache_clear', array( $this, 'sanitize_cache_clear' ) ); | ||
add_settings_section( 'strava_cache', __( 'Cache', 'wp-strava' ), null, 'wp-strava' ); | ||
|
@@ -336,6 +340,33 @@ public function sanitize_som( $som ) { | |
return $som; | ||
} | ||
|
||
/** | ||
* Display the Hide Time Checkbox. | ||
* | ||
* @author Justin Foell <[email protected]> | ||
* @since 1.7.1 | ||
*/ | ||
public function print_hide_time_input() { | ||
?> | ||
<input type="checkbox" id="strava_hide_time" name="strava_hide_time" <?php checked( $this->hide_time, 'on' ); ?>/> | ||
<?php | ||
} | ||
|
||
/** | ||
* Sanitize the Hide Time Checkbox. | ||
* | ||
* @param string $checked 'on' or null. | ||
* @return string 'on' if checked. | ||
* @author Justin Foell <[email protected]> | ||
* @since 1.7.1 | ||
*/ | ||
public function sanitize_hide_time( $checked ) { | ||
if ( 'on' === $checked ) { | ||
return $checked; | ||
} | ||
return null; | ||
} | ||
|
||
public function print_clear_input() { | ||
?> | ||
<input type="checkbox" id="strava_cache_clear" name="strava_cache_clear" /> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ public function test_object() { | |
/** | ||
* Test that 10,000 meters is 6.21 miles using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_distance() { | ||
|
@@ -28,7 +28,7 @@ public function test_distance() { | |
/** | ||
* Test that 6.213712 miles is 10,000.00 meters using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_distance_inverse() { | ||
|
@@ -39,7 +39,7 @@ public function test_distance_inverse() { | |
/** | ||
* Test that 6.705 meters per second is 15.00 mph using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_speed() { | ||
|
@@ -50,7 +50,7 @@ public function test_speed() { | |
/** | ||
* Test that 2.68224 meters per second is a 10:00 minute/mile pace using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_pace() { | ||
|
@@ -61,7 +61,7 @@ public function test_pace() { | |
/** | ||
* Test that 60.96 meters is 200.00 feet using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_elevation() { | ||
|
@@ -72,7 +72,7 @@ public function test_elevation() { | |
/** | ||
* Test that 4805 seconds is 01:20:05 time (H:i:s) using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_time() { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ public function test_object() { | |
/** | ||
* Test that 10,000 meters is 10.00 kilometers using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_distance() { | ||
|
@@ -28,7 +28,7 @@ public function test_distance() { | |
/** | ||
* Test that 42.195 km is 42,195.00 meters using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_distance_inverse() { | ||
|
@@ -39,7 +39,7 @@ public function test_distance_inverse() { | |
/** | ||
* Test that 4.47 meters per second is 16.09 kmh using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_speed() { | ||
|
@@ -50,7 +50,7 @@ public function test_speed() { | |
/** | ||
* Test that 2.2352 meters per second is a 7:27 minute/kilometer pace using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_pace() { | ||
|
@@ -61,7 +61,7 @@ public function test_pace() { | |
/** | ||
* Test that 70 meters is 70.00 meters using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_elevation() { | ||
|
@@ -72,7 +72,7 @@ public function test_elevation() { | |
/** | ||
* Test that 1.66 meters per second is a 1:00 minute/100m pace using both string and float inputs. | ||
* | ||
* @author Justin Foell <justin[email protected]> | ||
* @author Justin Foell <justin@foell.org> | ||
* @since 1.7.1 | ||
*/ | ||
public function test_swimpace() { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters