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...
MythTV · Feb 3, 2013 · a07e412 · a07e412
1 parent 030ba69
commit a07e412
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 33 deletions.
diff --git 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 &quot;unknown module&quot; 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
@@ -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 &quot;unknown module&quot; 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
@@ -65,23 +65,6 @@ function show_module_info(module) {
 
     <div id="module_info">
 <?php
-    if (!$Settings['tv']) {
-?>
-<h2>No TV Configured</h2>
-<p>
-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.
-</p>
-<p>
-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 &quot;unknown module&quot; messages when you follow links.
-</p>
-<?php
-    }
 // Print out the list of modules.  Each theme should include a welcome page for
 // each module.
     foreach (Modules::getModules() as $id => $module) {
@@ -97,6 +80,22 @@ interface is designed to make the TV process as smooth as possible that you
         <a href="http://www.mythtv.org/"><?php echo t('Visit $1', 'MythTV.org') ?></a>
     </div>
 
+<?php
+    if (!$Settings['tv']) {
+?>
+        <div id="tv_warning">
+            <h2><?php echo t('No TV configured!'); ?></h2>
+            <p>
+            <?php echo t('NO_TV_CONFIGURED_NOTICE_1'); ?>
+            </p>
+            <p>
+            <?php echo t('NO_TV_CONFIGURED_NOTICE_2'); ?>
+            </p>
+        </div>
+<?php
+    }
+?>
+
 </div>
 
 <a id="reset" href="<?php echo root_url; ?>?RESET_SKIN&RESET_TMPL"><?php echo t('Reset template and skin to defaults'); ?></a>

diff --git 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;
+}