Updated languages files.

diff --git a/languages/en.php b/languages/en.php
index ce8a24a3d74cfa41dbdb6dd7c47aaae7ce270248..04a9355bf947ed6e0081a361a6c195795799a4af 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -7,53 +7,72 @@
  
 $english = array(
 
-       "videolist" => "Videos",
-
-       "videolist:home" => '%s \'s Videos',
-       "videolist:user" => '%s \'s Videos',
-       "videolist:new" => 'Add a Video',
-       "videolist:find" => 'All Site videos',
-       "videolist:all" => 'All Site videos',
-       "videolist:add" => 'Add a Video',
-       "videolist:play:video" => 'Play',
-       "videolist:add:video" => 'Add',
-       "videolist:search" => "All Site videos",
+       /**
+        * Menu items and titles
+        */
+
+       'videolist' => "Videos",
+       'videolist:owner' => "%s's videos",
        'videolist:friends' => "Friends' videos",
-       'videolist:edit' => "Edit video",
-       'videolist:ingroup' => "in the group",
-       "videolist:submit" => 'Submit',
-       "videolist:title" => "Title",
-       "videolist:description" => "Description",
-       "videolist:video_url" => "Enter video URL",
-       "videolist:error:no_save" => 'There was an error in saving the video, please try after sometime',
-       "videolist:saved" => 'Your video has been saved successfully!',
-       "videolist_item:more" => "View all videos",
-       "videolist_item:none" => "sorry, no videos were found",
-       "videolist:deleted" => "Your video was removed successfully!",
-       "videolist:deletefailed" => "Unfortunately, this video could not be removed now. Please try again later",
-       "videolist:widget" => "Videos",
-       "videolist:widget:description" => "Your personal video playlist",
-       "videolist:num_videos" => "Number of videos to display",
-       'videolist:widget' => "My Videos",
-       "videolist:widget:description" => "Showcase your personal video gallery from youtube",
-       "profile:videoheader" => "My Video Gallery",
-       "videolist:access_id" => "Who can see you posted this video?",
-       "item:object:videolist_item" => "Videos",
-       "videolist:tags" => "Add Tags",
-       "videolist:browse" => "Find Videos - %s",
-       "videolist:browsemenu" => "Find Videos",
-       "videolist:title_search_tube" => "Search Videos From",
-       "videolist:searchTubeVideos" => "Search youtube.com",
-       "videolist:comments" => "Comments",
-       "videolist:commentspost" => "Post",
-       "river:create:object:videolist_item" => "%s added the video %s",
-       "river:comment:object:videolist_item" => "%s commented on %s",
-       "videolist:river:item" => "a video",
-       "videolist:river:created" => "%s added",
-       "videolist:group" => "Group Videos",
-       "videolist:groupall" => "All Group Videos",
-       "videolist:delete:confirm" => "Are you sure you want to delete this video?",
-       "videolist:none" => "No videos were found.",
+       'videolist:all' => "All site videos",
+       'videolist:add' => "Add video",
+
+       'videolist:group' => "Group videos",
+       'groups:enablevideolist' => 'Enable group videos',
+
+       'videolist:edit' => "Edit this video",
+       'videolist:delete' => "Delete this video",
+
+       'videolist:new' => "A new video",
+       'videolist:notification' =>
+'%s added a new video:
+
+%s
+%s
+
+View and comment on the new video:
+%s
+',
+       'videolist:delete:confirm' => 'Are you sure you want to delete this video?',
+       'item:object:videolist_item' => 'Video',
+       'videolist:nogroup' => 'This group does not have any video yet',
+       'videolist:more' => 'More videos',
+       'videolist:none' => 'No videos posted yet.',
+
+       /**
+       * River
+       **/
+
+       'river:create:object:videolist_item' => '%s created the video %s',
+       'river:update:object:videolist_item' => '%s updated the video %s',
+       'river:comment:object:videolist_item' => '%s commented on the video titled %s',
+
+       /**
+        * Form fields
+        */
+
+       'videolist:title' => 'Title',
+       'videolist:description' => 'Description',
+       'videolist:video_url' => 'Enter video URL',
+       'videolist:access_id' => 'Who can see you posted this video?',
+       'videolist:tags' => 'Add tags',
+
+       /**
+        * Status and error messages
+        */
+       'videolist:error:no_save' => 'There was an error in saving the video, please try after sometime',
+       'videolist:saved' => 'Your video has been saved successfully!',
+       'videolist:deleted' => 'Your video was removed successfully!',
+       'videolist:deletefailed' => 'Unfortunately, this video could not be removed now. Please try again later',
+       
+
+       /**
+        * Widget
+        **/
+
+       'videolist:num_videos' => 'Number of videos to display',
+       'videolist:widget:description' => 'Your personal video playlist.',
+       
 );
 
