From 8b561867669b0b1ba74b32b96a9353512f085749 Mon Sep 17 00:00:00 2001 From: sebastian Date: Fri, 15 Apr 2005 10:29:30 +0000 Subject: [PATCH] *** empty log message *** --- .../htmlUI/var/formmask/generic.inc.php | 3 +- .../modules/htmlUI/var/html/ui_browser.php | 5 + .../htmlUI/var/localizer/display.inc.php | 17 +- .../modules/htmlUI/var/locals.en_GB.xml | 1769 +++++++++-------- .../modules/htmlUI/var/templates/menu.tpl | 4 +- .../modules/htmlUI/var/ui_base.inc.php | 3 +- .../modules/htmlUI/var/ui_handler.class.php | 6 +- .../modules/htmlUI/var/ui_playlist.class.php | 2 +- 8 files changed, 910 insertions(+), 899 deletions(-) diff --git a/livesupport/modules/htmlUI/var/formmask/generic.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php index 3c42d44ce..7f6c7509b 100755 --- a/livesupport/modules/htmlUI/var/formmask/generic.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php @@ -79,7 +79,8 @@ $ui_fmask = array( 5 => 5, 10 => 10, 25 => 25 - ) + ), + 'required' => TRUE ), array( 'element' => 'stationMaxfilesize', diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index b81caf5ad..c5a53e5a6 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -26,6 +26,11 @@ if (is_array($_REQUEST['popup'])){ $Smarty->display('popup/_redirector.tpl'); break; + case "_2changeStationPrefs": + $Smarty->assign('target', 'changeStationPrefs'); + $Smarty->display('popup/_redirector.tpl'); + break; + case "login": $Smarty->assign('dynform', $uiBrowser->login($ui_fmask)); $Smarty->display('popup/login.tpl'); diff --git a/livesupport/modules/htmlUI/var/localizer/display.inc.php b/livesupport/modules/htmlUI/var/localizer/display.inc.php index a2578742e..5cc8b0bd1 100755 --- a/livesupport/modules/htmlUI/var/localizer/display.inc.php +++ b/livesupport/modules/htmlUI/var/localizer/display.inc.php @@ -22,16 +22,16 @@ class Display { if ($file[Id] != _DEFAULT_LANG_) { - /* - if ($onlyUntranslated=='on') { - $checker = ' checked'; + /* + if ($onlyUntranslated=='on') { + $checker = ' checked'; + } + */ + if (!$file['sourceId']) { + $file['sourceId'] = _DEFAULT_LANG_; } - */ - if (!$file['sourceId']) { - $file['sourceId'] = _DEFAULT_LANG_; } - $s = Data::convArr2GS($source); $t = Data::convArr2GS($target); $nr = 0; @@ -118,8 +118,7 @@ class Display { '; - } - + $html .= '
diff --git a/livesupport/modules/htmlUI/var/locals.en_GB.xml b/livesupport/modules/htmlUI/var/locals.en_GB.xml index 535dc08a5..161dfb29a 100755 --- a/livesupport/modules/htmlUI/var/locals.en_GB.xml +++ b/livesupport/modules/htmlUI/var/locals.en_GB.xml @@ -1,884 +1,889 @@ - en_GB - - $1 must be $2 - $1 must be $2. - - - Uploaded file $1 is bigger than LiveSupports system setting. - Uploaded file $1 is bigger than LiveSupport´s system setting. - - - ScratchPad - ScratchPad - - - Access denied. - Access denied. - - - Already active Playlist - Already active playlist. - - - Audioclip Data saved - Audioclip data saved. - - - Cannot create Playlist - Cannot create an playlist. - - - Cannot delete this Playlist - Cannot delete this playlist. - - - Cannot move item - Cannot move file in playlist. - - - Cannot remove Item from Playlist - Cannot remove file from playlist. - - - Change fade information failed. - Change fade information failed. - - - Do - Do - - - Entry $1 was already on the ScratchPad. It has been moved to the top of the list. - Entry $1 was already on the ScratchPad. It has been moved to the top of the list. - - - Entry added at $1 with ScheduleId: $2 - Entry added at $1 with schedule ID $2. - - - Entry with ScheduleId $1 removed - Entry with schedule ID $1 removed. - - - Error on add item to Playlist - Error on add item to playlist. - - - Error saving Settings - Error saving System preferences. - - - Error uploading Logo - Error uploading Logo. - - - Error: $1 - Error: $1 - - - File $1 was not uploaded. - File $1 was not uploaded. - - - Folder is not empty. You can override this protection by clicking DEL again - Folder is not empty. You can override this protection by clicking DEL again. - - - Found locked Playlist. - Found locked playlist. - - - Invalid Form Data - There was some Invalid form data. - - - Login failed - Login failed. - - - Metadata saved - Metadata saved. - - - Missing value for $1 - Missing value for $1. - - - No Item(s) selected - No file(s) selected. - - - No Playlist is locked by You. - No active playlist. - - - Note: Station Preferences not setup proberly. - Note: Station Preferences not setup proberly. - - - Old password was incorrect. - Old password was incorrect. - - - Password changed. - Password changed. - - - Passwords did not match. - Passwords did not match. - - - Playlist "$1" activated - Playlist "$1" activated. - - - Playlist "$1" released - Playlist "$1" released. - - - Playlist "$1" reverted - Playlist "$1" reverted. - - - Playlist "$1" saved - Playlist "$1" saved. - - - Playlist has been locked by $1 - Playlist has been locked by $1. - - - ScratchPad length is not set in System Preferences, so it cannot be used. - ScratchPad length is not set in System Preferences, so it cannot be used. - - - Select a Value - Select a Value - - - Settings saved - Station preferences saved. - - - Stream Data changed - Stream data changed. - - - Stream Data saved - Stream data saved. - - - Subject $1 added. - Subject $1 added. - - - Target is not Folder - Target is not folder. - - - There is no playlist available to unlock. - There is no playlist available to unlock. - - - Unable to release Playlist. - Unable to release Playlist. - - - Unable to revert to locked state. - Unable to revert to locked state. - - - Unable to set "$1" to "$2" langue "$3" - Unable to set "$1" to "$2" langue "$3". - - - Upload of file $1 was incomplete. - Upload of file $1 was incomplete. - - - Uploaded file $1 is bigger than setting in php.ini. - Uploaded file $1 is bigger than setting in php.ini. - - - You have an Playlist already activated, first close it - You have an Playlist already activated, first close it. - - - Access - Access - - - Activate this Playlist - Activate this Playlist - - - Add Audio - Add Audio - - - Add Criteria - Add Criteria - - - Add file(s) to ScratchPad - Add file(s) to ScratchPad - - - Add file(s) to active Playlist - Add file(s) to active Playlist - - - Add to ScratchPad - Add to ScratchPad - - - Add to active Playlist - Add to active Playlist - - - Album - Album - - - Artist - Artist - - - Artist web page - Artist web page - - - Audio file information web page - Audio file information web page - - - Audio source web page - Audio source web page - - - BPM - BPM - - - Bitrate - Bitrate - - - Browse - Browse - - - Buy CD web page - Buy CD web page - - - CW - WK - - - Cancel - Cancel - - - Catalog number - Catalog number - - - Category - Category - - - Change Fadein - Change Fadein - - - Change Fadeout - Change Fadeout - - - Change Transition - Change Transition - - - Channels - Channels - - - Checksum - Checksum - - - Clear - Clear - - - Clear Playlist - Clear Playlist - - - Composer - Composer - - - Conductor - Conductor - - - Contributor - Contributor - - - Copyright - Copyright - - - Count - Count - - - Creator - Creator - - - Daily View - Daily view - - - Data - Data - - - Date - Date - - - Day - Day - - - Delete File - Delete file - - - Delete Playlist - Delete playlist - - - Description - Description - - - Disc number - Disc number - - - Display this Playlist - Display this playlist - - - Duration - Duration - - - Edit - Edit - - - Edit File - Edit file - - - Edit Metadata - Edit metadata - - - Encoded by - Encoded by - - - Encoder software used - Encoder software used - - - Fade - Fade - - - File - File - - - File List - File List - - - File Management - File management - - - File Type - File type - - - File format - File format - - - File type - File type - - - Folder Structure - Folder structure - - - Format - Format - - - Frequency - Frequency - - - Genre - Genre - - - Go - Go - - - Group Name - Group name - - - Help - Help - - - ISRC number - SRC number - - - Insert Playlist here - Insert playlist here - - - Item - Item - - - Label - Label - - - Language - Language - - - Length - Length - - - Length<br><small>Enter zero for Live Stream</small> - Length<br><small>Enter zero for Live Stream</small> - - - Library Search - Library search - - - List Folder - List folder - - - Listen to File - Listen to file - - - Local Time - Local time - - - Lyricist - Lyricist - - - Lyrics - Lyrics - - - MDataXML - MDataXML - - - Main - Main - - - Maximum length of ScratchPad - Maximum length of ScratchPad - - - Media File - Media file - - - Media Library - Media library - - - Metadata - Metadata - - - Month - Month - - - Monthly View - Monthly view - - - Mood - Mood - - - Move - Move - - - Multiple Action: - Multiple action: - - - Music - Music - - - Name - Name - - - New - New - - - New Password - New password - - - New Playlist using this File - New playlist using this File - - - New Playlist using this file(s) - New playlist using this file(s) - - - New empty Playlist - Create new empty playlist - - - No Entry - No entry - - - No match found. - No match found. - - - No objects - No objects. - - - Old Password - Old Password - - - Open last Playlist - Open last playlist - - - Operator - Operator - - - Orchestra or band - Orchestra or band - - - Original artist - Original artist - - - Original lyricist - Original lyricist - - - Page - Page - - - Password - Password - - - Playlist - Playlist - - - Playlist Editor - Playlist editor - - - Playlist Metadata - Playlist metadata - - - Radio station name - Radio station name - - - Radio station web page - Radio station web page - - - Range - Range - - - Rating - Rating - - - RawAnalyze - RawAnalyze - - - Remove File from Playlist - Remove file from playlist - - - Remove Playlist - Remove playlist - - - Remove Selected - Remove selected - - - Remove file(s) - Remove file(s) - - - Remove from Scratchpad - Remove from Scratchpad - - - Repeat Password - Repeat password - - - Report date/time - Report date/time - - - Report location - Report location - - - Report organizations - Report organizations - - - Reset - Reset - - - Retype Password - Retype password - - - Revert to Saved - Revert to saved - - - Rows Per Page - - - - Rows per Page - Rows per page - - - Sample rate - Sample rate - - - Save Playlist - Save playlist - - - Save and Close - Save and close - - - Save and Close this Playlist - Save and close this Playlist - - - Scheduler - Scheduler - - - Scheduler Navigation - Scheduler navigation - - - Search - Search - - - Search Library - Search library - - - Signed in - Signed in - - - Station Logo - Station logo - - - Station Name - Station name - - - Station Settings - Station settings - - - Station Time - Station time - - - Station URL - Station URL - - - Stream - Stream - - - Stream URL - Stream URL - - - Subject - Subject - - - Submit - Submit - - - System Settings - System settings - - - Talk - Talk - - - Time - Time - - - Title - Title - - - Today - Today - - - Track number - Track number - - - Tree view - Tree view - - - Type - Type - - - User Password - User password - - - User/Groups - User/Groups - - - Username - Username - - - Week - Week - - - Weekly View - Weekly view - - - Year - Year - - - calendar week - calendar week - - - copy - copy - - - go up - go up - - - move - move - - - move down - move down - - - move up - move up - - - new&nbsp;folder - new folder - - - next - next - - - permissions - permissions - - - previous - previous - - + + en_GB + + $1 uses an unsupported file type. + + + + $1 must be $2 + $1 must be $2. + + + Uploaded file $1 is bigger than LiveSupports system setting. + Uploaded file $1 is bigger than LiveSupport´s system setting. + + + ScratchPad + ScratchPad + + + Access denied. + Access denied. + + + Already active Playlist + Already active playlist. + + + Audioclip Data saved + Audioclip data saved. + + + Cannot create Playlist + Cannot create an playlist. + + + Cannot delete this Playlist + Cannot delete this playlist. + + + Cannot move item + Cannot move file in playlist. + + + Cannot remove Item from Playlist + Cannot remove file from playlist. + + + Change fade information failed. + Change fade information failed. + + + Do + Do + + + Entry $1 was already on the ScratchPad. It has been moved to the top of the list. + Entry $1 was already on the ScratchPad. It has been moved to the top of the list. + + + Entry added at $1 with ScheduleId: $2 + Entry added at $1 with schedule ID $2. + + + Entry with ScheduleId $1 removed + Entry with schedule ID $1 removed. + + + Error on add item to Playlist + Error on add item to playlist. + + + Error saving Settings + Error saving System preferences. + + + Error uploading Logo + Error uploading Logo. + + + Error: $1 + Error: $1 + + + File $1 was not uploaded. + File $1 was not uploaded. + + + Folder is not empty. You can override this protection by clicking DEL again + Folder is not empty. You can override this protection by clicking DEL again. + + + Found locked Playlist. + Found locked playlist. + + + Invalid Form Data + There was some Invalid form data. + + + Login failed + Login failed. + + + Metadata saved + Metadata saved. + + + Missing value for $1 + Missing value for $1. + + + No Item(s) selected + No file(s) selected. + + + No Playlist is locked by You. + No active playlist. + + + Note: Station Preferences not setup proberly. + Note: Station Preferences not setup proberly. + + + Old password was incorrect. + Old password was incorrect. + + + Password changed. + Password changed. + + + Passwords did not match. + Passwords did not match. + + + Playlist "$1" activated + Playlist "$1" activated. + + + Playlist "$1" released + Playlist "$1" released. + + + Playlist "$1" reverted + Playlist "$1" reverted. + + + Playlist "$1" saved + Playlist "$1" saved. + + + Playlist has been locked by $1 + Playlist has been locked by $1. + + + ScratchPad length is not set in System Preferences, so it cannot be used. + ScratchPad length is not set in System Preferences, so it cannot be used. + + + Select a Value + Select a Value + + + Settings saved + Station preferences saved. + + + Stream Data changed + Stream data changed. + + + Stream Data saved + Stream data saved. + + + Subject $1 added. + Subject $1 added. + + + Target is not Folder + Target is not folder. + + + There is no playlist available to unlock. + There is no playlist available to unlock. + + + Unable to release Playlist. + Unable to release Playlist. + + + Unable to revert to locked state. + Unable to revert to locked state. + + + Unable to set "$1" to "$2" langue "$3" + Unable to set "$1" to "$2" langue "$3". + + + Upload of file $1 was incomplete. + Upload of file $1 was incomplete. + + + Uploaded file $1 is bigger than setting in php.ini. + Uploaded file $1 is bigger than setting in php.ini. + + + You have an Playlist already activated, first close it + You have an Playlist already activated, first close it. + + + Access + Access + + + Activate this Playlist + Activate this Playlist + + + Add Audio + Add Audio + + + Add Criteria + Add Criteria + + + Add file(s) to ScratchPad + Add file(s) to ScratchPad + + + Add file(s) to active Playlist + Add file(s) to active Playlist + + + Add to ScratchPad + Add to ScratchPad + + + Add to active Playlist + Add to active Playlist + + + Album + Album + + + Artist + Artist + + + Artist web page + Artist web page + + + Audio file information web page + Audio file information web page + + + Audio source web page + Audio source web page + + + BPM + BPM + + + Bitrate + Bitrate + + + Browse + Browse + + + Buy CD web page + Buy CD web page + + + CW + WK + + + Cancel + Cancel + + + Catalog number + Catalog number + + + Category + Category + + + Change Fadein + Change Fadein + + + Change Fadeout + Change Fadeout + + + Change Transition + Change Transition + + + Channels + Channels + + + Checksum + Checksum + + + Clear + Clear + + + Clear Playlist + Clear Playlist + + + Composer + Composer + + + Conductor + Conductor + + + Contributor + Contributor + + + Copyright + Copyright + + + Count + Count + + + Creator + Creator + + + Daily View + Daily view + + + Data + Data + + + Date + Date + + + Day + Day + + + Delete File + Delete file + + + Delete Playlist + Delete playlist + + + Description + Description + + + Disc number + Disc number + + + Display this Playlist + Display this playlist + + + Duration + Duration + + + Edit + Edit + + + Edit File + Edit file + + + Edit Metadata + Edit metadata + + + Encoded by + Encoded by + + + Encoder software used + Encoder software used + + + Fade + Fade + + + File + File + + + File List + File List + + + File Management + File management + + + File Type + File type + + + File format + File format + + + File type + File type + + + Folder Structure + Folder structure + + + Format + Format + + + Frequency + Frequency + + + Genre + Genre + + + Go + Go + + + Group Name + Group name + + + Help + Help + + + ISRC number + SRC number + + + Insert Playlist here + Insert playlist here + + + Item + Item + + + Label + Label + + + Language + Language + + + Length + Length + + + Length<br><small>Enter zero for Live Stream</small> + Length<br><small>Enter zero for Live Stream</small> + + + Library Search + Library search + + + List Folder + List folder + + + Listen to File + Listen to file + + + Local Time + Local time + + + Lyricist + Lyricist + + + Lyrics + Lyrics + + + MDataXML + MDataXML + + + Main + Main + + + Maximum length of ScratchPad + Maximum length of ScratchPad + + + Media File + Media file + + + Media Library + Media library + + + Metadata + Metadata + + + Month + Month + + + Monthly View + Monthly view + + + Mood + Mood + + + Move + Move + + + Multiple Action: + Multiple action: + + + Music + Music + + + Name + Name + + + New + New + + + New Password + New password + + + New Playlist using this File + New playlist using this File + + + New Playlist using this file(s) + New playlist using this file(s) + + + New empty Playlist + Create new empty playlist + + + No Entry + No entry + + + No match found. + No match found. + + + No objects + No objects. + + + Old Password + Old Password + + + Open last Playlist + Open last playlist + + + Operator + Operator + + + Orchestra or band + Orchestra or band + + + Original artist + Original artist + + + Original lyricist + Original lyricist + + + Page + Page + + + Password + Password + + + Playlist + Playlist + + + Playlist Editor + Playlist editor + + + Playlist Metadata + Playlist metadata + + + Radio station name + Radio station name + + + Radio station web page + Radio station web page + + + Range + Range + + + Rating + Rating + + + RawAnalyze + RawAnalyze + + + Remove File from Playlist + Remove file from playlist + + + Remove Playlist + Remove playlist + + + Remove Selected + Remove selected + + + Remove file(s) + Remove file(s) + + + Remove from Scratchpad + Remove from Scratchpad + + + Repeat Password + Repeat password + + + Report date/time + Report date/time + + + Report location + Report location + + + Report organizations + Report organizations + + + Reset + Reset + + + Retype Password + Retype password + + + Revert to Saved + Revert to saved + + + Rows Per Page + + + + Rows per Page + Rows per page + + + Sample rate + Sample rate + + + Save Playlist + Save playlist + + + Save and Close + Save and close + + + Save and Close this Playlist + Save and close this Playlist + + + Scheduler + Scheduler + + + Scheduler Navigation + Scheduler navigation + + + Search + Search + + + Search Library + Search library + + + Signed in + Signed in + + + Station Logo + Station logo + + + Station Name + Station name + + + Station Settings + Station settings + + + Station Time + Station time + + + Station URL + Station URL + + + Stream + Stream + + + Stream URL + Stream URL + + + Subject + Subject + + + Submit + Submit + + + System Settings + System settings + + + Talk + Talk + + + Time + Time + + + Title + Title + + + Today + Today + + + Track number + Track number + + + Tree view + Tree view + + + Type + Type + + + User Password + User password + + + User/Groups + User/Groups + + + Username + Username + + + Week + Week + + + Weekly View + Weekly view + + + Year + Year + + + calendar week + calendar week + + + copy + copy + + + go up + go up + + + move + move + + + move down + move down + + + move up + move up + + + new&nbsp;folder + new folder + + + next + next + + + permissions + permissions + + + previous + previous + + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/menu.tpl b/livesupport/modules/htmlUI/var/templates/menu.tpl index 646b48905..eb53a7368 100755 --- a/livesupport/modules/htmlUI/var/templates/menu.tpl +++ b/livesupport/modules/htmlUI/var/templates/menu.tpl @@ -18,13 +18,13 @@
  • ##Scheduler##
  • ##Station Settings## - {* + - *} +
  • ##Help##
    • diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 21fb4ed8a..4763d5118 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -148,7 +148,8 @@ class uiBase $this->STATIONPREFS['stationMaxfilesize'] = strtr(ini_get('upload_max_filesize'), array('M'=>'000000', 'k'=>'000')); if ($miss && $this->gb->getSessLogin($this->sessid)) { - $this->_retMsg('Note: Station Preferences not setup proberly.'); + if (UI_WARNING) $this->_retMsg('Note: Station Preferences not setup proberly.'); + $this->redirUrl = UI_BROWSER.'?popup[]=_2changeStationPrefs&popup[]=_close'; } } diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index b1f7f7540..a06f80feb 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -146,7 +146,7 @@ class uiHandler extends uiBase { function uploadFile(&$formdata, &$mask, $replace=NULL) { if ($this->test4audioType($formdata['mediafile']['name']) === FALSE) { - if (UI_ERROR) $this->_retMsg('$1 is unsupportet file type.', $formdata['mediafile']['name']); + if (UI_ERROR) $this->_retMsg('$1 uses an unsupported file type.', $formdata['mediafile']['name']); $this->redirUrl = UI_BROWSER."?act=editFile&folderId=".$formdata['folderId']; return FALSE; } @@ -186,7 +186,7 @@ class uiHandler extends uiBase { function test4audioType($filename) - { + { if (array_key_exists(strrchr($filename, "."), $this->config['audiofiles'])) return TRUE; return FALSE; @@ -292,7 +292,7 @@ class uiHandler extends uiBase { foreach ($mData as $key=>$val) { $r = $this->_setMDataValue($id, $key, $val, $curr_langid); if (PEAR::isError($r)) { - $this->_retMsg('Unable to set "$1" to "$2" langue "$3"', $key, $val, $curr_langid); + $this->_retMsg('Unable to set "$1" to value "$2".', $key, $val); } } if (UI_VERBOSE) $this->_retMsg('Metadata saved'); diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php index 16100dca3..7ee0b2c44 100755 --- a/livesupport/modules/htmlUI/var/ui_playlist.class.php +++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php @@ -422,7 +422,7 @@ class uiPlaylist $r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val, $curr_langid); if (PEAR::isError($r)) { #print_r($r); - $this->Base->_retMsg('Unable to set "$1" to "$2" langue "$3"', $key, $val); + $this->Base->_retMsg('Unable to set "$1" to value "$2".', $key, $val); } } if (UI_VERBOSE) $this->Base->_retMsg('Metadata saved');