|
@@ -61,72 +61,37 @@ function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false) {
|
61
|
61
|
$Return = '';
|
62
|
62
|
|
63
|
63
|
if ($Years > 0 && $Levels > 0) {
|
64
|
|
- if ($Years > 1) {
|
65
|
|
- $Return .= "$Years years";
|
66
|
|
- } else {
|
67
|
|
- $Return .= "$Years year";
|
68
|
|
- }
|
|
64
|
+ $Return .= "$Years year".(($Years > 1) ? 's' : '' );
|
69
|
65
|
$Levels--;
|
70
|
66
|
}
|
71
|
67
|
|
72
|
68
|
if ($Months > 0 && $Levels > 0) {
|
73
|
|
- if ($Return != '') {
|
74
|
|
- $Return .= ', ';
|
75
|
|
- }
|
76
|
|
- if ($Months > 1) {
|
77
|
|
- $Return .= "$Months months";
|
78
|
|
- } else {
|
79
|
|
- $Return .= "$Months month";
|
80
|
|
- }
|
|
69
|
+ $Return .= ($Return != '') ? ', ' : '';
|
|
70
|
+ $Return .= "$Months month".(($Months > 1) ? 's' : '');
|
81
|
71
|
$Levels--;
|
82
|
72
|
}
|
83
|
73
|
|
84
|
74
|
if ($Weeks > 0 && $Levels > 0) {
|
85
|
|
- if ($Return != '') {
|
86
|
|
- $Return .= ', ';
|
87
|
|
- }
|
88
|
|
- if ($Weeks > 1) {
|
89
|
|
- $Return .= "$Weeks weeks";
|
90
|
|
- } else {
|
91
|
|
- $Return .= "$Weeks week";
|
92
|
|
- }
|
|
75
|
+ $Return .= ($Return != '') ? ', ' : '';
|
|
76
|
+ $Return .= "$Weeks week".(($Weeks > 1) ? 's' : '');
|
93
|
77
|
$Levels--;
|
94
|
78
|
}
|
95
|
79
|
|
96
|
80
|
if ($Days > 0 && $Levels > 0) {
|
97
|
|
- if ($Return != '') {
|
98
|
|
- $Return .= ', ';
|
99
|
|
- }
|
100
|
|
- if ($Days > 1) {
|
101
|
|
- $Return .= "$Days days";
|
102
|
|
- } else {
|
103
|
|
- $Return .= "$Days day";
|
104
|
|
- }
|
|
81
|
+ $Return .= ($Return != '') ? ', ' : '';
|
|
82
|
+ $Return .= "$Days day".(($Days > 1) ? 's' : '');
|
105
|
83
|
$Levels--;
|
106
|
84
|
}
|
107
|
85
|
|
108
|
86
|
if ($Hours > 0 && $Levels > 0) {
|
109
|
|
- if ($Return != '') {
|
110
|
|
- $Return .= ', ';
|
111
|
|
- }
|
112
|
|
- if ($Hours > 1) {
|
113
|
|
- $Return .= "$Hours hours";
|
114
|
|
- } else {
|
115
|
|
- $Return .= "$Hours hour";
|
116
|
|
- }
|
|
87
|
+ $Return .= ($Return != '') ? ', ' : '';
|
|
88
|
+ $Return .= "$Hours hour".(($Hours > 1) ? 's' : '');
|
117
|
89
|
$Levels--;
|
118
|
90
|
}
|
119
|
91
|
|
120
|
92
|
if ($Minutes > 0 && $Levels > 0) {
|
121
|
|
- if ($Return != '') {
|
122
|
|
- $Return .= ' and ';
|
123
|
|
- }
|
124
|
|
- if ($Minutes > 1) {
|
125
|
|
- $Return .= "$Minutes mins";
|
126
|
|
- } else {
|
127
|
|
- $Return .= "$Minutes min";
|
128
|
|
- }
|
129
|
|
- $Levels--;
|
|
93
|
+ $Return .= ($Return != '') ? ' and ' : '';
|
|
94
|
+ $Return .= "$Minutes min".(($Minutes > 1) ? 's' : '');
|
130
|
95
|
}
|
131
|
96
|
|
132
|
97
|
if ($Return == '') {
|