From a07e412b3f57e02ab2d7c7ff460e292dcb9d667e Mon Sep 17 00:00:00 2001 From: Nicolas Riendeau Date: Sun, 3 Feb 2013 17:35:32 -0500 Subject: [PATCH] Make some MythWeb TV settings warnings translatable. This makes some MythWeb TV settings warnings translatable and moves them to another location because they weren't being displayed correctly in the place allowed. There's probably place for improvement but the situation is a lot better than it was... --- modules/_shared/lang/English.lang | 16 ++++++------ modules/_shared/lang/English_CA.lang | 16 ++++++------ modules/_shared/tmpl/default/welcome.php | 33 ++++++++++++------------ skins/default/welcome.css | 7 +++++ 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/modules/_shared/lang/English.lang b/modules/_shared/lang/English.lang index ac26bd366..331ba245d 100644 --- a/modules/_shared/lang/English.lang +++ b/modules/_shared/lang/English.lang @@ -461,8 +461,13 @@ "No metadata results found." "No Public Playlists" "No recording schedules have been defined." +"No TV configured!" "No videos" "No. of recordings to keep" +"NO_TV_CONFIGURED_NOTICE_1" + MythTV is intended to run with TV settings configured. Your installation does not appear to have been fully configured for TV viewing (there are no channels). If you intend to use MythTV's TV functionality, please finish configuration via mythtv-setup before using MythWeb. +"NO_TV_CONFIGURED_NOTICE_2" + MythWeb is capable of functioning without TV settings, but so much of its interface is designed to make the TV process as smooth as possible that you will likely find many nonfunctional links to TV functionality. Don't be surprised to find "unknown module" messages when you follow links. "Non-Music Specials" "Non-Series HDTV" "None" @@ -634,8 +639,6 @@ This showing will be recorded. "rectype-long: always" Record at any time on any channel. -"rectype-long: channel" - Record at any time on channel $1. "rectype-long: daily" Record this program in this timeslot every day. "rectype-long: dontrec" @@ -654,18 +657,12 @@ Record this program in this timeslot every week. "rectype: always" Always -"rectype: channel" - Channel "rectype: daily" Daily "rectype: dontrec" Don't Record -"rectype: finddaily" - Find One Daily "rectype: findone" Find Once -"rectype: findweekly" - Find One Weekly "rectype: once" Once "rectype: override" @@ -800,9 +797,12 @@ "There are no items in this Playlist!" "There was a problem saving your playlist" "TheTVDB" +"This channel" +"This day and time" "This episode" "This playlist is already loaded!" "This series" +"This time" "This will overwrite your current, unsaved playlist. Are you sure you want to continue?" "Thursday" "Time" diff --git a/modules/_shared/lang/English_CA.lang b/modules/_shared/lang/English_CA.lang index ab66437d1..0569f6925 100644 --- a/modules/_shared/lang/English_CA.lang +++ b/modules/_shared/lang/English_CA.lang @@ -462,8 +462,13 @@ "No metadata results found." "No Public Playlists" "No recording schedules have been defined." +"No TV configured!" "No videos" "No. of recordings to keep" +"NO_TV_CONFIGURED_NOTICE_1" + MythTV is intended to run with TV settings configured. Your installation does not appear to have been fully configured for TV viewing (there are no channels). If you intend to use MythTV's TV functionality, please finish configuration via mythtv-setup before using MythWeb. +"NO_TV_CONFIGURED_NOTICE_2" + MythWeb is capable of functioning without TV settings, but so much of its interface is designed to make the TV process as smooth as possible that you will likely find many nonfunctional links to TV functionality. Don't be surprised to find "unknown module" messages when you follow links. "Non-Music Specials" "Non-Series HDTV" "None" @@ -636,8 +641,6 @@ This showing will be recorded. "rectype-long: always" Record at any time on any channel. -"rectype-long: channel" - Record at any time on channel $1. "rectype-long: daily" Record this program in this timeslot every day. "rectype-long: dontrec" @@ -656,18 +659,12 @@ Record this program in this timeslot every week. "rectype: always" Always -"rectype: channel" - Channel "rectype: daily" Daily "rectype: dontrec" Don't Record -"rectype: finddaily" - Find One Daily "rectype: findone" Find Once -"rectype: findweekly" - Find One Weekly "rectype: once" Once "rectype: override" @@ -802,9 +799,12 @@ "There are no items in this Playlist!" "There was a problem saving your playlist" "TheTVDB" +"This channel" +"This day and time" "This episode" "This playlist is already loaded!" "This series" +"This time" "This will overwrite your current, unsaved playlist. Are you sure you want to continue?" "Thursday" "Time" diff --git a/modules/_shared/tmpl/default/welcome.php b/modules/_shared/tmpl/default/welcome.php index 60dd36d31..eeef72a8e 100644 --- a/modules/_shared/tmpl/default/welcome.php +++ b/modules/_shared/tmpl/default/welcome.php @@ -65,23 +65,6 @@ function show_module_info(module) {
-

No TV Configured

-

-MythTV is intended to run with TV settings configured. Your installation does -not appear to have been fully configured for TV viewing (there are no channels). -If you intend to use MythTV's TV functionality, please finish configuration -via mythtv-setup before using MythWeb. -

-

-MythWeb is capable of functioning without TV settings, but so much of its -interface is designed to make the TV process as smooth as possible that you -will likely find many nonfunctional links to TV functionality. Don't be -surprised to find "unknown module" messages when you follow links. -

- $module) { @@ -97,6 +80,22 @@ interface is designed to make the TV process as smooth as possible that you
+ +
+

+

+ +

+

+ +

+
+ + diff --git a/skins/default/welcome.css b/skins/default/welcome.css index 6e47ed9b5..ce2aaa145 100644 --- a/skins/default/welcome.css +++ b/skins/default/welcome.css @@ -60,3 +60,10 @@ text-align: center; margin-top: -1.5em; } + +#tv_warning { + float: left; + width: 65em; + text-align: left; + margin-top: 1.5em; +}