-add_translation("en",$english);
+add_translation("en", $english);

diff --git a/languages/es.php b/languages/es.php
index e8a5cdaf92f9d8680bda284fa43d2b5a11da49c2..d52a40d78d9613b3a6c0bd8a51514e1882ef4a8d 100644 (file)
--- a/languages/es.php
+++ b/languages/es.php
@@ -1,50 +1,42 @@
 <?php
-$es = array (
-  'videolist:user' => 'Vídeos de %s',
-  'videolist:all' => 'Vídeos del sitio',
-  'videolist:add' => 'Añade un vídeo',
-  'videolist:play:video' => 'Reproducir',
-  'videolist:add:video' => 'Añade',
-  'videolist:friends' => 'Vídeos de amigos',
-  'videolist:edit' => 'Edita el vídeo',
-  'videolist:ingroup' => 'en el grupo',
-  'videolist:title' => 'Título',
-  'videolist:description' => 'Descripción',
-  'videolist:video_url' => 'Copia aquí la URL del vídeo',
-  'videolist:error:no_save' => 'Ha habido un error mientras se guardaba el vídeo, por favor, pruebe en un momento',
-  'videolist:saved' => 'Tu vídeo ha sido guardado satisfactoriamente!',
-  'videolist_item:more' => 'Ver todos los vídeos',
-  'videolist_item:none' => 'No se han encontrado vídeos',
-  'videolist:deleted' => 'Tu vídeo ha sido borrado satisfactoriamente!',
-  'videolist:deletefailed' => 'Por desgracia, este vídeo no se puede borrar ahora mismo. Prueba más tarde',
-  'videolist:access_id' => '¿Quien puede ver que has añadido este vídeo?',
-  'item:object:videolist_item' => 'Vídeos',
-  'river:create:object:videolist_item' => '%s ha añadido el vídeo %s',
-  'river:comment:object:videolist_item' => '%s ha comentado en %s',
-  'videolist:delete:confirm' => 'Estás seguro de que quieres eliminar este vídeo?',
-  'videolist' => 'Mis Videos',
-  'videolist:home' => 'Vídeos de %s',
-  'videolist:new' => 'A&ntilde;adir v&iacute;deos',
-  'videolist:find' => 'V&iacute;deos de toda la red',
-  'videolist:search' => 'Buscar V&iacute;deos',
-  'videolist:submit' => 'Aceptar',
-  'videolist:widget' => 'Mis Vídeos',
-  'videolist:widget:description' => 'Puedes compartir tu galer&iacute;a de v&iacute;deos personalizada con el resto de la red',
-  'videolist:num_videos' => 'N&uacute;mero de v&iacute;deos a mostrar',
-  'profile:videoheader' => 'Mis galer&iacute;a de V&iacute;deos',
-  'videolist:tags' => 'A&ntilde;adir etiquetas',
-  'videolist:browse' => 'Buscar v&iacute;deos de %s',
-  'videolist:browsemenu' => 'Buscar v&iacute;deos',
-  'videolist:title_search_tube' => 'Buscar v&iacute;deos en:',
-  'videolist:searchTubeVideos' => 'Buscar en youtube',
-  'videolist:comments' => 'Comentarios',
-  'videolist:commentspost' => 'Entrada',
-  'videolist:river:item' => 'un v&iacute;deo titulado:',
-  'videolist:river:created' => '%s ha a&ntilde;adido',
-  'videolist:group' => 'V&iacute;deos',
-  'videolist:groupall' => 'Todos los v&iacute;deos del grupo',
-  'videolist:none' => 'El grupo no tiene v&iacute;deos subidos, o no tienes permiso para ver el contenido',
-);
 
