social_stream-documents 2.0.0.beta2 → 2.0.0.beta3

data/config/locales/es.yml

@@ -1,87 +1,90 @@
+---
 es:
   activerecord:
     attributes:
       document:
-        title: "Título"
+        title: Título
     models:
-      document: "Fichero"
+      document: Fichero
   audio:
-    confirm_delete: "¿Borrar audios?"
-    mine: "Mis audios"
-    name: "archivo de audio"
-    not_mine: "Audios"
-    one: "un archivo de audio"
-    other: "audios"
-    processing: "Procesando fichero de audio. Espere, por favor..."
+    confirm_delete: ¿Borrar audios?
+    mine: Mis audios
+    name: archivo de audio
+    not_mine: Audios
+    one: un archivo de audio
+    other: audios
+    processing: Procesando fichero de audio. Espere, por favor...
     title:
-      one: "Audio"
-      other: "Audios"
+      one: Audio
+      other: Audios
   details:
-    msg: "Ver detalles..."
+    msg: Ver detalles...
   document:
     actions:
-      delete: "Borrar"
-      details: "Detalles"
-      download: "Descargar"
-      edit: "Editar"
-    all: "Todos los ficheros"
-    by: "por %{author}"
-    confirm_delete: "¿Borrar fichero?"
+      delete: Borrar
+      details: Detalles
+      download: Descargar
+      edit: Editar
+    all: Todos los ficheros
+    by: por %{author}
+    confirm_delete: ¿Borrar fichero?
     description:
-      input: "Añade una descripción aquí"
-    filter: "filtrar"
+      input: Añade una descripción aquí
+    filter: filtrar
     form:
-      title: "Fichero"
+      title: Fichero
     info:
-      author: "Autor"
+      author: Autor
       date:
-        created_at: "Creado"
-        updated_at: "Última modificación"
-      description: "Descripción"
-      file: "Fichero"
-      title: "Título"
-    mine: "Mis ficheros"
-    name: "fichero"
+        created_at: Creado
+        updated_at: Última modificación
+      description: Descripción
+      file: Fichero
+      title: Título
+      size: Size
+      tags: Tags
+    mine: Mis ficheros
+    name: fichero
     new:
-      link: "Añadir fichero"
-      title: "Nuevo fichero"
+      link: Añadir fichero
+      title: Nuevo fichero
     new_activity:
-      attach: "Adjuntar fichero"
-    not_mine: "Ficheros"
-    one: "un fichero"
-    other: "ficheros"
+      attach: Adjuntar fichero
+    not_mine: Ficheros
+    one: un fichero
+    other: ficheros
     scope:
-      network: "Red"
-      own: "Propios"
-    simple_all: "Todos"
+      network: Red
+      own: Propios
+    simple_all: Todos
     title:
-      input: "Título del fichero"
-      one: "Fichero"
-      other: "Ficheros"
+      input: Título del fichero
+      one: Fichero
+      other: Ficheros
   picture:
-    confirm_delete: "¿Borrar imagen?"
-    mine: "Mis imágenes"
-    name: "imagen"
-    not_mine: "Imágenes"
-    one: "una imagen"
-    other: "imagenes"
+    confirm_delete: ¿Borrar imagen?
+    mine: Mis imágenes
+    name: imagen
+    not_mine: Imágenes
+    one: una imagen
+    other: imagenes
     title:
-      one: "Imagen"
-      other: "Imágenes"
+      one: Imagen
+      other: Imágenes
   resource:
-    all: "Todos los recursos"
-    confirm_delete: "¿Borrar recursos?"
-    title: "Recursos"
-    mine: "Mis recursos"
-    not_mine: "Recursos"
+    all: Todos los recursos
+    confirm_delete: ¿Borrar recursos?
+    title: Recursos
+    mine: Mis recursos
+    not_mine: Recursos
   video:
-    confirm_delete: "¿Borrar vídeo?"
-    mine: "Mis vídeos"  
-    name: "vídeo"
-    not_mine: "Vídeos"
-    one: "un vídeo"
-    other: "videos"
-    processing: "Procesando vídeo. Espere, por favor..."
+    confirm_delete: ¿Borrar vídeo?
+    mine: Mis vídeos
+    name: vídeo
+    not_mine: Vídeos
+    one: un vídeo
+    other: videos
+    processing: Procesando vídeo. Espere, por favor...
     title:
-      one: "Vídeo"
-      other: "Vídeos"
+      one: Vídeo
+      other: Vídeos

data/config/locales/zh.yml

