Merge branch 'dev'

NicolasGraph · Jan 16, 2017 · f817812 · f817812
2 parents 8d4c6c7 + 42b3ebc
commit f817812
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/docs/main/Credits.textile b/docs/main/Credits.textile
@@ -13,7 +13,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 h2. Changelog
 
-* *oui_player v1.2.0* (2016-12-12)
+* *v1.2.1* (2017-01-16)
+** Fixes the _Field used by default_ pref display when no custom field exists;
+** Fixes Textpack typo;
+** Lighten compiled code by removing license related comments;
+* *v1.2.0* (2016-12-12)
 ** sets the custom field plugin pref as the defaut value of the conditional tag @play@ attribute;
 ** introduces a @play@ attribute value inheritance in a conditional/container tag context;
 ** adds support for:

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name"        : "oui_player",
     "description" : "Embed customised players",
-    "version"     : "1.2.0",
+    "version"     : "1.2.1",
     "type"        : 1,
     "author"      : "Nicolas Morand",
     "author_uri"  : "http://github.com/NicolasGraph",

diff --git a/src/lib.php b/src/lib.php
@@ -40,18 +40,19 @@ function oui_player_pref_widget($name, $val)
 
     function oui_player_custom_fields($name, $val)
     {
+        $vals = array();
+        $vals['article_image'] = gtxt('article_image');
+        $vals['excerpt'] = gtxt('excerpt');
+
         $custom_fields = safe_rows("name, val", 'txp_prefs', "name LIKE 'custom_%_set' AND val<>'' ORDER BY name");
 
         if ($custom_fields) {
-            $vals = array();
             foreach ($custom_fields as $row) {
                 $vals[$row['val']] = $row['val'];
             }
-            $vals['article_image'] = gtxt('article_image');
-            $vals['excerpt'] = gtxt('excerpt');
-            return selectInput($name, $vals, $val);
         }
-        return gtxt('no_custom_fields_recorded');
+
+        return selectInput($name, $vals, $val);
     }
 
     function oui_player_truefalseradio($field, $checked = '', $tabindex = 0, $id = '')

diff --git a/textpacks/en-gb.textpack b/textpacks/en-gb.textpack
@@ -2,7 +2,7 @@
 #Default language, en-us, en-gb
 oui_player => Embedded players (oui_player)
 oui_player_provider => Favourite provider
-oui_player_custom_field => field used by default
+oui_player_custom_field => Field used by default
 oui_player_provider_abcnews => ABC News
 oui_player_abcnews => ABC News player (oui_player)
 oui_player_abcnews_prefs => Display the ABC News player prefs
@@ -64,6 +64,20 @@ oui_player_myspace_prefs => Display the Myspace player prefs
 oui_player_myspace_width => Player width
 oui_player_myspace_height => Player height
 oui_player_myspace_ratio => Player ratio by default
+oui_player_provider_none => Mixcloud
+oui_player_none => HTML player (oui_player)
+oui_player_none_prefs => Display the HTML player prefs
+oui_player_none_width => Player width
+oui_player_none_height => Player height
+oui_player_none_ratio => Player ratio by default
+oui_player_none_autoplay => Automatic playing
+oui_player_none_controls => Display default controls
+oui_player_none_crossorigins => Automatic playing
+oui_player_none_loop => Replay the video once finished
+oui_player_none_muted => Disable sound by default
+oui_player_none_preload => Preload mode
+oui_player_none_poster => URL of an optional starting shot
+oui_player_none_volume => Volume (0.0-1.0)
 oui_player_provider_soundcloud => Soundcloud
 oui_player_soundcloud => Soundcloud player (oui_player)
 oui_player_soundcloud_prefs => Display the Mixcloud player prefs

diff --git a/textpacks/fr-fr.textpack b/textpacks/fr-fr.textpack
@@ -64,6 +64,19 @@ oui_player_myspace_prefs => Afficher les préférences du lecteur Myspace
 oui_player_myspace_width => Largeur du lecteur
 oui_player_myspace_height => Hauteur du lecteur
 oui_player_myspace_ratio => Ratio utilisé en l'absence de l'une des dimensions
+oui_player_none => Lecteur HTML (oui_player)
+oui_player_none_prefs => Afficher les préférences du lecteur HTML
+oui_player_none_width => Largeur du lecteur
+oui_player_none_height => Hauteur du lecteur
+oui_player_none_ratio => Ratio utilisé en l'absence de l'une des dimensions
+oui_player_none_autoplay => Lecture automatique
+oui_player_none_controls => Afficher les commandes par defaut
+oui_player_none_crossorigins => Automatic playing
+oui_player_none_loop => Lire en boucle
+oui_player_none_muted => Désactiver le son par défaut
+oui_player_none_preload => Mode de pré-chargement
+oui_player_none_poster => URL optionelle d'une image de début
+oui_player_none_volume => Volume (0.0-1.0)
 oui_player_provider_soundcloud => Soundcloud
 oui_player_soundcloud => Lecteur Soundcloud (oui_player)
 oui_player_soundcloud_prefs => Afficher les préférences du lecteur Soundcloud