Merge branch '2.5.x' into 2.5.x-installer

sourcefabric · Jan 19, 2015 · dec7ddd · dec7ddd
2 parents 57e4ba5 + c399250
commit dec7ddd
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 27 deletions.
diff --git a/CREDITS b/CREDITS
@@ -2,6 +2,19 @@
 CREDITS
 =======
 
+Version 2.5.2
+
+Albert Santoni (albert.santoni@sourcefabric.org)
+Denise Rigato (denise.rigato@sourcefabric.org)
+Cliff Wang (cliff.wang@sourcefabric.org)
+Nareg Asmarian (nareg.asmarian@sourcefabric.org)
+Daniel James (daniel.james@sourcefabric.org)
+
+Community Contributors:
+Robbt E
+
+
+
 Version 2.5.1
 
 Albert Santoni (albert.santoni@sourcefabric.org)
@@ -25,6 +38,7 @@ Community Contributors:
 John Chewter
 
 
+
 Version 2.5.0
 -------------
 

diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -4,6 +4,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
     private $criteriaOptions;
     private $stringCriteriaOptions;
     private $numericCriteriaOptions;
+    private $sortOptions;
     private $limitOptions;
 
     /* We need to know if the criteria value will be a string
@@ -122,6 +123,17 @@ private function getLimitOptions()
         }
         return $this->limitOptions;
     }
+        private function getSortOptions()
+    {
+        if (!isset($this->sortOptions)) {
+            $this->sortOptions = array(
+                "random"   => _("random"),
+                "newest" => _("newest"),
+                "oldest"   => _("oldest")
+            );
+        }
+        return $this->sortOptions;
+    }
 
 
     public function init()
@@ -288,6 +300,15 @@ public function startForm($p_blockId, $p_isValid = false)
         }
         $this->addElement($repeatTracks);
 
+        $sort = new Zend_Form_Element_Select('sp_sort_options');
+        $sort->setAttrib('class', 'sp_input_select')
+              ->setDecorators(array('viewHelper'))
+              ->setMultiOptions($this->getSortOptions());
+        if (isset($storedCrit["sort"])) {
+            $sort->setValue($storedCrit["sort"]["value"]);
+        }
+        $this->addElement($sort);
+
         $limit = new Zend_Form_Element_Select('sp_limit_options');
         $limit->setAttrib('class', 'sp_input_select')
               ->setDecorators(array('viewHelper'))
@@ -344,7 +365,7 @@ public function startForm($p_blockId, $p_isValid = false)
 
     public function preValidation($params)
     {
-        $data = Application_Model_Block::organizeSmartPlyalistCriteria($params['data']);
+        $data = Application_Model_Block::organizeSmartPlaylistCriteria($params['data']);
         // add elelments that needs to be added
         // set multioption for modifier according to criteria_field
         $modRowMap = array();

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
@@ -1156,7 +1156,7 @@ public function setLength($value)
      */
     public function saveSmartBlockCriteria($p_criteria)
     {
-        $data = $this->organizeSmartPlyalistCriteria($p_criteria);
+        $data = $this->organizeSmartPlaylistCriteria($p_criteria);
         // saving dynamic/static flag
         $blockType = $data['etc']['sp_type'] == 0 ? 'static':'dynamic';
         $this->saveType($blockType);
@@ -1224,14 +1224,25 @@ public function storeCriteriaIntoDb($p_criteriaData)
             }
         }
 
+        // insert sort info
+        $qry = new CcBlockcriteria();
+        $qry->setDbCriteria("sort")
+        ->setDbModifier("N/A")
+        ->setDbValue($p_criteriaData['etc']['sp_sort_options'])
+        ->setDbBlockId($this->id)
+        ->save();
+
+
+
         // insert limit info
         $qry = new CcBlockcriteria();
         $qry->setDbCriteria("limit")
         ->setDbModifier($p_criteriaData['etc']['sp_limit_options'])
         ->setDbValue($p_criteriaData['etc']['sp_limit_value'])
         ->setDbBlockId($this->id)
         ->save();
-
+
+
         // insert repeate track option
         $qry = new CcBlockcriteria();
         $qry->setDbCriteria("repeat_tracks")
@@ -1352,6 +1363,7 @@ public function getCriteria()
             "isrc_number"  => _("ISRC"),
             "label"        => _("Label"),
             "language"     => _("Language"),
+            "utime"        => _("Upload Time"),
             "mtime"        => _("Last Modified"),
             "lptime"       => _("Last Played"),
             "length"       => _("Length"),