@@ -0,0 +1,90 @@
+---
+zh:
+  activerecord:
+    attributes:
+      document:
+        title: Title
+    models:
+      document: File
+  audio:
+    confirm_delete: Delete audio?
+    title:
+      one: Audio
+      other: Audios
+    mine: My audios
+    name: audio
+    not_mine: Audios
+    one: an audio
+    other: audios
+    processing: Processing audio clip. Please wait...
+  details:
+    msg: See details...
+  document:
+    actions:
+      delete: Delete
+      details: Details
+      download: Download
+      edit: Edit
+    all: All files
+    by: by %{author}
+    confirm_delete: Delete file?
+    description:
+      input: Add a description here
+    filter: filter
+    form:
+      title: File
+    info:
+      author: Author
+      date:
+        created_at: Created at
+        updated_at: Updated at
+      description: Description
+      file: File
+      size: Size
+      tags: Tags
+      title: Title
+    mine: My files
+    name: file
+    new:
+      link: Add file
+      title: New file
+    new_activity:
+      attach: Attach file
+    not_mine: Files
+    one: a file
+    other: files
+    scope:
+      network: Network
+      own: Own
+    simple_all: All
+    title:
+      input: File title
+      one: File
+      other: Files
+  picture:
+    confirm_delete: Delete picture?
+    mine: My pictures
+    name: picture
+    not_mine: Pictures
+    one: a picture
+    other: pictures
+    title:
+      one: Picture
+      other: Pictures
+  resource:
+    all: All Resources
+    confirm_delete: Delete resource?
+    title: Resources
+    mine: My resources
+    not_mine: Resources
+  video:
+    confirm_delete: Delete video?
+    mine: My videos
+    name: video
+    not_mine: Videos
+    one: a video
+    other: videos
+    processing: Processing video. Please, wait...
+    title:
+      one: Video
+      other: Videos

data/lib/generators/social_stream/documents/templates/initializer.rb

@@ -19,7 +19,7 @@ SocialStream::Documents.setup do |config|
   #      format: :png,
   #      convert_options: {
   #        color: :transparent,
-  #        background_color: 'ffffff',
+  #        background_color: '#333333',
   #        width: 460,
   #        height: 75
   #      },

data/lib/social_stream-documents.rb

@@ -27,7 +27,7 @@ module SocialStream
         format: :png,
         convert_options: {
           color: :transparent,
-          background_color: 'ffffff',
+          background_color: '#333333',
           width: 460,
           height: 75
         },

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.0.0.beta2".freeze
+    VERSION = "2.0.0.beta3".freeze
   end
 end

data/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
   s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Víctor Sánchez Belmar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ files:
 - app/assets/javascripts/social_stream/document.js
 - app/assets/javascripts/social_stream/documents.timeline.js
 - app/assets/javascripts/social_stream/documents.wall.js
-- app/assets/javascripts/social_stream/video.js.erb
+- app/assets/javascripts/social_stream/video.js
 - app/assets/stylesheets/social_stream-documents.css.sass
 - app/assets/stylesheets/social_stream/documents/_toolbar.css.sass
 - app/assets/stylesheets/social_stream/documents/aside/_documents.css.sass
@@ -210,6 +210,7 @@ files:
 - app/views/audios/_audio_processing.html.erb
 - app/views/audios/_audio_show.html.erb
 - app/views/audios/_new.html.erb
+- app/views/audios/_player.html.erb
 - app/views/audios/_quick_search_result.html.erb
 - app/views/audios/_search_result.html.erb
 - app/views/audios/_timeline.html.erb
@@ -247,6 +248,7 @@ files:
 - app/views/pictures/index.html.erb
 - app/views/pictures/show.html.erb
 - app/views/videos/_new.html.erb
+- app/views/videos/_player.html.erb
 - app/views/videos/_quick_search_result.html.erb
 - app/views/videos/_search_result.html.erb
 - app/views/videos/_timeline.html.erb
@@ -261,6 +263,7 @@ files:
 - app/worker/videoencoder.rb
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/zh.yml
 - config/routes.rb
 - db/migrate/20120208143721_create_social_stream_documents.rb
 - lib/delayed_paperclip/social_stream-documents.rb

data/app/assets/javascripts/social_stream/video.js.erb

@@ -1,42 +0,0 @@
-//= require social_stream/callback
-
-SocialStream.Video = (function(SS, $, undefined){
-  var callback = new SS.Callback();
-
-  var initJplayer = function(){
-    $(".jp-video .jp-jplayer").each(function() {
-      $(this).jPlayer({
-        ready: function () {
-          $(this).jPlayer("setMedia", {
-            webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
-            flv: $(this).closest(".video").find(".video-flv").attr("href"), // Defines the flv url
-            mp4: $(this).closest(".video").find(".video-mp4").attr("href") // Defines the mp4 url
-          });
-        },
-      solution:"flash, html",
-      preload: "none",
-      supplied: "webmv, flv, mp4",
-      swfPath: "<%= asset_path "" %>",
-      cssSelectorAncestor: "#" + $(this).closest(".video-full").attr("id")
-      })
-    });
-
-    $(".video .format-links").hide();
-    $(".video-full").hide();
-
-    $(".video .play_over").click(function(){
-      var video = $(this).closest(".video")
-      video.find(".thumb").hide();
-      video.find(".text").hide();
-      video.find(".jp-video-play").hide();
-      video.find(".video-full").show();
-      video.find(".jp-jplayer").jPlayer("play", 0);
-    });
-  }
-
-  callback.register('show', initJplayer);
-
-  return callback.extend({
-  });
-
-})(SocialStream, jQuery);