diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/recordings.ecpp | 4 | ||||
| -rw-r--r-- | pages/setup.ecpp | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index fd23b63..ebd57e0 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -236,8 +236,8 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) { // xgettext:no-c-format string day(FormatDateTime(tr("%a,"), recItem->StartTime())); string dayLen(lexical_cast<string, int>(day.length() - 1) + ".25em;"); - // TRANSLATORS: recording duration format - string duration(LiveSetup().GetShowRecDuration() ? FormatDuration(tr("(%d')"), recItem->Duration()) : ""); + // TRANSLATORS: recording duration format HH:MM + string duration(recItem->Duration() < 0 ? "" : FormatDuration(tr("(%d:%02d)"), recItem->Duration() / 60, recItem->Duration() % 60)); string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : ""); string description(recItem->RecInfo()->Description() ? recItem->RecInfo()->Description() : ""); string hint(tr("Click to view details.")); diff --git a/pages/setup.ecpp b/pages/setup.ecpp index 02576ff..edb88a7 100644 --- a/pages/setup.ecpp +++ b/pages/setup.ecpp @@ -21,7 +21,6 @@ using namespace std; string startscreen; string theme; string localnetmask; - string showRecDuration; string showLogo; string useAjax; string showInfoBox; @@ -65,7 +64,6 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) LiveSetup().SetScheduleDuration(scheduleDuration); LiveSetup().SetStartScreen(startscreen); LiveSetup().SetTheme(theme); - LiveSetup().SetShowRecDuration(!showRecDuration.empty()); LiveSetup().SetShowLogo(!showLogo.empty()); LiveSetup().SetUseAjax(!useAjax.empty()); if (LiveSetup().GetUseAjax()) { @@ -96,7 +94,6 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) startscreen = LiveSetup().GetStartScreen(); theme = LiveSetup().GetTheme(); localnetmask = LiveSetup().GetLocalNetMask(); - showRecDuration = LiveSetup().GetShowRecDuration() ? "1" : ""; showLogo = LiveSetup().GetShowLogo() ? "1" : ""; useAjax = LiveSetup().GetUseAjax() ? "1" : ""; showInfoBox = LiveSetup().GetShowInfoBox() ? "1" : ""; @@ -183,12 +180,6 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) </td> </tr> <tr> - <td class="label leftcol"><div class="withmargin"><$ tr("Show duration in 'Recordings'") $>:</div></td> - <td class="rightcol"> - <input type="checkbox" name="showRecDuration" id="showRecDuration" value="1" <%cpp> CHECKIF(!showRecDuration.empty()); </%cpp>/> - </td> - </tr> - <tr> <td class="label leftcol"><div class="withmargin"><$ tr("Use ajax technology") $>:</div></td> <td class="rightcol"> <input type="checkbox" name="useAjax" id="useAjax" value="1" <%cpp> CHECKIF(!useAjax.empty()); </%cpp> onclick="changeduseajax(this)"/> |