@@ -1399,6 +1411,8 @@ public function getCriteria()
                     "display_modifier"=>_($modifier));
             } else if($criteria == "repeat_tracks") {
                 $storedCrit["repeat_tracks"] = array("value"=>$value);
+            } else if($criteria == "sort") {
+                $storedCrit["sort"] = array("value"=>$value);
             } else {
                 $storedCrit["crit"][$criteria][] = array(
                     "criteria"=>$criteria,
@@ -1507,8 +1521,20 @@ public function getListofFilesMeetCriteria()
             // check if file exists
             $qry->add("file_exists", "true", Criteria::EQUAL);
             $qry->add("hidden", "false", Criteria::EQUAL);
+        if (isset($storedCrit['sort'])) {
+            $sortTracks = $storedCrit['sort']['value'];
+        }
+        if ($sortTracks == 'newest') {
+            $qry->addDescendingOrderByColumn('utime');
+        }
+        else if ($sortTracks == 'oldest') {
+            $qry->addAscendingOrderByColumn('utime');
+        }
+        else {
             $qry->addAscendingOrderByColumn('random()');
         }
+
+    }
         // construct limit restriction
         $limits = array();
 
@@ -1537,9 +1563,8 @@ public function getListofFilesMeetCriteria()
             Logging::info($e);
         }
     }