-add_translation("es", $es);
+$spanish = array (
+       'videolist' => 'Vídeos',
+       'videolist:owner' => 'Vídeos de %s',
+       'videolist:all' => 'Todos los vídeos',
+       'videolist:group' => 'Vídeos del grupo',
+       'groups:enablevideolist' => 'Habilitar vídeos del grupo',
+       'videolist:delete' => 'Elimina el vídeo',
+       'videolist:new' => 'Un nuevo vídeo',
+       'videolist:notification' => '%s ha añadido este vídeo:
+
+%s
+%s
+
+Puedes verlo y comentar aquí:
+%s',
+       'videolist:nogroup' => 'Este grupo aún no dispone de vídeos',
+       'videolist:more' => 'Más vídeos',
+       'river:update:object:videolist_item' => '%s ha actualizado el vídeo %s',
+       'videolist:tags' => 'Añade etiquetas',
+       'videolist:deletefailed' => 'Por desgracia, este vídeo no se puede borrar ahora mismo. Prueba más tarde.',
+       'videolist:widget:description' => 'Puedes compartir tu galería de vídeos personalizada con el resto de la red.',
+       'videolist:add' => 'Añade un vídeo',
+       'videolist:friends' => 'Vídeos de amigos',
+       'videolist:edit' => 'Edita el vídeo',
+       'videolist:title' => 'Título',
+       'videolist:description' => 'Descripción',
+       'videolist:video_url' => 'Copia aquí la URL del vídeo',
+       'videolist:error:no_save' => 'Ha habido un error mientras se guardaba el vídeo, por favor, pruebe en un momento',
+       'videolist:saved' => 'Tu vídeo ha sido guardado satisfactoriamente!',
+       'videolist:deleted' => 'Tu vídeo ha sido borrado satisfactoriamente!',
+       'videolist:access_id' => '¿Quien puede ver que has añadido este vídeo?',
+       'item:object:videolist_item' => 'Vídeos',
+       'river:create:object:videolist_item' => '%s ha añadido el vídeo %s',
+       'river:comment:object:videolist_item' => '%s ha comentado en %s',
+       'videolist:delete:confirm' => 'Estás seguro de que quieres eliminar este vídeo?',
+       'videolist:num_videos' => 'N&uacute;mero de v&iacute;deos a mostrar',
+       'videolist:none' => 'El grupo no tiene v&iacute;deos subidos, o no tienes permiso para ver el contenido',
+);
 
+add_translation("es", $spanish);

diff --git a/pages/videolist/owner.php b/pages/videolist/owner.php
index 720281ee71dbb91619a98e6668c0f9556295607f..74917354e1ef20f0dcf516d3c94f4451b354b3a5 100644 (file)
--- a/pages/videolist/owner.php
+++ b/pages/videolist/owner.php
@@ -29,7 +29,7 @@ if ($page_owner->guid == elgg_get_logged_in_user_guid()) {
        $params['filter'] = '';
 }
 
-$title = elgg_echo("videolist:user", array($page_owner->name));
+$title = elgg_echo("videolist:owner", array($page_owner->name));
 
 // List videolist
 $content = elgg_list_entities(array(

diff --git a/start.php b/start.php
index d6a5ee8b1cfbcdae47f435044e369ad2919160a9..241d15aa8ce238468621d19a3b3cff9efe3f63c8 100644 (file)
--- a/start.php
+++ b/start.php
@@ -46,9 +46,8 @@ function videolist_init() {
        //add a widget
        elgg_register_widget_type('videolist', elgg_echo('videolist'), elgg_echo('videolist:widget:description'));
 
-       if (is_callable('register_notification_object')) {
-               register_notification_object('object', 'videolist_item', elgg_echo('videolist:new'));
-       }
+       // Register granular notification for this type
+       register_notification_object('object', 'videolist_item', elgg_echo('videolist:new'));
        
        // Register entity type for search
        elgg_register_entity_type('object', 'videolist_item');

diff --git a/views/default/page/elements/videolist_block.php b/views/default/page/elements/videolist_block.php
index 77ad75ab88e758301200290f65e8e0873a9699cb..69f9394fb4ec1f23f5e1fdf53b40fa6cc10bcec7 100644 (file)
--- a/views/default/page/elements/videolist_block.php
+++ b/views/default/page/elements/videolist_block.php
@@ -22,7 +22,7 @@ $options = array(
 );
 
 if($container) {
-       $title = elgg_echo('videolist:user', array($container->name));
+       $title = elgg_echo('videolist:owner', array($container->name));
 } else {
        $title = elgg_echo('videolist');
 }

diff --git a/views/default/widgets/videolist/content.php b/views/default/widgets/videolist/content.php
index 2b8de92bfe499b6550e021ee6893fcf2be0838ed..aaf6076a3471f0a0d6296cc73d075756ddd1beac 100644 (file)
--- a/views/default/widgets/videolist/content.php
+++ b/views/default/widgets/videolist/content.php
@@ -23,10 +23,10 @@ if ($content) {
        $url = "pages/owner/" . elgg_get_page_owner_entity()->username;
        $more_link = elgg_view('output/url', array(
                'href' => $url,
-               'text' => elgg_echo('videolist_item:more'),
+               'text' => elgg_echo('videolist:more'),
                'is_trusted' => true,
        ));
        echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
-       echo elgg_echo('videolist_item:none');
+       echo elgg_echo('videolist:none');
 }