-
-    public static function organizeSmartPlyalistCriteria($p_criteria)
-    {
+    public static function organizeSmartPlaylistCriteria($p_criteria)
+    { 
         $fieldNames = array('sp_criteria_field', 'sp_criteria_modifier', 'sp_criteria_value', 'sp_criteria_extra');
         $output = array();
         foreach ($p_criteria as $ele) {

diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -95,7 +95,18 @@
             <?php endif; ?>
         <br />
         </dd>
-
+        <dd id='sp_sort-element'>
+            <span class='sp_text_font'>Sort tracks by</span>
+            <?php echo $this->element->getElement('sp_sort_options') ?>
+           <?php if($this->element->getElement("sp_sort_options")->hasErrors()) : ?>
+                <?php foreach($this->element->getElement("sp_sort_options")->getMessages() as $error): ?>
+                <span class='errors sp-errors'>
+                   <?php echo $error; ?>
+                </span>
+                <?php endforeach; ?>
+            <?php endif; ?>
+        <br />
+        </dd> 
         <dd id='sp_limit-element'>
             <span class='sp_text_font'><?php echo $this->element->getElement('sp_limit_value')->getLabel() ?></span>
             <?php echo $this->element->getElement('sp_limit_value')?>

diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
@@ -6,13 +6,14 @@
 # Zsolt Magyar <picizse@gmail.com>, 2014
 # Zsolt Magyar <picizse@gmail.com>, 2014
 # Sourcefabric <contact@sourcefabric.org>, 2012
+# Zsolt Magyar <picizse@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
-"Last-Translator: Daniel James <daniel@64studio.com>\n"
+"PO-Revision-Date: 2015-01-19 13:10+0000\n"
+"Last-Translator: Zsolt Magyar <picizse@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/airtime/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +81,7 @@ msgstr "Leúsztatás"
 msgid ""
 "%1$s copyright &copy; %2$s All rights reserved.%3$sMaintained and "
 "distributed under the %4$s by %5$s"
-msgstr ""
+msgstr "%1$s szerzői & másolási jog; %2$s Minden jog fenntartva.%3$sFejleszti és forgalmazza %4$s alatt a %5$s"
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
@@ -1097,13 +1098,13 @@ msgstr "Támogatási Visszajelzés Küldése"
 #: airtime_mvc/application/forms/RegisterAirtime.php:126
 #, php-format
 msgid "Promote my station on %s"
-msgstr ""
+msgstr "Az állomásom közzététele a %s-on"
 
 #: airtime_mvc/application/forms/SupportSettings.php:150
 #: airtime_mvc/application/forms/RegisterAirtime.php:151
 #, php-format
 msgid "By checking this box, I agree to %s's %sprivacy policy%s."
-msgstr ""
+msgstr "A mező bejelölésével, elfogadom a %s %sadatvédelmi irányelveit%s."
 
 #: airtime_mvc/application/forms/SupportSettings.php:174
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
@@ -1142,7 +1143,7 @@ msgstr "Újraközvetítés?"
 #: airtime_mvc/application/forms/AddShowLiveStream.php:10
 #, php-format
 msgid "Use %s Authentication:"
-msgstr ""
+msgstr "%s Hitelesítés Használata:"
 
 #: airtime_mvc/application/forms/AddShowLiveStream.php:16
 msgid "Use Custom Authentication:"
@@ -2614,7 +2615,7 @@ msgstr "Az Ön számára nem érhető el az alábbi erőforrás."
 #: airtime_mvc/application/controllers/ApiController.php:803
 #, php-format
 msgid "File does not exist in %s"
-msgstr ""
+msgstr "A fájl nem elérhető itt: %s"
 
 #: airtime_mvc/application/controllers/ApiController.php:854
 msgid "Bad request. no 'mode' parameter passed."
@@ -2825,7 +2826,7 @@ msgstr "Memória"
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
 #, php-format
 msgid "%s Version"
-msgstr ""
+msgstr "%s Verzió"
 
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:30
 msgid "Disk Space"
@@ -2910,13 +2911,13 @@ msgid ""
 " collected regularly in order to enhance your user experience.%2$sClick "
 "'Yes, help %1$s' and we'll make sure the features you use are constantly "
 "improving."
-msgstr ""
+msgstr "Segítsen az %1$s fejlesztésében, tudassa velünk az ötleteit. Az információk gyűjtése fokozza a felhasználás élményét.%2$sKlikk 'Igen, segítek az %1$s-nak' fejlesztésében, és igyekszek folyamatosan a funkciók használatának javításain fáradozni. "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:29
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:29
 #, php-format
 msgid "Click the box below to promote your station on %s."
-msgstr ""
+msgstr "Jelöld be a mezőt az állomásod közzétételéhez a %s-on."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:67
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:81
@@ -2962,7 +2963,7 @@ msgstr "Jelenlegi Tároló Mappa:"
 msgid ""
 "Rescan watched directory (This is useful if it is network mount and may be "
 "out of sync with %s)"
-msgstr ""
+msgstr "A figyelt mappa újraellenőrzése (Ez akkor hasznos, ha a hálózati csatolás nincs szinkronban az %s-al)"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
 msgid "Remove watched directory"
@@ -3017,7 +3018,7 @@ msgid ""
 "will be collected regularly in order to enhance your user experience.%sClick"
 " the 'Send support feedback' box and we'll make sure the features you use "
 "are constantly improving."
-msgstr ""
+msgstr "Segítse az %s fejlesztését azáltal, hogy a %s tudja, hogy Ön, hogyan használja azt. Információk összegyűjtése céljából, rendszerezve azokat, hogy fokozza a felhasználás élményét.%sKlikkeljen a 'Támogatási Visszajelzés Küldése' mezőbe és győződjön meg arról, hogy a funkciók használatának minősége folyamatosan javul."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
 msgid ""
@@ -3280,12 +3281,12 @@ msgstr "Hallgatói Statisztika"
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
 #, php-format
 msgid "Welcome to %s!"
-msgstr ""
+msgstr "Üdvözöljük az %s-nál!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
 #, php-format
 msgid "Here's how you can get started using %s to automate your broadcasts: "
-msgstr ""
+msgstr "Itt van, hogyan tudod elindítani adásaid automatizálását használva az %s-t:"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:7
 msgid ""
@@ -3334,12 +3335,12 @@ msgstr "Adásfolyam:"
 msgid ""
 "%1$s %2$s, the open radio software for scheduling and remote station "
 "management."
-msgstr ""
+msgstr "%1$s %2$s, a nyitott rádiós szoftver, az ütemezett és távoli állomás menedzsment."
 
 #: airtime_mvc/application/views/scripts/dashboard/about.phtml:22
 #, php-format
 msgid "%1$s %2$s is distributed under the %3$s"
-msgstr ""
+msgstr "%1$s %2$s-ot %3$s mellett terjesztik"
 
 #: airtime_mvc/application/views/scripts/login/password-change.phtml:3
 msgid "New password"
@@ -3372,7 +3373,7 @@ msgstr "Vissza a belépéshez"
 msgid ""
 "Welcome to the %s demo! You can log in using the username 'admin' and the "
 "password 'admin'."
-msgstr ""
+msgstr "Üdvözöljük az %s demó változatában! Jelentkezzen be 'admin' felhasználónévvel és 'admin' jelszóval."
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:3
 msgid "Previous:"
@@ -3417,7 +3418,7 @@ msgstr "Az Ön próba ideje lejár"
 #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
 #, php-format
 msgid "Purchase your copy of %s"
-msgstr ""
+msgstr "Vásárolja meg az Ön %s másolatát"
 
 #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
 msgid "My Account"
@@ -3733,7 +3734,7 @@ msgstr "A kapcsolódó műsorok tartalmait bármelyik adás előtt vagy után ke
 
 #: airtime_mvc/application/models/Scheduler.php:195
 msgid "Cannot schedule a playlist that contains missing files."
-msgstr ""
+msgstr "Nem lehet ütemezni olyan lejátszási listát, amely tartalmaz hiányzó fájlokat."
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
@@ -3808,7 +3809,7 @@ msgstr "Üdv. %s, \n\nErre a hivatkozásra kattintva visszaállíthatja a jelsza
 #: airtime_mvc/application/models/Auth.php:36
 #, php-format
 msgid "%s Password Reset"
-msgstr ""
+msgstr "%s Jelszó Visszaállítás"
 
 #: airtime_mvc/application/services/CalendarService.php:50
 msgid "Record file doesn't exist"