diff options
159 files changed, 10432 insertions, 1700 deletions
@@ -18,11 +18,13 @@ Thank you! * András Veres-Szentkirályi * Bassam Kurdali * Bernhard Keller +* Brandon Invergo * Brett Smith * Caleb Forbes Davis V * Corey Farwell * Chris Moylan * Christopher Allan Webber +* Dan Callahan * David Thompson * Daniel Neel * Deb Nicholson @@ -41,11 +43,14 @@ Thank you! * Joar Wandborg * Jorge Araya Navarro * Karen Rustad +* Kenneth Dombrowski +* Kushal Kumaran * Kuno Woudt * Laura Arjona * Larisa Hoffenbecker * Luke Slater * Manuel Urbano Santos +* Marcel van der Boom * Mark Holmquist * Mats Sjöberg * Matt Lee @@ -61,20 +66,25 @@ Thank you! * Rodney Ewing * Runar Petursson * Sacha De'Angeli +* Sam Clegg * Sam Kleinman * Sam Tuke * Sebastian Spaeth * Shawn Khan * Simon Fondrie-Teitler * Stefano Zacchiroli +* sturm * Tiberiu C. Turbureanu * Tran Thanh Bao * Tryggvi Björgvinsson * Shawn Khan * Will Kahn-Greene -If you think your name should be on this list, let us know! +Special thanks to: + +* Starblessed of viewskew (lending server space!) +If you think your name should be on this list, let us know! We also are currently borrowing an image in mediagoblin/static/images/media_thumbs/image.png from the wonderful diff --git a/docs/source/index.rst b/docs/source/index.rst index e7fda4ad..75a5b66e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -61,6 +61,7 @@ Part 2: Core plugin documentation plugindocs/basic_auth plugindocs/openid plugindocs/persona + plugindocs/ldap Part 3: Plugin Writer's Guide diff --git a/docs/source/plugindocs/ldap.rst b/docs/source/plugindocs/ldap.rst new file mode 100644 index 00000000..3938c0c7 --- /dev/null +++ b/docs/source/plugindocs/ldap.rst @@ -0,0 +1,2 @@ +.. include:: ../../../mediagoblin/plugins/ldap/README.rst + diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index e7bf003a..87ea86ae 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -22,9 +22,27 @@ If you're upgrading from a previous release, please read it carefully, or at least skim over it. +0.5.1 +===== + +v0.5.1 is a bugfix release... the steps are the same as for 0.5.1. + +**Bugfixes:** + +- python 2.6 compatibility restored +- Fixed last release's release notes ;) + + 0.5.0 ===== +**NOTE:** If using the API is important to you, we're in a state of +ransition towards a new API via the Pump API. As such, though the old +API still probably works, some changes have happened to the way oauth +works to make it more Pump-compatible. If you're heavily using +clients using the old API, you may wish to hold off on upgrading for +now. Otherwise, jump in and have fun! :) + **Do this to upgrade** 1. Make sure to run @@ -41,9 +59,9 @@ carefully, or at least skim over it. 3. We have made a script to transition your ``mediagoblin_local.ini`` file for - you. This script can be found at + you. This script can be found at: -.. add a link to the script + http://mediagoblin.org/download/0.5.0_config_converter.py If you run into problems, don't hesitate to `contact us <http://mediagoblin.org/pages/join.html>`_ diff --git a/extlib/video-js/LGPLv3-LICENSE.txt b/extlib/video-js/LGPLv3-LICENSE.txt deleted file mode 100644 index 65c5ca88..00000000 --- a/extlib/video-js/LGPLv3-LICENSE.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/extlib/video-js/LICENSE b/extlib/video-js/LICENSE new file mode 100644 index 00000000..138a50e8 --- /dev/null +++ b/extlib/video-js/LICENSE @@ -0,0 +1,13 @@ +Copyright 2013 Brightcove, Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.
\ No newline at end of file diff --git a/extlib/video-js/demo.captions.vtt b/extlib/video-js/demo.captions.vtt new file mode 100644 index 00000000..e598be19 --- /dev/null +++ b/extlib/video-js/demo.captions.vtt @@ -0,0 +1,41 @@ +WEBVTT + +00:00.700 --> 00:04.110 +Captions describe all relevant audio for the hearing impaired. +[ Heroic music playing for a seagull ] + +00:04.500 --> 00:05.000 +[ Splash!!! ] + +00:05.100 --> 00:06.000 +[ Sploosh!!! ] + +00:08.000 --> 00:09.225 +[ Splash...splash...splash splash splash ] + +00:10.525 --> 00:11.255 +[ Splash, Sploosh again ] + +00:13.500 --> 00:14.984 +Dolphin: eeeEEEEEeeee! + +00:14.984 --> 00:16.984 +Dolphin: Squawk! eeeEEE? + +00:25.000 --> 00:28.284 +[ A whole ton of splashes ] + +00:29.500 --> 00:31.000 +Mine. Mine. Mine. + +00:34.300 --> 00:36.000 +Shark: Chomp + +00:36.800 --> 00:37.900 +Shark: CHOMP!!! + +00:37.861 --> 00:41.193 +EEEEEEOOOOOOOOOOWHALENOISE + +00:42.593 --> 00:45.611 +[ BIG SPLASH ]
\ No newline at end of file diff --git a/extlib/video-js/demo.html b/extlib/video-js/demo.html new file mode 100644 index 00000000..fb26a087 --- /dev/null +++ b/extlib/video-js/demo.html @@ -0,0 +1,30 @@ +<!DOCTYPE html> +<html> +<head> + <title>Video.js | HTML5 Video Player</title> + + <!-- Chang URLs to wherever Video.js files will be hosted --> + <link href="video-js.css" rel="stylesheet" type="text/css"> + <!-- video.js must be in the <head> for older IEs to work. --> + <script src="video.js"></script> + + <!-- Unless using the CDN hosted version, update the URL to the Flash SWF --> + <script> + videojs.options.flash.swf = "video-js.swf"; + </script> + + +</head> +<body> + + <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264" + poster="http://video-js.zencoder.com/oceans-clip.png" + data-setup="{}"> + <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' /> + <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' /> + <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' /> + <track kind="captions" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 --> + </video> + +</body> +</html> diff --git a/extlib/video-js/font/vjs.eot b/extlib/video-js/font/vjs.eot Binary files differnew file mode 100644 index 00000000..1b8202af --- /dev/null +++ b/extlib/video-js/font/vjs.eot diff --git a/extlib/video-js/font/vjs.svg b/extlib/video-js/font/vjs.svg new file mode 100644 index 00000000..2059a1f2 --- /dev/null +++ b/extlib/video-js/font/vjs.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG font generated by IcoMoon. +<iconset grid="16"></iconset> +</metadata> +<defs> +<font id="VideoJS" horiz-adv-x="512" > +<font-face units-per-em="512" ascent="480" descent="-32" /> +<missing-glyph horiz-adv-x="512" /> +<glyph unicode="" d="M 512.00,480.00 L 512.00,272.00 L 432.00,352.00 L 336.00,256.00 L 288.00,304.00 L 384.00,400.00 L 304.00,480.00 ZM 224.00,144.00 L 128.00,48.00 L 208.00-32.00 L 0.00-32.00 L 0.00,176.00 L 80.00,96.00 L 176.00,192.00 Z" /> +<glyph unicode="" d="M 96.00,416.00L 416.00,224.00L 96.00,32.00 z" /> +<glyph unicode="" d="M 64.00,416.00L 224.00,416.00L 224.00,32.00L 64.00,32.00zM 288.00,416.00L 448.00,416.00L 448.00,32.00L 288.00,32.00z" /> +<glyph unicode="" d="M 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" /> +<glyph unicode="" d="M 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941 + c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00 + c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" /> +<glyph unicode="" d="M 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941 + c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00 + C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941 + c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00 + c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" /> +<glyph unicode="" d="M 445.02,18.98c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.373-9.372,24.568,0.00,33.941 + C 471.868,103.771, 496.001,162.03, 496.001,224.00c0.00,61.969-24.133,120.229-67.952,164.049c-9.372,9.373-9.372,24.569,0.00,33.941 + c 9.372,9.372, 24.569,9.372, 33.941,0.00c 52.885-52.886, 82.011-123.20, 82.011-197.99c0.00-74.791-29.126-145.104-82.011-197.99 + C 457.304,21.323, 451.162,18.98, 445.02,18.98zM 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941 + c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00 + C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941 + c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00 + c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" horiz-adv-x="544" /> +<glyph unicode="" d="M 256.00,480.00L 96.00,224.00L 256.00-32.00L 416.00,224.00 z" /> +<glyph unicode="" d="M 0.00,480.00 L 687.158,480.00 L 687.158-35.207 L 0.00-35.207 L 0.00,480.00 z M 622.731,224.638 C 621.878,314.664 618.46,353.922 597.131,381.656 C 593.291,387.629 586.038,391.042 580.065,395.304 C 559.158,410.669 460.593,416.211 346.247,416.211 C 231.896,416.211 128.642,410.669 108.162,395.304 C 101.762,391.042 94.504,387.629 90.242,381.656 C 69.331,353.922 66.349,314.664 65.069,224.638 C 66.349,134.607 69.331,95.353 90.242,67.62 C 94.504,61.22 101.762,58.233 108.162,53.967 C 128.642,38.18 231.896,33.06 346.247,32.207 C 460.593,33.06 559.158,38.18 580.065,53.967 C 586.038,58.233 593.291,61.22 597.131,67.62 C 618.46,95.353 621.878,134.607 622.731,224.638 z M 331.179,247.952 C 325.389,318.401 287.924,359.905 220.901,359.905 C 159.672,359.905 111.54,304.689 111.54,215.965 C 111.54,126.859 155.405,71.267 227.907,71.267 C 285.79,71.267 326.306,113.916 332.701,184.742 L 263.55,184.742 C 260.81,158.468 249.843,138.285 226.69,138.285 C 190.136,138.285 183.435,174.462 183.435,212.92 C 183.435,265.854 198.665,292.886 223.951,292.886 C 246.492,292.886 260.81,276.511 262.939,247.952 L 331.179,247.952 z M 570.013,247.952 C 564.228,318.401 526.758,359.905 459.74,359.905 C 398.507,359.905 350.379,304.689 350.379,215.965 C 350.379,126.859 394.244,71.267 466.746,71.267 C 524.625,71.267 565.14,113.916 571.536,184.742 L 502.384,184.742 C 499.649,158.468 488.682,138.285 465.529,138.285 C 428.971,138.285 422.27,174.462 422.27,212.92 C 422.27,265.854 437.504,292.886 462.785,292.886 C 485.327,292.886 499.649,276.511 501.778,247.952 L 570.013,247.952 z " horiz-adv-x="687.1578947368421" /> +<glyph unicode="" d="M 64.00,416.00L 448.00,416.00L 448.00,32.00L 64.00,32.00z" /> +<glyph unicode="" d="M 192.00,416.00A64.00,64.00 12780.00 1 1 320.00,416A64.00,64.00 12780.00 1 1 192.00,416zM 327.765,359.765A64.00,64.00 12780.00 1 1 455.765,359.765A64.00,64.00 12780.00 1 1 327.765,359.765zM 416.00,224.00A32.00,32.00 12780.00 1 1 480.00,224A32.00,32.00 12780.00 1 1 416.00,224zM 359.765,88.235A32.00,32.00 12780.00 1 1 423.765,88.23500000000001A32.00,32.00 12780.00 1 1 359.765,88.23500000000001zM 224.001,32.00A32.00,32.00 12780.00 1 1 288.001,32A32.00,32.00 12780.00 1 1 224.001,32zM 88.236,88.235A32.00,32.00 12780.00 1 1 152.236,88.23500000000001A32.00,32.00 12780.00 1 1 88.236,88.23500000000001zM 72.236,359.765A48.00,48.00 12780.00 1 1 168.236,359.765A48.00,48.00 12780.00 1 1 72.236,359.765zM 28.00,224.00A36.00,36.00 12780.00 1 1 100.00,224A36.00,36.00 12780.00 1 1 28.00,224z" /> +<glyph unicode="" d="M 224.00,192.00 L 224.00-16.00 L 144.00,64.00 L 48.00-32.00 L 0.00,16.00 L 96.00,112.00 L 16.00,192.00 ZM 512.00,432.00 L 416.00,336.00 L 496.00,256.00 L 288.00,256.00 L 288.00,464.00 L 368.00,384.00 L 464.00,480.00 Z" /> +<glyph unicode="" d="M 256.00,448.00 C 397.385,448.00 512.00,354.875 512.00,240.00 C 512.00,125.124 397.385,32.00 256.00,32.00 C 242.422,32.00 229.095,32.867 216.088,34.522 C 161.099-20.467 95.463-30.328 32.00-31.776 L 32.00-18.318 C 66.268-1.529 96.00,29.052 96.00,64.00 C 96.00,68.877 95.621,73.665 94.918,78.348 C 37.02,116.48 0.00,174.725 0.00,240.00 C 0.00,354.875 114.615,448.00 256.00,448.00 Z" /> +<glyph unicode=" " horiz-adv-x="256" /> +<glyph class="hidden" unicode="" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" /> +</font></defs></svg>
\ No newline at end of file diff --git a/extlib/video-js/font/vjs.ttf b/extlib/video-js/font/vjs.ttf Binary files differnew file mode 100644 index 00000000..a5ad4685 --- /dev/null +++ b/extlib/video-js/font/vjs.ttf diff --git a/extlib/video-js/font/vjs.woff b/extlib/video-js/font/vjs.woff Binary files differnew file mode 100644 index 00000000..375510e0 --- /dev/null +++ b/extlib/video-js/font/vjs.woff diff --git a/extlib/video-js/video-js.css b/extlib/video-js/video-js.css new file mode 100644 index 00000000..11435c32 --- /dev/null +++ b/extlib/video-js/video-js.css @@ -0,0 +1,757 @@ +/*! +Video.js Default Styles (http://videojs.com) +Version 4.2.1 +Create your own skin at http://designer.videojs.com +*/ +/* SKIN +================================================================================ +The main class name for all skin-specific styles. To make your own skin, +replace all occurances of 'vjs-default-skin' with a new name. Then add your new +skin name to your video tag instead of the default skin. +e.g. <video class="video-js my-skin-name"> +*/ +.vjs-default-skin { + color: #cccccc; +} +/* Custom Icon Font +-------------------------------------------------------------------------------- +The control icons are from a custom font. Each icon corresponds to a character +(e.g. "\e001"). Font icons allow for easy scaling and coloring of icons. +*/ +@font-face { + font-family: 'VideoJS'; + src: url('font/vjs.eot'); + src: url('font/vjs.eot?#iefix') format('embedded-opentype'), url('font/vjs.woff') format('woff'), url('font/vjs.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} +/* Base UI Component Classes +-------------------------------------------------------------------------------- +*/ +/* Slider - used for Volume bar and Seek bar */ +.vjs-default-skin .vjs-slider { + /* Replace browser focus hightlight with handle highlight */ + outline: 0; + position: relative; + cursor: pointer; + padding: 0; + /* background-color-with-alpha */ + background-color: #333333; + background-color: rgba(51, 51, 51, 0.9); +} +.vjs-default-skin .vjs-slider:focus { + /* box-shadow */ + -webkit-box-shadow: 0 0 2em #ffffff; + -moz-box-shadow: 0 0 2em #ffffff; + box-shadow: 0 0 2em #ffffff; +} +.vjs-default-skin .vjs-slider-handle { + position: absolute; + /* Needed for IE6 */ + left: 0; + top: 0; +} +.vjs-default-skin .vjs-slider-handle:before { + content: "\e009"; + font-family: VideoJS; + font-size: 1em; + line-height: 1; + text-align: center; + text-shadow: 0em 0em 1em #fff; + position: absolute; + top: 0; + left: 0; + /* Rotate the square icon to make a diamond */ + /* transform */ + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + -o-transform: rotate(-45deg); + transform: rotate(-45deg); +} +/* Control Bar +-------------------------------------------------------------------------------- +The default control bar that is a container for most of the controls. +*/ +.vjs-default-skin .vjs-control-bar { + /* Start hidden */ + display: none; + position: absolute; + /* Place control bar at the bottom of the player box/video. + If you want more margin below the control bar, add more height. */ + bottom: 0; + /* Use left/right to stretch to 100% width of player div */ + left: 0; + right: 0; + /* Height includes any margin you want above or below control items */ + height: 3.0em; + /* background-color-with-alpha */ + background-color: #07141e; + background-color: rgba(7, 20, 30, 0.7); +} +/* Show the control bar only once the video has started playing */ +.vjs-default-skin.vjs-has-started .vjs-control-bar { + display: block; + /* Visibility needed to make sure things hide in older browsers too. */ + + visibility: visible; + opacity: 1; + /* transition */ + -webkit-transition: visibility 0.1s, opacity 0.1s; + -moz-transition: visibility 0.1s, opacity 0.1s; + -o-transition: visibility 0.1s, opacity 0.1s; + transition: visibility 0.1s, opacity 0.1s; +} +/* Hide the control bar when the video is playing and the user is inactive */ +.vjs-default-skin.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar { + display: block; + visibility: hidden; + opacity: 0; + /* transition */ + -webkit-transition: visibility 1s, opacity 1s; + -moz-transition: visibility 1s, opacity 1s; + -o-transition: visibility 1s, opacity 1s; + transition: visibility 1s, opacity 1s; +} +.vjs-default-skin.vjs-controls-disabled .vjs-control-bar { + display: none; +} +.vjs-default-skin.vjs-using-native-controls .vjs-control-bar { + display: none; +} +/* IE8 is flakey with fonts, and you have to change the actual content to force +fonts to show/hide properly. + - "\9" IE8 hack didn't work for this + - Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9 +*/ +@media \0screen { + .vjs-default-skin.vjs-user-inactive.vjs-playing .vjs-control-bar :before { + content: ""; + } +} +/* General styles for individual controls. */ +.vjs-default-skin .vjs-control { + outline: none; + position: relative; + float: left; + text-align: center; + margin: 0; + padding: 0; + height: 3.0em; + width: 4em; +} +/* FontAwsome button icons */ +.vjs-default-skin .vjs-control:before { + font-family: VideoJS; + font-size: 1.5em; + line-height: 2; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + text-align: center; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} +/* Replacement for focus outline */ +.vjs-default-skin .vjs-control:focus:before, +.vjs-default-skin .vjs-control:hover:before { + text-shadow: 0em 0em 1em #ffffff; +} +.vjs-default-skin .vjs-control:focus { + /* outline: 0; */ + /* keyboard-only users cannot see the focus on several of the UI elements when + this is set to 0 */ + +} +/* Hide control text visually, but have it available for screenreaders */ +.vjs-default-skin .vjs-control-text { + /* hide-visually */ + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +/* Play/Pause +-------------------------------------------------------------------------------- +*/ +.vjs-default-skin .vjs-play-control { + width: 5em; + cursor: pointer; +} +.vjs-default-skin .vjs-play-control:before { + content: "\e001"; +} +.vjs-default-skin.vjs-playing .vjs-play-control:before { + content: "\e002"; +} +/* Volume/Mute +-------------------------------------------------------------------------------- */ +.vjs-default-skin .vjs-mute-control, +.vjs-default-skin .vjs-volume-menu-button { + cursor: pointer; + float: right; +} +.vjs-default-skin .vjs-mute-control:before, +.vjs-default-skin .vjs-volume-menu-button:before { + content: "\e006"; +} +.vjs-default-skin .vjs-mute-control.vjs-vol-0:before, +.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before { + content: "\e003"; +} +.vjs-default-skin .vjs-mute-control.vjs-vol-1:before, +.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before { + content: "\e004"; +} +.vjs-default-skin .vjs-mute-control.vjs-vol-2:before, +.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before { + content: "\e005"; +} +.vjs-default-skin .vjs-volume-control { + width: 5em; + float: right; +} +.vjs-default-skin .vjs-volume-bar { + width: 5em; + height: 0.6em; + margin: 1.1em auto 0; +} +.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content { + height: 2.9em; +} +.vjs-default-skin .vjs-volume-level { + position: absolute; + top: 0; + left: 0; + height: 0.5em; + background: #66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat; +} +.vjs-default-skin .vjs-volume-bar .vjs-volume-handle { + width: 0.5em; + height: 0.5em; +} +.vjs-default-skin .vjs-volume-handle:before { + font-size: 0.9em; + top: -0.2em; + left: -0.2em; + width: 1em; + height: 1em; +} +.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content { + width: 6em; + left: -4em; +} +/* Progress +-------------------------------------------------------------------------------- +*/ +.vjs-default-skin .vjs-progress-control { + position: absolute; + left: 0; + right: 0; + width: auto; + font-size: 0.3em; + height: 1em; + /* Set above the rest of the controls. */ + top: -1em; + /* Shrink the bar slower than it grows. */ + /* transition */ + -webkit-transition: all 0.4s; + -moz-transition: all 0.4s; + -o-transition: all 0.4s; + transition: all 0.4s; +} +/* On hover, make the progress bar grow to something that's more clickable. + This simply changes the overall font for the progress bar, and this + updates both the em-based widths and heights, as wells as the icon font */ +.vjs-default-skin:hover .vjs-progress-control { + font-size: .9em; + /* Even though we're not changing the top/height, we need to include them in + the transition so they're handled correctly. */ + + /* transition */ + -webkit-transition: all 0.2s; + -moz-transition: all 0.2s; + -o-transition: all 0.2s; + transition: all 0.2s; +} +/* Box containing play and load progresses. Also acts as seek scrubber. */ +.vjs-default-skin .vjs-progress-holder { + height: 100%; +} +/* Progress Bars */ +.vjs-default-skin .vjs-progress-holder .vjs-play-progress, +.vjs-default-skin .vjs-progress-holder .vjs-load-progress { + position: absolute; + display: block; + height: 100%; + margin: 0; + padding: 0; + /* Needed for IE6 */ + left: 0; + top: 0; +} +.vjs-default-skin .vjs-play-progress { + /* + Using a data URI to create the white diagonal lines with a transparent + background. Surprisingly works in IE8. + Created using http://www.patternify.com + Changing the first color value will change the bar color. + Also using a paralax effect to make the lines move backwards. + The -50% left position makes that happen. + */ + + background: #66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat; +} +.vjs-default-skin .vjs-load-progress { + background: #646464 /* IE8- Fallback */; + background: rgba(255, 255, 255, 0.4); +} +.vjs-default-skin .vjs-seek-handle { + width: 1.5em; + height: 100%; +} +.vjs-default-skin .vjs-seek-handle:before { + padding-top: 0.1em /* Minor adjustment */; +} +/* Time Display +-------------------------------------------------------------------------------- +*/ +.vjs-default-skin .vjs-time-controls { + font-size: 1em; + /* Align vertically by making the line height the same as the control bar */ + line-height: 3em; +} +.vjs-default-skin .vjs-current-time { + float: left; +} +.vjs-default-skin .vjs-duration { + float: left; +} +/* Remaining time is in the HTML, but not included in default design */ +.vjs-default-skin .vjs-remaining-time { + display: none; + float: left; +} +.vjs-time-divider { + float: left; + line-height: 3em; +} +/* Fullscreen +-------------------------------------------------------------------------------- +*/ +.vjs-default-skin .vjs-fullscreen-control { + width: 3.8em; + cursor: pointer; + float: right; +} +.vjs-default-skin .vjs-fullscreen-control:before { + content: "\e000"; +} +/* Switch to the exit icon when the player is in fullscreen */ +.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before { + content: "\e00b"; +} +/* Big Play Button (play button at start) +-------------------------------------------------------------------------------- +Positioning of the play button in the center or other corners can be done more +easily in the skin designer. http://designer.videojs.com/ +*/ +.vjs-default-skin .vjs-big-play-button { + left: 0.5em; + top: 0.5em; + font-size: 3em; + display: block; + z-index: 2; + position: absolute; + width: 4em; + height: 2.6em; + text-align: center; + vertical-align: middle; + cursor: pointer; + opacity: 1; + /* Need a slightly gray bg so it can be seen on black backgrounds */ + /* background-color-with-alpha */ + background-color: #07141e; + background-color: rgba(7, 20, 30, 0.7); + border: 0.1em solid #3b4249; + /* border-radius */ + -webkit-border-radius: 0.8em; + -moz-border-radius: 0.8em; + border-radius: 0.8em; + /* box-shadow */ + -webkit-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25); + -moz-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25); + box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25); + /* transition */ + -webkit-transition: all 0.4s; + -moz-transition: all 0.4s; + -o-transition: all 0.4s; + transition: all 0.4s; +} +/* Hide if controls are disabled */ +.vjs-default-skin.vjs-controls-disabled .vjs-big-play-button { + display: none; +} +/* Hide when video starts playing */ +.vjs-default-skin.vjs-has-started .vjs-big-play-button { + display: none; +} +/* Hide on mobile devices. Remove when we stop using native controls + by default on mobile */ +.vjs-default-skin.vjs-using-native-controls .vjs-big-play-button { + display: none; +} +.vjs-default-skin:hover .vjs-big-play-button, +.vjs-default-skin .vjs-big-play-button:focus { + outline: 0; + border-color: #fff; + /* IE8 needs a non-glow hover state */ + background-color: #505050; + background-color: rgba(50, 50, 50, 0.75); + /* box-shadow */ + -webkit-box-shadow: 0 0 3em #ffffff; + -moz-box-shadow: 0 0 3em #ffffff; + box-shadow: 0 0 3em #ffffff; + /* transition */ + -webkit-transition: all 0s; + -moz-transition: all 0s; + -o-transition: all 0s; + transition: all 0s; +} +.vjs-default-skin .vjs-big-play-button:before { + content: "\e001"; + font-family: VideoJS; + /* In order to center the play icon vertically we need to set the line height + to the same as the button height */ + + line-height: 2.6em; + text-shadow: 0.05em 0.05em 0.1em #000; + text-align: center /* Needed for IE8 */; + position: absolute; + left: 0; + width: 100%; + height: 100%; +} +/* Loading Spinner +-------------------------------------------------------------------------------- +*/ +.vjs-loading-spinner { + display: none; + position: absolute; + top: 50%; + left: 50%; + font-size: 5em; + line-height: 1; + width: 1em; + height: 1em; + margin-left: -0.5em; + margin-top: -0.5em; + opacity: 0.75; + /* animation */ + -webkit-animation: spin 1.5s infinite linear; + -moz-animation: spin 1.5s infinite linear; + -o-animation: spin 1.5s infinite linear; + animation: spin 1.5s infinite linear; +} +.vjs-default-skin .vjs-loading-spinner:before { + content: "\e00a"; + font-family: VideoJS; + position: absolute; + top: 0; + left: 0; + width: 1em; + height: 1em; + text-align: center; + text-shadow: 0em 0em 0.1em #000; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } +} +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } +} +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } +} +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } +} +/* Menu Buttons (Captions/Subtitles/etc.) +-------------------------------------------------------------------------------- +*/ +.vjs-default-skin .vjs-menu-button { + float: right; + cursor: pointer; +} +.vjs-default-skin .vjs-menu { + display: none; + position: absolute; + bottom: 0; + left: 0em; + /* (Width of vjs-menu - width of button) / 2 */ + + width: 0em; + height: 0em; + margin-bottom: 3em; + border-left: 2em solid transparent; + border-right: 2em solid transparent; + border-top: 1.55em solid #000000; + /* Same width top as ul bottom */ + + border-top-color: rgba(7, 40, 50, 0.5); + /* Same as ul background */ + +} +/* Button Pop-up Menu */ +.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content { + display: block; + padding: 0; + margin: 0; + position: absolute; + width: 10em; + bottom: 1.5em; + /* Same bottom as vjs-menu border-top */ + + max-height: 15em; + overflow: auto; + left: -5em; + /* Width of menu - width of button / 2 */ + + /* background-color-with-alpha */ + background-color: #07141e; + background-color: rgba(7, 20, 30, 0.7); + /* box-shadow */ + -webkit-box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2); + -moz-box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2); + box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2); +} +.vjs-default-skin .vjs-menu-button:hover .vjs-menu { + display: block; +} +.vjs-default-skin .vjs-menu-button ul li { + list-style: none; + margin: 0; + padding: 0.3em 0 0.3em 0; + line-height: 1.4em; + font-size: 1.2em; + text-align: center; + text-transform: lowercase; +} +.vjs-default-skin .vjs-menu-button ul li.vjs-selected { + background-color: #000; +} +.vjs-default-skin .vjs-menu-button ul li:focus, +.vjs-default-skin .vjs-menu-button ul li:hover, +.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus, +.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover { + outline: 0; + color: #111; + /* background-color-with-alpha */ + background-color: #ffffff; + background-color: rgba(255, 255, 255, 0.75); + /* box-shadow */ + -webkit-box-shadow: 0 0 1em #ffffff; + -moz-box-shadow: 0 0 1em #ffffff; + box-shadow: 0 0 1em #ffffff; +} +.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title { + text-align: center; + text-transform: uppercase; + font-size: 1em; + line-height: 2em; + padding: 0; + margin: 0 0 0.3em 0; + font-weight: bold; + cursor: default; +} +/* Subtitles Button */ +.vjs-default-skin .vjs-subtitles-button:before { + content: "\e00c"; +} +/* Captions Button */ +.vjs-default-skin .vjs-captions-button:before { + content: "\e008"; +} +/* Replacement for focus outline */ +.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before, +.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before { + /* box-shadow */ + -webkit-box-shadow: 0 0 1em #ffffff; + -moz-box-shadow: 0 0 1em #ffffff; + box-shadow: 0 0 1em #ffffff; +} +/* +REQUIRED STYLES (be careful overriding) +================================================================================ +When loading the player, the video tag is replaced with a DIV, +that will hold the video tag or object tag for other playback methods. +The div contains the video playback element (Flash or HTML5) and controls, +and sets the width and height of the video. + +** If you want to add some kind of border/padding (e.g. a frame), or special +positioning, use another containing element. Otherwise you risk messing up +control positioning and full window mode. ** +*/ +.video-js { + background-color: #000; + position: relative; + padding: 0; + /* Start with 10px for base font size so other dimensions can be em based and + easily calculable. */ + + font-size: 10px; + /* Allow poster to be vertially aligned. */ + + vertical-align: middle; + /* display: table-cell; */ + /*This works in Safari but not Firefox.*/ + + /* Provide some basic defaults for fonts */ + + font-weight: normal; + font-style: normal; + /* Avoiding helvetica: issue #376 */ + + font-family: Arial, sans-serif; + /* Turn off user selection (text highlighting) by default. + The majority of player components will not be text blocks. + Text areas will need to turn user selection back on. */ + + /* user-select */ + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +/* Playback technology elements expand to the width/height of the containing div + <video> or <object> */ +.video-js .vjs-tech { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +/* Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when + checking fullScreenEnabled. */ +.video-js:-moz-full-screen { + position: absolute; +} +/* Fullscreen Styles */ +body.vjs-full-window { + padding: 0; + margin: 0; + height: 100%; + /* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */ + overflow-y: auto; +} +.video-js.vjs-fullscreen { + position: fixed; + overflow: hidden; + z-index: 1000; + left: 0; + top: 0; + bottom: 0; + right: 0; + width: 100% !important; + height: 100% !important; + /* IE6 full-window (underscore hack) */ + _position: absolute; +} +.video-js:-webkit-full-screen { + width: 100% !important; + height: 100% !important; +} +.video-js.vjs-fullscreen.vjs-user-inactive { + cursor: none; +} +/* Poster Styles */ +.vjs-poster { + background-repeat: no-repeat; + background-position: 50% 50%; + background-size: contain; + cursor: pointer; + height: 100%; + margin: 0; + padding: 0; + position: relative; + width: 100%; +} +.vjs-poster img { + display: block; + margin: 0 auto; + max-height: 100%; + padding: 0; + width: 100%; +} +/* Hide the poster when native controls are used otherwise it covers them */ +.video-js.vjs-using-native-controls .vjs-poster { + display: none; +} +/* Text Track Styles */ +/* Overall track holder for both captions and subtitles */ +.video-js .vjs-text-track-display { + text-align: center; + position: absolute; + bottom: 4em; + /* Leave padding on left and right */ + left: 1em; + right: 1em; +} +/* Individual tracks */ +.video-js .vjs-text-track { + display: none; + font-size: 1.4em; + text-align: center; + margin-bottom: 0.1em; + /* Transparent black background, or fallback to all black (oldIE) */ + /* background-color-with-alpha */ + background-color: #000000; + background-color: rgba(0, 0, 0, 0.5); +} +.video-js .vjs-subtitles { + color: #ffffff /* Subtitles are white */; +} +.video-js .vjs-captions { + color: #ffcc66 /* Captions are yellow */; +} +.vjs-tt-cue { + display: block; +} +/* Hide disabled or unsupported controls */ +.vjs-default-skin .vjs-hidden { + display: none; +} +.vjs-lock-showing { + display: block !important; + opacity: 1; + visibility: visible; +} +/* ----------------------------------------------------------------------------- +The original source of this file lives at +https://github.com/videojs/video.js/blob/master/src/css/video-js.less */ diff --git a/extlib/video-js/video-js.min.css b/extlib/video-js/video-js.min.css index 06c0e6b4..07bde6ee 100644 --- a/extlib/video-js/video-js.min.css +++ b/extlib/video-js/video-js.min.css @@ -1 +1,5 @@ -.video-js{background-color:#000;position:relative;padding:0;font-size:10px;vertical-align:middle}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js:-moz-full-screen{position:absolute}body.vjs-full-window{padding:0;margin:0;height:100%;overflow-y:auto}.video-js.vjs-fullscreen{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0;width:100%!important;height:100%!important;_position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.vjs-poster{margin:0 auto;padding:0;cursor:pointer;position:relative;width:100%;max-height:100%}.video-js .vjs-text-track-display{text-align:center;position:absolute;bottom:4em;left:1em;right:1em;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}.video-js .vjs-text-track{display:none;color:#fff;font-size:1.4em;text-align:center;margin-bottom:.1em;background:#000;background:rgba(0,0,0,0.50)}.video-js .vjs-subtitles{color:#fff}.video-js .vjs-captions{color:#fc6}.vjs-tt-cue{display:block}.vjs-fade-in{visibility:visible!important;opacity:1!important;-webkit-transition:visibility 0s linear 0s,opacity .3s linear;-moz-transition:visibility 0s linear 0s,opacity .3s linear;-ms-transition:visibility 0s linear 0s,opacity .3s linear;-o-transition:visibility 0s linear 0s,opacity .3s linear;transition:visibility 0s linear 0s,opacity .3s linear}.vjs-fade-out{visibility:hidden!important;opacity:0!important;-webkit-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-moz-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-ms-transition:visibility 0s linear 1.5s,opacity 1.5s linear;-o-transition:visibility 0s linear 1.5s,opacity 1.5s linear;transition:visibility 0s linear 1.5s,opacity 1.5s linear}.vjs-default-skin .vjs-controls{position:absolute;bottom:0;left:0;right:0;margin:0;padding:0;height:2.6em;color:#fff;border-top:1px solid #404040;background:#242424;background:-moz-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(50%,#242424),color-stop(50%,#1f1f1f),color-stop(100%,#171717));background:-webkit-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-o-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:-ms-linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);background:linear-gradient(top,#242424 50%,#1f1f1f 50%,#171717 100%);visibility:hidden;opacity:0}.vjs-default-skin .vjs-control{position:relative;float:left;text-align:center;margin:0;padding:0;height:2.6em;width:2.6em}.vjs-default-skin .vjs-control:focus{outline:0}.vjs-default-skin .vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.vjs-default-skin .vjs-play-control{width:5em;cursor:pointer!important}.vjs-default-skin.vjs-paused .vjs-play-control div{width:15px;height:17px;background:url('video-js.png');margin:.5em auto 0}.vjs-default-skin.vjs-playing .vjs-play-control div{width:15px;height:17px;background:url('video-js.png') -25px 0;margin:.5em auto 0}.vjs-default-skin .vjs-rewind-control{width:5em;cursor:pointer!important}.vjs-default-skin .vjs-rewind-control div{width:19px;height:16px;background:url('video-js.png');margin:.5em auto 0}.vjs-default-skin .vjs-mute-control{width:3.8em;cursor:pointer!important;float:right}.vjs-default-skin .vjs-mute-control div{width:22px;height:16px;background:url('video-js.png') -75px -25px;margin:.5em auto 0}.vjs-default-skin .vjs-mute-control.vjs-vol-0 div{background:url('video-js.png') 0 -25px}.vjs-default-skin .vjs-mute-control.vjs-vol-1 div{background:url('video-js.png') -25px -25px}.vjs-default-skin .vjs-mute-control.vjs-vol-2 div{background:url('video-js.png') -50px -25px}.vjs-default-skin .vjs-volume-control{width:5em;float:right}.vjs-default-skin .vjs-volume-bar{position:relative;width:5em;height:.6em;margin:1em auto 0;cursor:pointer!important;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#666;background:-moz-linear-gradient(top,#333,#666);background:-webkit-gradient(linear,0% 0,0% 100%,from(#333),to(#666));background:-webkit-linear-gradient(top,#333,#666);background:-o-linear-gradient(top,#333,#666);background:-ms-linear-gradient(top,#333,#666);background:linear-gradient(top,#333,#666)}.vjs-default-skin .vjs-volume-level{position:absolute;top:0;left:0;height:.6em;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#fff;background:-moz-linear-gradient(top,#fff,#ccc);background:-webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ccc));background:-webkit-linear-gradient(top,#fff,#ccc);background:-o-linear-gradient(top,#fff,#ccc);background:-ms-linear-gradient(top,#fff,#ccc);background:linear-gradient(top,#fff,#ccc)}.vjs-default-skin .vjs-volume-handle{position:absolute;top:-0.2em;width:.8em;height:.8em;background:#ccc;left:0;border:1px solid #fff;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.vjs-default-skin div.vjs-progress-control{position:absolute;left:4.8em;right:4.8em;height:1.0em;width:auto;top:-1.3em;border-bottom:1px solid #1f1f1f;border-top:1px solid #222;background:#333;background:-moz-linear-gradient(top,#222,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#222),to(#333));background:-webkit-linear-gradient(top,#222,#333);background:-o-linear-gradient(top,#333,#222);background:-ms-linear-gradient(top,#333,#222);background:linear-gradient(top,#333,#222)}.vjs-default-skin .vjs-progress-holder{position:relative;cursor:pointer!important;padding:0;margin:0;height:1.0em;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em;background:#111;background:-moz-linear-gradient(top,#111,#262626);background:-webkit-gradient(linear,0% 0,0% 100%,from(#111),to(#262626));background:-webkit-linear-gradient(top,#111,#262626);background:-o-linear-gradient(top,#111,#262626);background:-ms-linear-gradient(top,#111,#262626);background:linear-gradient(top,#111,#262626)}.vjs-default-skin .vjs-progress-holder .vjs-play-progress,.vjs-default-skin .vjs-progress-holder .vjs-load-progress{position:absolute;display:block;height:1.0em;margin:0;padding:0;left:0;top:0;-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.vjs-default-skin .vjs-play-progress{background:#fff;background:-moz-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#fff),color-stop(50%,#d6d6d6),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-o-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:-ms-linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:linear-gradient(top,#fff 0,#d6d6d6 50%,#fff 100%);background:#efefef;background:-moz-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#efefef),color-stop(50%,#f5f5f5),color-stop(50%,#dbdbdb),color-stop(100%,#f1f1f1));background:-webkit-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-o-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);background:-ms-linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef',endColorstr='#f1f1f1',GradientType=0);background:linear-gradient(top,#efefef 0,#f5f5f5 50%,#dbdbdb 50%,#f1f1f1 100%)}.vjs-default-skin .vjs-load-progress{opacity:.8;background:#666;background:-moz-linear-gradient(top,#666,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#666),to(#333));background:-webkit-linear-gradient(top,#666,#333);background:-o-linear-gradient(top,#666,#333);background:-ms-linear-gradient(top,#666,#333);background:linear-gradient(top,#666,#333)}.vjs-default-skin div.vjs-seek-handle{position:absolute;width:16px;height:16px;margin-top:-0.3em;left:0;top:0;background:url('video-js.png') 0 -50px;-moz-border-radius:.8em;-webkit-border-radius:.8em;border-radius:.8em;-webkit-box-shadow:0 2px 4px 0 #000;-moz-box-shadow:0 2px 4px 0 #000;box-shadow:0 2px 4px 0 #000}.vjs-default-skin .vjs-time-controls{position:absolute;right:0;height:1.0em;width:4.8em;top:-1.3em;border-bottom:1px solid #1f1f1f;border-top:1px solid #222;background-color:#333;font-size:1em;line-height:1.0em;font-weight:normal;font-family:Helvetica,Arial,sans-serif;background:#333;background:-moz-linear-gradient(top,#222,#333);background:-webkit-gradient(linear,0% 0,0% 100%,from(#222),to(#333));background:-webkit-linear-gradient(top,#222,#333);background:-o-linear-gradient(top,#333,#222);background:-ms-linear-gradient(top,#333,#222);background:linear-gradient(top,#333,#222)}.vjs-default-skin .vjs-current-time{left:0}.vjs-default-skin .vjs-duration{right:0;display:none}.vjs-default-skin .vjs-remaining-time{right:0}.vjs-time-divider{display:none}.vjs-default-skin .vjs-time-control{font-size:1em;line-height:1;font-weight:normal;font-family:Helvetica,Arial,sans-serif}.vjs-default-skin .vjs-time-control span{line-height:25px}.vjs-secondary-controls{float:right}.vjs-default-skin .vjs-fullscreen-control{width:3.8em;cursor:pointer!important;float:right}.vjs-default-skin .vjs-fullscreen-control div{width:16px;height:16px;background:url('video-js.png') -50px 0;margin:.5em auto 0}.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control div{background:url('video-js.png') -75px 0}.vjs-default-skin .vjs-big-play-button{display:block;z-index:2;position:absolute;top:50%;left:50%;width:8.0em;height:8.0em;margin:-42px 0 0 -42px;text-align:center;vertical-align:center;cursor:pointer!important;border:.2em solid #fff;opacity:.95;-webkit-border-radius:25px;-moz-border-radius:25px;border-radius:25px;background:#454545;background:-moz-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0%,#454545),color-stop(50%,#232323),color-stop(50%,#161616),color-stop(100%,#3f3f3f));background:-webkit-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-o-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);background:-ms-linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545',endColorstr='#3f3f3f',GradientType=0);background:linear-gradient(top,#454545 0,#232323 50%,#161616 50%,#3f3f3f 100%);-webkit-box-shadow:4px 4px 8px #000;-moz-box-shadow:4px 4px 8px #000;box-shadow:4px 4px 8px #000}.vjs-default-skin div.vjs-big-play-button:hover{-webkit-box-shadow:0 0 80px #fff;-moz-box-shadow:0 0 80px #fff;box-shadow:0 0 80px #fff}.vjs-default-skin div.vjs-big-play-button span{position:absolute;top:50%;left:50%;display:block;width:35px;height:42px;margin:-20px 0 0 -15px;background:url('video-js.png') -100px 0}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;width:55px;height:55px;margin:-28px 0 0 -28px;-webkit-animation-name:rotatethis;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear;-moz-animation-name:rotatethis;-moz-animation-duration:1s;-moz-animation-iteration-count:infinite;-moz-animation-timing-function:linear}@-webkit-keyframes rotatethis{0%{-webkit-transform:scale(0.6) rotate(0deg)}12.5%{-webkit-transform:scale(0.6) rotate(0deg)}12.51%{-webkit-transform:scale(0.6) rotate(45deg)}25%{-webkit-transform:scale(0.6) rotate(45deg)}25.01%{-webkit-transform:scale(0.6) rotate(90deg)}37.5%{-webkit-transform:scale(0.6) rotate(90deg)}37.51%{-webkit-transform:scale(0.6) rotate(135deg)}50%{-webkit-transform:scale(0.6) rotate(135deg)}50.01%{-webkit-transform:scale(0.6) rotate(180deg)}62.5%{-webkit-transform:scale(0.6) rotate(180deg)}62.51%{-webkit-transform:scale(0.6) rotate(225deg)}75%{-webkit-transform:scale(0.6) rotate(225deg)}75.01%{-webkit-transform:scale(0.6) rotate(270deg)}87.5%{-webkit-transform:scale(0.6) rotate(270deg)}87.51%{-webkit-transform:scale(0.6) rotate(315deg)}100%{-webkit-transform:scale(0.6) rotate(315deg)}}@-moz-keyframes rotatethis{0%{-moz-transform:scale(0.6) rotate(0deg)}12.5%{-moz-transform:scale(0.6) rotate(0deg)}12.51%{-moz-transform:scale(0.6) rotate(45deg)}25%{-moz-transform:scale(0.6) rotate(45deg)}25.01%{-moz-transform:scale(0.6) rotate(90deg)}37.5%{-moz-transform:scale(0.6) rotate(90deg)}37.51%{-moz-transform:scale(0.6) rotate(135deg)}50%{-moz-transform:scale(0.6) rotate(135deg)}50.01%{-moz-transform:scale(0.6) rotate(180deg)}62.5%{-moz-transform:scale(0.6) rotate(180deg)}62.51%{-moz-transform:scale(0.6) rotate(225deg)}75%{-moz-transform:scale(0.6) rotate(225deg)}75.01%{-moz-transform:scale(0.6) rotate(270deg)}87.5%{-moz-transform:scale(0.6) rotate(270deg)}87.51%{-moz-transform:scale(0.6) rotate(315deg)}100%{-moz-transform:scale(0.6) rotate(315deg)}}div.vjs-loading-spinner .ball1{opacity:.12;position:absolute;left:20px;top:0;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball2{opacity:.25;position:absolute;left:34px;top:6px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball3{opacity:.37;position:absolute;left:40px;top:20px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball4{opacity:.50;position:absolute;left:34px;top:34px;width:13px;height:13px;background:#fff;border-radius:10px;-webkit-border-radius:10px;-moz-border-radius:15px;border:1px solid #ccc}div.vjs-loading-spinner .ball5{opacity:.62;position:absolute;left:20px;top:40px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball6{opacity:.75;position:absolute;left:6px;top:34px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball7{opacity:.87;position:absolute;left:0;top:20px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}div.vjs-loading-spinner .ball8{opacity:1.00;position:absolute;left:6px;top:6px;width:13px;height:13px;background:#fff;border-radius:13px;-webkit-border-radius:13px;-moz-border-radius:13px;border:1px solid #ccc}.vjs-default-skin .vjs-menu-button{float:right;margin:.2em .5em 0 0;padding:0;width:3em;height:2em;cursor:pointer!important;border:1px solid #111;-moz-border-radius:.3em;-webkit-border-radius:.3em;border-radius:.3em;background:#4d4d4d;background:-moz-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#4d4d4d),color-stop(50%,#3f3f3f),color-stop(50%,#333),color-stop(100%,#252525));background:-webkit-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-o-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-ms-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%)}.vjs-default-skin .vjs-menu-button div{background:url('video-js.png') 0 -75px no-repeat;width:16px;height:16px;margin:.2em auto 0;padding:0}.vjs-default-skin .vjs-menu-button ul{display:none;opacity:.8;padding:0;margin:0;position:absolute;width:10em;bottom:2em;max-height:15em;left:-3.5em;background-color:#111;border:2px solid #333;-moz-border-radius:.7em;-webkit-border-radius:1em;border-radius:.5em;-webkit-box-shadow:0 2px 4px 0 #000;-moz-box-shadow:0 2px 4px 0 #000;box-shadow:0 2px 4px 0 #000;overflow:auto}.vjs-default-skin .vjs-menu-button:focus ul,.vjs-default-skin .vjs-menu-button:hover ul{display:block;list-style:none}.vjs-default-skin .vjs-menu-button ul li{list-style:none;margin:0;padding:.3em 0 .3em 20px;line-height:1.4em;font-size:1.2em;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;text-align:left}.vjs-default-skin .vjs-menu-button ul li.vjs-selected{text-decoration:underline;background:url('video-js.png') -125px -50px no-repeat}.vjs-default-skin .vjs-menu-button ul li:focus,.vjs-default-skin .vjs-menu-button ul li:hover,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover{background-color:#ccc;color:#111;outline:0}.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em 0;color:#fff;font-weight:bold;cursor:default;background:#4d4d4d;background:-moz-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#4d4d4d),color-stop(50%,#3f3f3f),color-stop(50%,#333),color-stop(100%,#252525));background:-webkit-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-o-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:-ms-linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%);background:linear-gradient(top,#4d4d4d 0,#3f3f3f 50%,#333 50%,#252525 100%)}.vjs-default-skin .vjs-captions-button div{background-position:-25px -75px}.vjs-default-skin .vjs-chapters-button div{background-position:-100px -75px}.vjs-default-skin .vjs-chapters-button ul{width:20em;left:-8.5em}
\ No newline at end of file +/*! +Video.js Default Styles (http://videojs.com) +Version 4.2.1 +Create your own skin at http://designer.videojs.com +*/.vjs-default-skin{color:#ccc}@font-face{font-family:VideoJS;src:url(font/vjs.eot);src:url(font/vjs.eot?#iefix) format('embedded-opentype'),url(font/vjs.woff) format('woff'),url(font/vjs.ttf) format('truetype');font-weight:400;font-style:normal}.vjs-default-skin .vjs-slider{outline:0;position:relative;cursor:pointer;padding:0;background-color:#333;background-color:rgba(51,51,51,.9)}.vjs-default-skin .vjs-slider:focus{-webkit-box-shadow:0 0 2em #fff;-moz-box-shadow:0 0 2em #fff;box-shadow:0 0 2em #fff}.vjs-default-skin .vjs-slider-handle{position:absolute;left:0;top:0}.vjs-default-skin .vjs-slider-handle:before{content:"\e009";font-family:VideoJS;font-size:1em;line-height:1;text-align:center;text-shadow:0 0 1em #fff;position:absolute;top:0;left:0;-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)}.vjs-default-skin .vjs-control-bar{display:none;position:absolute;bottom:0;left:0;right:0;height:3em;background-color:#07141e;background-color:rgba(7,20,30,.7)}.vjs-default-skin.vjs-has-started .vjs-control-bar{display:block;visibility:visible;opacity:1;-webkit-transition:visibility .1s,opacity .1s;-moz-transition:visibility .1s,opacity .1s;-o-transition:visibility .1s,opacity .1s;transition:visibility .1s,opacity .1s}.vjs-default-skin.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar{display:block;visibility:hidden;opacity:0;-webkit-transition:visibility 1s,opacity 1s;-moz-transition:visibility 1s,opacity 1s;-o-transition:visibility 1s,opacity 1s;transition:visibility 1s,opacity 1s}.vjs-default-skin.vjs-controls-disabled .vjs-control-bar{display:none}.vjs-default-skin.vjs-using-native-controls .vjs-control-bar{display:none}@media \0screen{.vjs-default-skin.vjs-user-inactive.vjs-playing .vjs-control-bar :before{content:""}}.vjs-default-skin .vjs-control{outline:0;position:relative;float:left;text-align:center;margin:0;padding:0;height:3em;width:4em}.vjs-default-skin .vjs-control:before{font-family:VideoJS;font-size:1.5em;line-height:2;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;text-shadow:1px 1px 1px rgba(0,0,0,.5)}.vjs-default-skin .vjs-control:focus:before,.vjs-default-skin .vjs-control:hover:before{text-shadow:0 0 1em #fff}.vjs-default-skin .vjs-control:focus{}.vjs-default-skin .vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.vjs-default-skin .vjs-play-control{width:5em;cursor:pointer}.vjs-default-skin .vjs-play-control:before{content:"\e001"}.vjs-default-skin.vjs-playing .vjs-play-control:before{content:"\e002"}.vjs-default-skin .vjs-mute-control,.vjs-default-skin .vjs-volume-menu-button{cursor:pointer;float:right}.vjs-default-skin .vjs-mute-control:before,.vjs-default-skin .vjs-volume-menu-button:before{content:"\e006"}.vjs-default-skin .vjs-mute-control.vjs-vol-0:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before{content:"\e003"}.vjs-default-skin .vjs-mute-control.vjs-vol-1:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before{content:"\e004"}.vjs-default-skin .vjs-mute-control.vjs-vol-2:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before{content:"\e005"}.vjs-default-skin .vjs-volume-control{width:5em;float:right}.vjs-default-skin .vjs-volume-bar{width:5em;height:.6em;margin:1.1em auto 0}.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content{height:2.9em}.vjs-default-skin .vjs-volume-level{position:absolute;top:0;left:0;height:.5em;background:#66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat}.vjs-default-skin .vjs-volume-bar .vjs-volume-handle{width:.5em;height:.5em}.vjs-default-skin .vjs-volume-handle:before{font-size:.9em;top:-.2em;left:-.2em;width:1em;height:1em}.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content{width:6em;left:-4em}.vjs-default-skin .vjs-progress-control{position:absolute;left:0;right:0;width:auto;font-size:.3em;height:1em;top:-1em;-webkit-transition:all .4s;-moz-transition:all .4s;-o-transition:all .4s;transition:all .4s}.vjs-default-skin:hover .vjs-progress-control{font-size:.9em;-webkit-transition:all .2s;-moz-transition:all .2s;-o-transition:all .2s;transition:all .2s}.vjs-default-skin .vjs-progress-holder{height:100%}.vjs-default-skin .vjs-progress-holder .vjs-play-progress,.vjs-default-skin .vjs-progress-holder .vjs-load-progress{position:absolute;display:block;height:100%;margin:0;padding:0;left:0;top:0}.vjs-default-skin .vjs-play-progress{background:#66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat}.vjs-default-skin .vjs-load-progress{background:#646464;background:rgba(255,255,255,.4)}.vjs-default-skin .vjs-seek-handle{width:1.5em;height:100%}.vjs-default-skin .vjs-seek-handle:before{padding-top:.1em}.vjs-default-skin .vjs-time-controls{font-size:1em;line-height:3em}.vjs-default-skin .vjs-current-time{float:left}.vjs-default-skin .vjs-duration{float:left}.vjs-default-skin .vjs-remaining-time{display:none;float:left}.vjs-time-divider{float:left;line-height:3em}.vjs-default-skin .vjs-fullscreen-control{width:3.8em;cursor:pointer;float:right}.vjs-default-skin .vjs-fullscreen-control:before{content:"\e000"}.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before{content:"\e00b"}.vjs-default-skin .vjs-big-play-button{left:.5em;top:.5em;font-size:3em;display:block;z-index:2;position:absolute;width:4em;height:2.6em;text-align:center;vertical-align:middle;cursor:pointer;opacity:1;background-color:#07141e;background-color:rgba(7,20,30,.7);border:.1em solid #3b4249;-webkit-border-radius:.8em;-moz-border-radius:.8em;border-radius:.8em;-webkit-box-shadow:0 0 1em rgba(255,255,255,.25);-moz-box-shadow:0 0 1em rgba(255,255,255,.25);box-shadow:0 0 1em rgba(255,255,255,.25);-webkit-transition:all .4s;-moz-transition:all .4s;-o-transition:all .4s;transition:all .4s}.vjs-default-skin.vjs-controls-disabled .vjs-big-play-button{display:none}.vjs-default-skin.vjs-has-started .vjs-big-play-button{display:none}.vjs-default-skin.vjs-using-native-controls .vjs-big-play-button{display:none}.vjs-default-skin:hover .vjs-big-play-button,.vjs-default-skin .vjs-big-play-button:focus{outline:0;border-color:#fff;background-color:#505050;background-color:rgba(50,50,50,.75);-webkit-box-shadow:0 0 3em #fff;-moz-box-shadow:0 0 3em #fff;box-shadow:0 0 3em #fff;-webkit-transition:all 0s;-moz-transition:all 0s;-o-transition:all 0s;transition:all 0s}.vjs-default-skin .vjs-big-play-button:before{content:"\e001";font-family:VideoJS;line-height:2.6em;text-shadow:.05em .05em .1em #000;text-align:center;position:absolute;left:0;width:100%;height:100%}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;font-size:5em;line-height:1;width:1em;height:1em;margin-left:-.5em;margin-top:-.5em;opacity:.75;-webkit-animation:spin 1.5s infinite linear;-moz-animation:spin 1.5s infinite linear;-o-animation:spin 1.5s infinite linear;animation:spin 1.5s infinite linear}.vjs-default-skin .vjs-loading-spinner:before{content:"\e00a";font-family:VideoJS;position:absolute;top:0;left:0;width:1em;height:1em;text-align:center;text-shadow:0 0 .1em #000}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.vjs-default-skin .vjs-menu-button{float:right;cursor:pointer}.vjs-default-skin .vjs-menu{display:none;position:absolute;bottom:0;left:0;width:0;height:0;margin-bottom:3em;border-left:2em solid transparent;border-right:2em solid transparent;border-top:1.55em solid #000;border-top-color:rgba(7,40,50,.5)}.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content{display:block;padding:0;margin:0;position:absolute;width:10em;bottom:1.5em;max-height:15em;overflow:auto;left:-5em;background-color:#07141e;background-color:rgba(7,20,30,.7);-webkit-box-shadow:-.2em -.2em .3em rgba(255,255,255,.2);-moz-box-shadow:-.2em -.2em .3em rgba(255,255,255,.2);box-shadow:-.2em -.2em .3em rgba(255,255,255,.2)}.vjs-default-skin .vjs-menu-button:hover .vjs-menu{display:block}.vjs-default-skin .vjs-menu-button ul li{list-style:none;margin:0;padding:.3em 0;line-height:1.4em;font-size:1.2em;text-align:center;text-transform:lowercase}.vjs-default-skin .vjs-menu-button ul li.vjs-selected{background-color:#000}.vjs-default-skin .vjs-menu-button ul li:focus,.vjs-default-skin .vjs-menu-button ul li:hover,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover{outline:0;color:#111;background-color:#fff;background-color:rgba(255,255,255,.75);-webkit-box-shadow:0 0 1em #fff;-moz-box-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em;font-weight:700;cursor:default}.vjs-default-skin .vjs-subtitles-button:before{content:"\e00c"}.vjs-default-skin .vjs-captions-button:before{content:"\e008"}.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before,.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before{-webkit-box-shadow:0 0 1em #fff;-moz-box-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.video-js{background-color:#000;position:relative;padding:0;font-size:10px;vertical-align:middle;font-weight:400;font-style:normal;font-family:Arial,sans-serif;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js:-moz-full-screen{position:absolute}body.vjs-full-window{padding:0;margin:0;height:100%;overflow-y:auto}.video-js.vjs-fullscreen{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0;width:100%!important;height:100%!important;_position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.video-js.vjs-fullscreen.vjs-user-inactive{cursor:none}.vjs-poster{background-repeat:no-repeat;background-position:50% 50%;background-size:contain;cursor:pointer;height:100%;margin:0;padding:0;position:relative;width:100%}.vjs-poster img{display:block;margin:0 auto;max-height:100%;padding:0;width:100%}.video-js.vjs-using-native-controls .vjs-poster{display:none}.video-js .vjs-text-track-display{text-align:center;position:absolute;bottom:4em;left:1em;right:1em}.video-js .vjs-text-track{display:none;font-size:1.4em;text-align:center;margin-bottom:.1em;background-color:#000;background-color:rgba(0,0,0,.5)}.video-js .vjs-subtitles{color:#fff}.video-js .vjs-captions{color:#fc6}.vjs-tt-cue{display:block}.vjs-default-skin .vjs-hidden{display:none}.vjs-lock-showing{display:block!important;opacity:1;visibility:visible}
\ No newline at end of file diff --git a/extlib/video-js/video-js.png b/extlib/video-js/video-js.png Binary files differdeleted file mode 100644 index 100bc7f8..00000000 --- a/extlib/video-js/video-js.png +++ /dev/null diff --git a/extlib/video-js/video-js.swf b/extlib/video-js/video-js.swf Binary files differnew file mode 100644 index 00000000..d15fbc3f --- /dev/null +++ b/extlib/video-js/video-js.swf diff --git a/extlib/video-js/video.dev.js b/extlib/video-js/video.dev.js new file mode 100644 index 00000000..2ff69a8c --- /dev/null +++ b/extlib/video-js/video.dev.js @@ -0,0 +1,6457 @@ +/** + * @fileoverview Main function src. + */ + +// HTML5 Shiv. Must be in <head> to support older browsers. +document.createElement('video'); +document.createElement('audio'); +document.createElement('track'); + +/** + * Doubles as the main function for users to create a player instance and also + * the main library object. + * + * @param {String|Element} id Video element or video element ID + * @param {Object=} options Optional options object for config/settings + * @param {Function=} ready Optional ready callback + * @return {vjs.Player} A player instance + */ +var vjs = function(id, options, ready){ + var tag; // Element of ID + + // Allow for element or ID to be passed in + // String ID + if (typeof id === 'string') { + + // Adjust for jQuery ID syntax + if (id.indexOf('#') === 0) { + id = id.slice(1); + } + + // If a player instance has already been created for this ID return it. + if (vjs.players[id]) { + return vjs.players[id]; + + // Otherwise get element for ID + } else { + tag = vjs.el(id); + } + + // ID is a media element + } else { + tag = id; + } + + // Check for a useable element + if (!tag || !tag.nodeName) { // re: nodeName, could be a box div also + throw new TypeError('The element or ID supplied is not valid. (videojs)'); // Returns + } + + // Element may have a player attr referring to an already created player instance. + // If not, set up a new player and return the instance. + return tag['player'] || new vjs.Player(tag, options, ready); +}; + +// Extended name, also available externally, window.videojs +var videojs = vjs; +window.videojs = window.vjs = vjs; + +// CDN Version. Used to target right flash swf. +vjs.CDN_VERSION = '4.2'; +vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'http://'); + +/** + * Global Player instance options, surfaced from vjs.Player.prototype.options_ + * vjs.options = vjs.Player.prototype.options_ + * All options should use string keys so they avoid + * renaming by closure compiler + * @type {Object} + */ +vjs.options = { + // Default order of fallback technology + 'techOrder': ['html5','flash'], + // techOrder: ['flash','html5'], + + 'html5': {}, + 'flash': {}, + + // Default of web browser is 300x150. Should rely on source width/height. + 'width': 300, + 'height': 150, + // defaultVolume: 0.85, + 'defaultVolume': 0.00, // The freakin seaguls are driving me crazy! + + // Included control sets + 'children': { + 'mediaLoader': {}, + 'posterImage': {}, + 'textTrackDisplay': {}, + 'loadingSpinner': {}, + 'bigPlayButton': {}, + 'controlBar': {} + }, + + // Default message to show when a video cannot be played. + 'notSupportedMessage': 'Sorry, no compatible source and playback ' + + 'technology were found for this video. Try using another browser ' + + 'like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the ' + + 'latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.' +}; + +// Set CDN Version of swf +// The added (+) blocks the replace from changing this 4.2 string +if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') { + videojs.options['flash']['swf'] = vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/'+vjs.CDN_VERSION+'/video-js.swf'; +} + +/** + * Global player list + * @type {Object} + */ +vjs.players = {}; +/** + * Core Object/Class for objects that use inheritance + contstructors + * @constructor + */ +vjs.CoreObject = vjs['CoreObject'] = function(){}; +// Manually exporting vjs['CoreObject'] here for Closure Compiler +// because of the use of the extend/create class methods +// If we didn't do this, those functions would get flattend to something like +// `a = ...` and `this.prototype` would refer to the global object instead of +// CoreObject + +/** + * Create a new object that inherits from this Object + * @param {Object} props Functions and properties to be applied to the + * new object's prototype + * @return {vjs.CoreObject} Returns an object that inherits from CoreObject + * @this {*} + */ +vjs.CoreObject.extend = function(props){ + var init, subObj; + + props = props || {}; + // Set up the constructor using the supplied init method + // or using the init of the parent object + // Make sure to check the unobfuscated version for external libs + init = props['init'] || props.init || this.prototype['init'] || this.prototype.init || function(){}; + // In Resig's simple class inheritance (previously used) the constructor + // is a function that calls `this.init.apply(arguments)` + // However that would prevent us from using `ParentObject.call(this);` + // in a Child constuctor because the `this` in `this.init` + // would still refer to the Child and cause an inifinite loop. + // We would instead have to do + // `ParentObject.prototype.init.apply(this, argumnents);` + // Bleh. We're not creating a _super() function, so it's good to keep + // the parent constructor reference simple. + subObj = function(){ + init.apply(this, arguments); + }; + + // Inherit from this object's prototype + subObj.prototype = vjs.obj.create(this.prototype); + // Reset the constructor property for subObj otherwise + // instances of subObj would have the constructor of the parent Object + subObj.prototype.constructor = subObj; + + // Make the class extendable + subObj.extend = vjs.CoreObject.extend; + // Make a function for creating instances + subObj.create = vjs.CoreObject.create; + + // Extend subObj's prototype with functions and other properties from props + for (var name in props) { + if (props.hasOwnProperty(name)) { + subObj.prototype[name] = props[name]; + } + } + + return subObj; +}; + +/** + * Create a new instace of this Object class + * @return {vjs.CoreObject} Returns an instance of a CoreObject subclass + * @this {*} + */ +vjs.CoreObject.create = function(){ + // Create a new object that inherits from this object's prototype + var inst = vjs.obj.create(this.prototype); + + // Apply this constructor function to the new object + this.apply(inst, arguments); + + // Return the new object + return inst; +}; +/** + * @fileoverview Event System (John Resig - Secrets of a JS Ninja http://jsninja.com/) + * (Original book version wasn't completely usable, so fixed some things and made Closure Compiler compatible) + * This should work very similarly to jQuery's events, however it's based off the book version which isn't as + * robust as jquery's, so there's probably some differences. + */ + +/** + * Add an event listener to element + * It stores the handler function in a separate cache object + * and adds a generic handler to the element's event, + * along with a unique id (guid) to the element. + * @param {Element|Object} elem Element or object to bind listeners to + * @param {String} type Type of event to bind to. + * @param {Function} fn Event listener. + */ +vjs.on = function(elem, type, fn){ + var data = vjs.getData(elem); + + // We need a place to store all our handler data + if (!data.handlers) data.handlers = {}; + + if (!data.handlers[type]) data.handlers[type] = []; + + if (!fn.guid) fn.guid = vjs.guid++; + + data.handlers[type].push(fn); + + if (!data.dispatcher) { + data.disabled = false; + + data.dispatcher = function (event){ + + if (data.disabled) return; + event = vjs.fixEvent(event); + + var handlers = data.handlers[event.type]; + + if (handlers) { + // Copy handlers so if handlers are added/removed during the process it doesn't throw everything off. + var handlersCopy = handlers.slice(0); + + for (var m = 0, n = handlersCopy.length; m < n; m++) { + if (event.isImmediatePropagationStopped()) { + break; + } else { + handlersCopy[m].call(elem, event); + } + } + } + }; + } + + if (data.handlers[type].length == 1) { + if (document.addEventListener) { + elem.addEventListener(type, data.dispatcher, false); + } else if (document.attachEvent) { + elem.attachEvent('on' + type, data.dispatcher); + } + } +}; + +/** + * Removes event listeners from an element + * @param {Element|Object} elem Object to remove listeners from + * @param {String=} type Type of listener to remove. Don't include to remove all events from element. + * @param {Function} fn Specific listener to remove. Don't incldue to remove listeners for an event type. + */ +vjs.off = function(elem, type, fn) { + // Don't want to add a cache object through getData if not needed + if (!vjs.hasData(elem)) return; + + var data = vjs.getData(elem); + + // If no events exist, nothing to unbind + if (!data.handlers) { return; } + + // Utility function + var removeType = function(t){ + data.handlers[t] = []; + vjs.cleanUpEvents(elem,t); + }; + + // Are we removing all bound events? + if (!type) { + for (var t in data.handlers) removeType(t); + return; + } + + var handlers = data.handlers[type]; + + // If no handlers exist, nothing to unbind + if (!handlers) return; + + // If no listener was provided, remove all listeners for type + if (!fn) { + removeType(type); + return; + } + + // We're only removing a single handler + if (fn.guid) { + for (var n = 0; n < handlers.length; n++) { + if (handlers[n].guid === fn.guid) { + handlers.splice(n--, 1); + } + } + } + + vjs.cleanUpEvents(elem, type); +}; + +/** + * Clean up the listener cache and dispatchers + * @param {Element|Object} elem Element to clean up + * @param {String} type Type of event to clean up + */ +vjs.cleanUpEvents = function(elem, type) { + var data = vjs.getData(elem); + + // Remove the events of a particular type if there are none left + if (data.handlers[type].length === 0) { + delete data.handlers[type]; + // data.handlers[type] = null; + // Setting to null was causing an error with data.handlers + + // Remove the meta-handler from the element + if (document.removeEventListener) { + elem.removeEventListener(type, data.dispatcher, false); + } else if (document.detachEvent) { + elem.detachEvent('on' + type, data.dispatcher); + } + } + + // Remove the events object if there are no types left + if (vjs.isEmpty(data.handlers)) { + delete data.handlers; + delete data.dispatcher; + delete data.disabled; + + // data.handlers = null; + // data.dispatcher = null; + // data.disabled = null; + } + + // Finally remove the expando if there is no data left + if (vjs.isEmpty(data)) { + vjs.removeData(elem); + } +}; + +/** + * Fix a native event to have standard property values + * @param {Object} event Event object to fix + * @return {Object} + */ +vjs.fixEvent = function(event) { + + function returnTrue() { return true; } + function returnFalse() { return false; } + + // Test if fixing up is needed + // Used to check if !event.stopPropagation instead of isPropagationStopped + // But native events return true for stopPropagation, but don't have + // other expected methods like isPropagationStopped. Seems to be a problem + // with the Javascript Ninja code. So we're just overriding all events now. + if (!event || !event.isPropagationStopped) { + var old = event || window.event; + + event = {}; + // Clone the old object so that we can modify the values event = {}; + // IE8 Doesn't like when you mess with native event properties + // Firefox returns false for event.hasOwnProperty('type') and other props + // which makes copying more difficult. + // TODO: Probably best to create a whitelist of event props + for (var key in old) { + // Safari 6.0.3 warns you if you try to copy deprecated layerX/Y + if (key !== 'layerX' && key !== 'layerY') { + event[key] = old[key]; + } + } + + // The event occurred on this element + if (!event.target) { + event.target = event.srcElement || document; + } + + // Handle which other element the event is related to + event.relatedTarget = event.fromElement === event.target ? + event.toElement : + event.fromElement; + + // Stop the default browser action + event.preventDefault = function () { + if (old.preventDefault) { + old.preventDefault(); + } + event.returnValue = false; + event.isDefaultPrevented = returnTrue; + }; + + event.isDefaultPrevented = returnFalse; + + // Stop the event from bubbling + event.stopPropagation = function () { + if (old.stopPropagation) { + old.stopPropagation(); + } + event.cancelBubble = true; + event.isPropagationStopped = returnTrue; + }; + + event.isPropagationStopped = returnFalse; + + // Stop the event from bubbling and executing other handlers + event.stopImmediatePropagation = function () { + if (old.stopImmediatePropagation) { + old.stopImmediatePropagation(); + } + event.isImmediatePropagationStopped = returnTrue; + event.stopPropagation(); + }; + + event.isImmediatePropagationStopped = returnFalse; + + // Handle mouse position + if (event.clientX != null) { + var doc = document.documentElement, body = document.body; + + event.pageX = event.clientX + + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - + (doc && doc.clientLeft || body && body.clientLeft || 0); + event.pageY = event.clientY + + (doc && doc.scrollTop || body && body.scrollTop || 0) - + (doc && doc.clientTop || body && body.clientTop || 0); + } + + // Handle key presses + event.which = event.charCode || event.keyCode; + + // Fix button for mouse clicks: + // 0 == left; 1 == middle; 2 == right + if (event.button != null) { + event.button = (event.button & 1 ? 0 : + (event.button & 4 ? 1 : + (event.button & 2 ? 2 : 0))); + } + } + + // Returns fixed-up instance + return event; +}; + +/** + * Trigger an event for an element + * @param {Element|Object} elem Element to trigger an event on + * @param {String} event Type of event to trigger + */ +vjs.trigger = function(elem, event) { + // Fetches element data and a reference to the parent (for bubbling). + // Don't want to add a data object to cache for every parent, + // so checking hasData first. + var elemData = (vjs.hasData(elem)) ? vjs.getData(elem) : {}; + var parent = elem.parentNode || elem.ownerDocument; + // type = event.type || event, + // handler; + + // If an event name was passed as a string, creates an event out of it + if (typeof event === 'string') { + event = { type:event, target:elem }; + } + // Normalizes the event properties. + event = vjs.fixEvent(event); + + // If the passed element has a dispatcher, executes the established handlers. + if (elemData.dispatcher) { + elemData.dispatcher.call(elem, event); + } + + // Unless explicitly stopped or the event does not bubble (e.g. media events) + // recursively calls this function to bubble the event up the DOM. + if (parent && !event.isPropagationStopped() && event.bubbles !== false) { + vjs.trigger(parent, event); + + // If at the top of the DOM, triggers the default action unless disabled. + } else if (!parent && !event.isDefaultPrevented()) { + var targetData = vjs.getData(event.target); + + // Checks if the target has a default action for this event. + if (event.target[event.type]) { + // Temporarily disables event dispatching on the target as we have already executed the handler. + targetData.disabled = true; + // Executes the default action. + if (typeof event.target[event.type] === 'function') { + event.target[event.type](); + } + // Re-enables event dispatching. + targetData.disabled = false; + } + } + + // Inform the triggerer if the default was prevented by returning false + return !event.isDefaultPrevented(); + /* Original version of js ninja events wasn't complete. + * We've since updated to the latest version, but keeping this around + * for now just in case. + */ + // // Added in attion to book. Book code was broke. + // event = typeof event === 'object' ? + // event[vjs.expando] ? + // event : + // new vjs.Event(type, event) : + // new vjs.Event(type); + + // event.type = type; + // if (handler) { + // handler.call(elem, event); + // } + + // // Clean up the event in case it is being reused + // event.result = undefined; + // event.target = elem; +}; + +/** + * Trigger a listener only once for an event + * @param {Element|Object} elem Element or object to + * @param {[type]} type [description] + * @param {Function} fn [description] + * @return {[type]} + */ +vjs.one = function(elem, type, fn) { + var func = function(){ + vjs.off(elem, type, func); + fn.apply(this, arguments); + }; + func.guid = fn.guid = fn.guid || vjs.guid++; + vjs.on(elem, type, func); +}; +var hasOwnProp = Object.prototype.hasOwnProperty; + +/** + * Creates an element and applies properties. + * @param {String=} tagName Name of tag to be created. + * @param {Object=} properties Element properties to be applied. + * @return {Element} + */ +vjs.createEl = function(tagName, properties){ + var el, propName; + + el = document.createElement(tagName || 'div'); + + for (propName in properties){ + if (hasOwnProp.call(properties, propName)) { + //el[propName] = properties[propName]; + // Not remembering why we were checking for dash + // but using setAttribute means you have to use getAttribute + + // The check for dash checks for the aria-* attributes, like aria-label, aria-valuemin. + // The additional check for "role" is because the default method for adding attributes does not + // add the attribute "role". My guess is because it's not a valid attribute in some namespaces, although + // browsers handle the attribute just fine. The W3C allows for aria-* attributes to be used in pre-HTML5 docs. + // http://www.w3.org/TR/wai-aria-primer/#ariahtml. Using setAttribute gets around this problem. + + if (propName.indexOf('aria-') !== -1 || propName=='role') { + el.setAttribute(propName, properties[propName]); + } else { + el[propName] = properties[propName]; + } + } + } + return el; +}; + +/** + * Uppercase the first letter of a string + * @param {String} string String to be uppercased + * @return {String} + */ +vjs.capitalize = function(string){ + return string.charAt(0).toUpperCase() + string.slice(1); +}; + +/** + * Object functions container + * @type {Object} + */ +vjs.obj = {}; + +/** + * Object.create shim for prototypal inheritance. + * https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/create + * @param {Object} obj Object to use as prototype + */ + vjs.obj.create = Object.create || function(obj){ + //Create a new function called 'F' which is just an empty object. + function F() {} + + //the prototype of the 'F' function should point to the + //parameter of the anonymous function. + F.prototype = obj; + + //create a new constructor function based off of the 'F' function. + return new F(); +}; + +/** + * Loop through each property in an object and call a function + * whose arguments are (key,value) + * @param {Object} obj Object of properties + * @param {Function} fn Function to be called on each property. + * @this {*} + */ +vjs.obj.each = function(obj, fn, context){ + for (var key in obj) { + if (hasOwnProp.call(obj, key)) { + fn.call(context || this, key, obj[key]); + } + } +}; + +/** + * Merge two objects together and return the original. + * @param {Object} obj1 + * @param {Object} obj2 + * @return {Object} + */ +vjs.obj.merge = function(obj1, obj2){ + if (!obj2) { return obj1; } + for (var key in obj2){ + if (hasOwnProp.call(obj2, key)) { + obj1[key] = obj2[key]; + } + } + return obj1; +}; + +/** + * Merge two objects, and merge any properties that are objects + * instead of just overwriting one. Uses to merge options hashes + * where deeper default settings are important. + * @param {Object} obj1 Object to override + * @param {Object} obj2 Overriding object + * @return {Object} New object. Obj1 and Obj2 will be untouched. + */ +vjs.obj.deepMerge = function(obj1, obj2){ + var key, val1, val2; + + // make a copy of obj1 so we're not ovewriting original values. + // like prototype.options_ and all sub options objects + obj1 = vjs.obj.copy(obj1); + + for (key in obj2){ + if (hasOwnProp.call(obj2, key)) { + val1 = obj1[key]; + val2 = obj2[key]; + + // Check if both properties are pure objects and do a deep merge if so + if (vjs.obj.isPlain(val1) && vjs.obj.isPlain(val2)) { + obj1[key] = vjs.obj.deepMerge(val1, val2); + } else { + obj1[key] = obj2[key]; + } + } + } + return obj1; +}; + +/** + * Make a copy of the supplied object + * @param {Object} obj Object to copy + * @return {Object} Copy of object + */ +vjs.obj.copy = function(obj){ + return vjs.obj.merge({}, obj); +}; + +/** + * Check if an object is plain, and not a dom node or any object sub-instance + * @param {Object} obj Object to check + * @return {Boolean} True if plain, false otherwise + */ +vjs.obj.isPlain = function(obj){ + return !!obj + && typeof obj === 'object' + && obj.toString() === '[object Object]' + && obj.constructor === Object; +}; + +/** + * Bind (a.k.a proxy or Context). A simple method for changing the context of a function + It also stores a unique id on the function so it can be easily removed from events + * @param {*} context The object to bind as scope + * @param {Function} fn The function to be bound to a scope + * @param {Number=} uid An optional unique ID for the function to be set + * @return {Function} + */ +vjs.bind = function(context, fn, uid) { + // Make sure the function has a unique ID + if (!fn.guid) { fn.guid = vjs.guid++; } + + // Create the new function that changes the context + var ret = function() { + return fn.apply(context, arguments); + }; + + // Allow for the ability to individualize this function + // Needed in the case where multiple objects might share the same prototype + // IF both items add an event listener with the same function, then you try to remove just one + // it will remove both because they both have the same guid. + // when using this, you need to use the bind method when you remove the listener as well. + // currently used in text tracks + ret.guid = (uid) ? uid + '_' + fn.guid : fn.guid; + + return ret; +}; + +/** + * Element Data Store. Allows for binding data to an element without putting it directly on the element. + * Ex. Event listneres are stored here. + * (also from jsninja.com, slightly modified and updated for closure compiler) + * @type {Object} + */ +vjs.cache = {}; + +/** + * Unique ID for an element or function + * @type {Number} + */ +vjs.guid = 1; + +/** + * Unique attribute name to store an element's guid in + * @type {String} + * @constant + */ +vjs.expando = 'vdata' + (new Date()).getTime(); + +/** + * Returns the cache object where data for an element is stored + * @param {Element} el Element to store data for. + * @return {Object} + */ +vjs.getData = function(el){ + var id = el[vjs.expando]; + if (!id) { + id = el[vjs.expando] = vjs.guid++; + vjs.cache[id] = {}; + } + return vjs.cache[id]; +}; + +/** + * Returns the cache object where data for an element is stored + * @param {Element} el Element to store data for. + * @return {Object} + */ +vjs.hasData = function(el){ + var id = el[vjs.expando]; + return !(!id || vjs.isEmpty(vjs.cache[id])); +}; + +/** + * Delete data for the element from the cache and the guid attr from getElementById + * @param {Element} el Remove data for an element + */ +vjs.removeData = function(el){ + var id = el[vjs.expando]; + if (!id) { return; } + // Remove all stored data + // Changed to = null + // http://coding.smashingmagazine.com/2012/11/05/writing-fast-memory-efficient-javascript/ + // vjs.cache[id] = null; + delete vjs.cache[id]; + + // Remove the expando property from the DOM node + try { + delete el[vjs.expando]; + } catch(e) { + if (el.removeAttribute) { + el.removeAttribute(vjs.expando); + } else { + // IE doesn't appear to support removeAttribute on the document element + el[vjs.expando] = null; + } + } +}; + +vjs.isEmpty = function(obj) { + for (var prop in obj) { + // Inlude null properties as empty. + if (obj[prop] !== null) { + return false; + } + } + return true; +}; + +/** + * Add a CSS class name to an element + * @param {Element} element Element to add class name to + * @param {String} classToAdd Classname to add + */ +vjs.addClass = function(element, classToAdd){ + if ((' '+element.className+' ').indexOf(' '+classToAdd+' ') == -1) { + element.className = element.className === '' ? classToAdd : element.className + ' ' + classToAdd; + } +}; + +/** + * Remove a CSS class name from an element + * @param {Element} element Element to remove from class name + * @param {String} classToAdd Classname to remove + */ +vjs.removeClass = function(element, classToRemove){ + var classNames, i; + + if (element.className.indexOf(classToRemove) == -1) { return; } + + classNames = element.className.split(' '); + + // no arr.indexOf in ie8, and we don't want to add a big shim + for (i = classNames.length - 1; i >= 0; i--) { + if (classNames[i] === classToRemove) { + classNames.splice(i,1); + } + } + + element.className = classNames.join(' '); +}; + +/** + * Element for testing browser HTML5 video capabilities + * @type {Element} + * @constant + */ +vjs.TEST_VID = vjs.createEl('video'); + +/** + * Useragent for browser testing. + * @type {String} + * @constant + */ +vjs.USER_AGENT = navigator.userAgent; + +/** + * Device is an iPhone + * @type {Boolean} + * @constant + */ +vjs.IS_IPHONE = (/iPhone/i).test(vjs.USER_AGENT); +vjs.IS_IPAD = (/iPad/i).test(vjs.USER_AGENT); +vjs.IS_IPOD = (/iPod/i).test(vjs.USER_AGENT); +vjs.IS_IOS = vjs.IS_IPHONE || vjs.IS_IPAD || vjs.IS_IPOD; + +vjs.IOS_VERSION = (function(){ + var match = vjs.USER_AGENT.match(/OS (\d+)_/i); + if (match && match[1]) { return match[1]; } +})(); + +vjs.IS_ANDROID = (/Android/i).test(vjs.USER_AGENT); +vjs.ANDROID_VERSION = (function() { + // This matches Android Major.Minor.Patch versions + // ANDROID_VERSION is Major.Minor as a Number, if Minor isn't available, then only Major is returned + var match = vjs.USER_AGENT.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i), + major, + minor; + + if (!match) { + return null; + } + + major = match[1] && parseFloat(match[1]); + minor = match[2] && parseFloat(match[2]); + + if (major && minor) { + return parseFloat(match[1] + '.' + match[2]); + } else if (major) { + return major; + } else { + return null; + } +})(); +// Old Android is defined as Version older than 2.3, and requiring a webkit version of the android browser +vjs.IS_OLD_ANDROID = vjs.IS_ANDROID && (/webkit/i).test(vjs.USER_AGENT) && vjs.ANDROID_VERSION < 2.3; + +vjs.IS_FIREFOX = (/Firefox/i).test(vjs.USER_AGENT); +vjs.IS_CHROME = (/Chrome/i).test(vjs.USER_AGENT); + +vjs.TOUCH_ENABLED = ('ontouchstart' in window); + +/** + * Get an element's attribute values, as defined on the HTML tag + * Attributs are not the same as properties. They're defined on the tag + * or with setAttribute (which shouldn't be used with HTML) + * This will return true or false for boolean attributes. + * @param {Element} tag Element from which to get tag attributes + * @return {Object} + */ +vjs.getAttributeValues = function(tag){ + var obj, knownBooleans, attrs, attrName, attrVal; + + obj = {}; + + // known boolean attributes + // we can check for matching boolean properties, but older browsers + // won't know about HTML5 boolean attributes that we still read from + knownBooleans = ','+'autoplay,controls,loop,muted,default'+','; + + if (tag && tag.attributes && tag.attributes.length > 0) { + attrs = tag.attributes; + + for (var i = attrs.length - 1; i >= 0; i--) { + attrName = attrs[i].name; + attrVal = attrs[i].value; + + // check for known booleans + // the matching element property will return a value for typeof + if (typeof tag[attrName] === 'boolean' || knownBooleans.indexOf(','+attrName+',') !== -1) { + // the value of an included boolean attribute is typically an empty + // string ('') which would equal false if we just check for a false value. + // we also don't want support bad code like autoplay='false' + attrVal = (attrVal !== null) ? true : false; + } + + obj[attrName] = attrVal; + } + } + + return obj; +}; + +/** + * Get the computed style value for an element + * From http://robertnyman.com/2006/04/24/get-the-rendered-style-of-an-element/ + * @param {Element} el Element to get style value for + * @param {String} strCssRule Style name + * @return {String} Style value + */ +vjs.getComputedDimension = function(el, strCssRule){ + var strValue = ''; + if(document.defaultView && document.defaultView.getComputedStyle){ + strValue = document.defaultView.getComputedStyle(el, '').getPropertyValue(strCssRule); + + } else if(el.currentStyle){ + // IE8 Width/Height support + strValue = el['client'+strCssRule.substr(0,1).toUpperCase() + strCssRule.substr(1)] + 'px'; + } + return strValue; +}; + +/** + * Insert an element as the first child node of another + * @param {Element} child Element to insert + * @param {[type]} parent Element to insert child into + */ +vjs.insertFirst = function(child, parent){ + if (parent.firstChild) { + parent.insertBefore(child, parent.firstChild); + } else { + parent.appendChild(child); + } +}; + +/** + * Object to hold browser support information + * @type {Object} + */ +vjs.support = {}; + +/** + * Shorthand for document.getElementById() + * Also allows for CSS (jQuery) ID syntax. But nothing other than IDs. + * @param {String} id Element ID + * @return {Element} Element with supplied ID + */ +vjs.el = function(id){ + if (id.indexOf('#') === 0) { + id = id.slice(1); + } + + return document.getElementById(id); +}; + +/** + * Format seconds as a time string, H:MM:SS or M:SS + * Supplying a guide (in seconds) will force a number of leading zeros + * to cover the length of the guide + * @param {Number} seconds Number of seconds to be turned into a string + * @param {Number} guide Number (in seconds) to model the string after + * @return {String} Time formatted as H:MM:SS or M:SS + */ +vjs.formatTime = function(seconds, guide) { + // Default to using seconds as guide + guide = guide || seconds; + var s = Math.floor(seconds % 60), + m = Math.floor(seconds / 60 % 60), + h = Math.floor(seconds / 3600), + gm = Math.floor(guide / 60 % 60), + gh = Math.floor(guide / 3600); + + // handle invalid times + if (isNaN(seconds) || seconds === Infinity) { + // '-' is false for all relational operators (e.g. <, >=) so this setting + // will add the minimum number of fields specified by the guide + h = m = s = '-'; + } + + // Check if we need to show hours + h = (h > 0 || gh > 0) ? h + ':' : ''; + + // If hours are showing, we may need to add a leading zero. + // Always show at least one digit of minutes. + m = (((h || gm >= 10) && m < 10) ? '0' + m : m) + ':'; + + // Check if leading zero is need for seconds + s = (s < 10) ? '0' + s : s; + + return h + m + s; +}; + +// Attempt to block the ability to select text while dragging controls +vjs.blockTextSelection = function(){ + document.body.focus(); + document.onselectstart = function () { return false; }; +}; +// Turn off text selection blocking +vjs.unblockTextSelection = function(){ document.onselectstart = function () { return true; }; }; + +/** + * Trim whitespace from the ends of a string. + * @param {String} string String to trim + * @return {String} Trimmed string + */ +vjs.trim = function(str){ + return (str+'').replace(/^\s+|\s+$/g, ''); +}; + +/** + * Should round off a number to a decimal place + * @param {Number} num Number to round + * @param {Number} dec Number of decimal places to round to + * @return {Number} Rounded number + */ +vjs.round = function(num, dec) { + if (!dec) { dec = 0; } + return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec); +}; + +/** + * Should create a fake TimeRange object + * Mimics an HTML5 time range instance, which has functions that + * return the start and end times for a range + * TimeRanges are returned by the buffered() method + * @param {Number} start Start time in seconds + * @param {Number} end End time in seconds + * @return {Object} Fake TimeRange object + */ +vjs.createTimeRange = function(start, end){ + return { + length: 1, + start: function() { return start; }, + end: function() { return end; } + }; +}; + +/** + * Simple http request for retrieving external files (e.g. text tracks) + * @param {String} url URL of resource + * @param {Function=} onSuccess Success callback + * @param {Function=} onError Error callback + */ +vjs.get = function(url, onSuccess, onError){ + var local, request; + + if (typeof XMLHttpRequest === 'undefined') { + window.XMLHttpRequest = function () { + try { return new window.ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch (e) {} + try { return new window.ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch (f) {} + try { return new window.ActiveXObject('Msxml2.XMLHTTP'); } catch (g) {} + throw new Error('This browser does not support XMLHttpRequest.'); + }; + } + + request = new XMLHttpRequest(); + try { + request.open('GET', url); + } catch(e) { + onError(e); + } + + local = (url.indexOf('file:') === 0 || (window.location.href.indexOf('file:') === 0 && url.indexOf('http') === -1)); + + request.onreadystatechange = function() { + if (request.readyState === 4) { + if (request.status === 200 || local && request.status === 0) { + onSuccess(request.responseText); + } else { + if (onError) { + onError(); + } + } + } + }; + + try { + request.send(); + } catch(e) { + if (onError) { + onError(e); + } + } +}; + +/* Local Storage +================================================================================ */ +vjs.setLocalStorage = function(key, value){ + try { + // IE was throwing errors referencing the var anywhere without this + var localStorage = window.localStorage || false; + if (!localStorage) { return; } + localStorage[key] = value; + } catch(e) { + if (e.code == 22 || e.code == 1014) { // Webkit == 22 / Firefox == 1014 + vjs.log('LocalStorage Full (VideoJS)', e); + } else { + if (e.code == 18) { + vjs.log('LocalStorage not allowed (VideoJS)', e); + } else { + vjs.log('LocalStorage Error (VideoJS)', e); + } + } + } +}; + +/** + * Get abosolute version of relative URL. Used to tell flash correct URL. + * http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue + * @param {String} url URL to make absolute + * @return {String} Absolute URL + */ +vjs.getAbsoluteURL = function(url){ + + // Check if absolute URL + if (!url.match(/^https?:\/\//)) { + // Convert to absolute URL. Flash hosted off-site needs an absolute URL. + url = vjs.createEl('div', { + innerHTML: '<a href="'+url+'">x</a>' + }).firstChild.href; + } + + return url; +}; + +// usage: log('inside coolFunc',this,arguments); +// http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/ +vjs.log = function(){ + vjs.log.history = vjs.log.history || []; // store logs to an array for reference + vjs.log.history.push(arguments); + if(window.console){ + window.console.log(Array.prototype.slice.call(arguments)); + } +}; + +// Offset Left +// getBoundingClientRect technique from John Resig http://ejohn.org/blog/getboundingclientrect-is-awesome/ +vjs.findPosition = function(el) { + var box, docEl, body, clientLeft, scrollLeft, left, clientTop, scrollTop, top; + + if (el.getBoundingClientRect && el.parentNode) { + box = el.getBoundingClientRect(); + } + + if (!box) { + return { + left: 0, + top: 0 + }; + } + + docEl = document.documentElement; + body = document.body; + + clientLeft = docEl.clientLeft || body.clientLeft || 0; + scrollLeft = window.pageXOffset || body.scrollLeft; + left = box.left + scrollLeft - clientLeft; + + clientTop = docEl.clientTop || body.clientTop || 0; + scrollTop = window.pageYOffset || body.scrollTop; + top = box.top + scrollTop - clientTop; + + return { + left: left, + top: top + }; +}; +/** + * @fileoverview Player Component - Base class for all UI objects + * + */ + +/** + * Base UI Component class + * @param {Object} player Main Player + * @param {Object=} options + * @constructor + */ +vjs.Component = vjs.CoreObject.extend({ + /** @constructor */ + init: function(player, options, ready){ + this.player_ = player; + + // Make a copy of prototype.options_ to protect against overriding global defaults + this.options_ = vjs.obj.copy(this.options_); + + // Updated options with supplied options + options = this.options(options); + + // Get ID from options, element, or create using player ID and unique ID + this.id_ = options['id'] || ((options['el'] && options['el']['id']) ? options['el']['id'] : player.id() + '_component_' + vjs.guid++ ); + + this.name_ = options['name'] || null; + + // Create element if one wasn't provided in options + this.el_ = options['el'] || this.createEl(); + + this.children_ = []; + this.childIndex_ = {}; + this.childNameIndex_ = {}; + + // Add any child components in options + this.initChildren(); + + this.ready(ready); + // Don't want to trigger ready here or it will before init is actually + // finished for all children that run this constructor + } +}); + +/** + * Dispose of the component and all child components. + */ +vjs.Component.prototype.dispose = function(){ + this.trigger('dispose'); + + // Dispose all children. + if (this.children_) { + for (var i = this.children_.length - 1; i >= 0; i--) { + if (this.children_[i].dispose) { + this.children_[i].dispose(); + } + } + } + + // Delete child references + this.children_ = null; + this.childIndex_ = null; + this.childNameIndex_ = null; + + // Remove all event listeners. + this.off(); + + // Remove element from DOM + if (this.el_.parentNode) { + this.el_.parentNode.removeChild(this.el_); + } + + vjs.removeData(this.el_); + this.el_ = null; +}; + +/** + * Reference to main player instance. + * @type {vjs.Player} + * @private + */ +vjs.Component.prototype.player_; + +/** + * Return the component's player. + * @return {vjs.Player} + */ +vjs.Component.prototype.player = function(){ + return this.player_; +}; + +/** + * Component options object. + * @type {Object} + * @private + */ +vjs.Component.prototype.options_; + +/** + * Deep merge of options objects + * Whenever a property is an object on both options objects + * the two properties will be merged using vjs.obj.deepMerge. + * + * This is used for merging options for child components. We + * want it to be easy to override individual options on a child + * component without having to rewrite all the other default options. + * + * Parent.prototype.options_ = { + * children: { + * 'childOne': { 'foo': 'bar', 'asdf': 'fdsa' }, + * 'childTwo': {}, + * 'childThree': {} + * } + * } + * newOptions = { + * children: { + * 'childOne': { 'foo': 'baz', 'abc': '123' } + * 'childTwo': null, + * 'childFour': {} + * } + * } + * + * this.options(newOptions); + * + * RESULT + * + * { + * children: { + * 'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' }, + * 'childTwo': null, // Disabled. Won't be initialized. + * 'childThree': {}, + * 'childFour': {} + * } + * } + * + * @param {Object} obj Object whose values will be overwritten + * @return {Object} NEW merged object. Does not return obj1. + */ +vjs.Component.prototype.options = function(obj){ + if (obj === undefined) return this.options_; + + return this.options_ = vjs.obj.deepMerge(this.options_, obj); +}; + +/** + * The DOM element for the component. + * @type {Element} + * @private + */ +vjs.Component.prototype.el_; + +/** + * Create the component's DOM element. + * @param {String=} tagName Element's node type. e.g. 'div' + * @param {Object=} attributes An object of element attributes that should be set on the element. + * @return {Element} + */ +vjs.Component.prototype.createEl = function(tagName, attributes){ + return vjs.createEl(tagName, attributes); +}; + +/** + * Return the component's DOM element. + * @return {Element} + */ +vjs.Component.prototype.el = function(){ + return this.el_; +}; + +/** + * An optional element where, if defined, children will be inserted + * instead of directly in el_ + * @type {Element} + * @private + */ +vjs.Component.prototype.contentEl_; + +/** + * Return the component's DOM element for embedding content. + * will either be el_ or a new element defined in createEl + * @return {Element} + */ +vjs.Component.prototype.contentEl = function(){ + return this.contentEl_ || this.el_; +}; + +/** + * The ID for the component. + * @type {String} + * @private + */ +vjs.Component.prototype.id_; + +/** + * Return the component's ID. + * @return {String} + */ +vjs.Component.prototype.id = function(){ + return this.id_; +}; + +/** + * The name for the component. Often used to reference the component. + * @type {String} + * @private + */ +vjs.Component.prototype.name_; + +/** + * Return the component's ID. + * @return {String} + */ +vjs.Component.prototype.name = function(){ + return this.name_; +}; + +/** + * Array of child components + * @type {Array} + * @private + */ +vjs.Component.prototype.children_; + +/** + * Returns array of all child components. + * @return {Array} + */ +vjs.Component.prototype.children = function(){ + return this.children_; +}; + +/** + * Object of child components by ID + * @type {Object} + * @private + */ +vjs.Component.prototype.childIndex_; + +/** + * Returns a child component with the provided ID. + * @return {Array} + */ +vjs.Component.prototype.getChildById = function(id){ + return this.childIndex_[id]; +}; + +/** + * Object of child components by Name + * @type {Object} + * @private + */ +vjs.Component.prototype.childNameIndex_; + +/** + * Returns a child component with the provided ID. + * @return {Array} + */ +vjs.Component.prototype.getChild = function(name){ + return this.childNameIndex_[name]; +}; + +/** + * Adds a child component inside this component. + * @param {String|vjs.Component} child The class name or instance of a child to add. + * @param {Object=} options Optional options, including options to be passed to + * children of the child. + * @return {vjs.Component} The child component, because it might be created in this process. + * @suppress {accessControls|checkRegExp|checkTypes|checkVars|const|constantProperty|deprecated|duplicate|es5Strict|fileoverviewTags|globalThis|invalidCasts|missingProperties|nonStandardJsDocs|strictModuleDepCheck|undefinedNames|undefinedVars|unknownDefines|uselessCode|visibility} + */ +vjs.Component.prototype.addChild = function(child, options){ + var component, componentClass, componentName, componentId; + + // If string, create new component with options + if (typeof child === 'string') { + + componentName = child; + + // Make sure options is at least an empty object to protect against errors + options = options || {}; + + // Assume name of set is a lowercased name of the UI Class (PlayButton, etc.) + componentClass = options['componentClass'] || vjs.capitalize(componentName); + + // Set name through options + options['name'] = componentName; + + // Create a new object & element for this controls set + // If there's no .player_, this is a player + // Closure Compiler throws an 'incomplete alias' warning if we use the vjs variable directly. + // Every class should be exported, so this should never be a problem here. + component = new window['videojs'][componentClass](this.player_ || this, options); + + // child is a component instance + } else { + component = child; + } + + this.children_.push(component); + + if (typeof component.id === 'function') { + this.childIndex_[component.id()] = component; + } + + // If a name wasn't used to create the component, check if we can use the + // name function of the component + componentName = componentName || (component.name && component.name()); + + if (componentName) { + this.childNameIndex_[componentName] = component; + } + + // Add the UI object's element to the container div (box) + // Having an element is not required + if (typeof component['el'] === 'function' && component['el']()) { + this.contentEl().appendChild(component['el']()); + } + + // Return so it can stored on parent object if desired. + return component; +}; + +vjs.Component.prototype.removeChild = function(component){ + if (typeof component === 'string') { + component = this.getChild(component); + } + + if (!component || !this.children_) return; + + var childFound = false; + for (var i = this.children_.length - 1; i >= 0; i--) { + if (this.children_[i] === component) { + childFound = true; + this.children_.splice(i,1); + break; + } + } + + if (!childFound) return; + + this.childIndex_[component.id] = null; + this.childNameIndex_[component.name] = null; + + var compEl = component.el(); + if (compEl && compEl.parentNode === this.contentEl()) { + this.contentEl().removeChild(component.el()); + } +}; + +/** + * Initialize default child components from options + */ +vjs.Component.prototype.initChildren = function(){ + var options = this.options_; + + if (options && options['children']) { + var self = this; + + // Loop through components and add them to the player + vjs.obj.each(options['children'], function(name, opts){ + // Allow for disabling default components + // e.g. vjs.options['children']['posterImage'] = false + if (opts === false) return; + + // Allow waiting to add components until a specific event is called + var tempAdd = function(){ + // Set property name on player. Could cause conflicts with other prop names, but it's worth making refs easy. + self[name] = self.addChild(name, opts); + }; + + if (opts['loadEvent']) { + // this.one(opts.loadEvent, tempAdd) + } else { + tempAdd(); + } + }); + } +}; + +vjs.Component.prototype.buildCSSClass = function(){ + // Child classes can include a function that does: + // return 'CLASS NAME' + this._super(); + return ''; +}; + +/* Events +============================================================================= */ + +/** + * Add an event listener to this component's element. Context will be the component. + * @param {String} type Event type e.g. 'click' + * @param {Function} fn Event listener + * @return {vjs.Component} + */ +vjs.Component.prototype.on = function(type, fn){ + vjs.on(this.el_, type, vjs.bind(this, fn)); + return this; +}; + +/** + * Remove an event listener from the component's element + * @param {String=} type Optional event type. Without type it will remove all listeners. + * @param {Function=} fn Optional event listener. Without fn it will remove all listeners for a type. + * @return {vjs.Component} + */ +vjs.Component.prototype.off = function(type, fn){ + vjs.off(this.el_, type, fn); + return this; +}; + +/** + * Add an event listener to be triggered only once and then removed + * @param {String} type Event type + * @param {Function} fn Event listener + * @return {vjs.Component} + */ +vjs.Component.prototype.one = function(type, fn) { + vjs.one(this.el_, type, vjs.bind(this, fn)); + return this; +}; + +/** + * Trigger an event on an element + * @param {String} type Event type to trigger + * @param {Event|Object} event Event object to be passed to the listener + * @return {vjs.Component} + */ +vjs.Component.prototype.trigger = function(type, event){ + vjs.trigger(this.el_, type, event); + return this; +}; + +/* Ready +================================================================================ */ +/** + * Is the component loaded. + * @type {Boolean} + * @private + */ +vjs.Component.prototype.isReady_; + +/** + * Trigger ready as soon as initialization is finished. + * Allows for delaying ready. Override on a sub class prototype. + * If you set this.isReadyOnInitFinish_ it will affect all components. + * Specially used when waiting for the Flash player to asynchrnously load. + * @type {Boolean} + * @private + */ +vjs.Component.prototype.isReadyOnInitFinish_ = true; + +/** + * List of ready listeners + * @type {Array} + * @private + */ +vjs.Component.prototype.readyQueue_; + +/** + * Bind a listener to the component's ready state. + * Different from event listeners in that if the ready event has already happend + * it will trigger the function immediately. + * @param {Function} fn Ready listener + * @return {vjs.Component} + */ +vjs.Component.prototype.ready = function(fn){ + if (fn) { + if (this.isReady_) { + fn.call(this); + } else { + if (this.readyQueue_ === undefined) { + this.readyQueue_ = []; + } + this.readyQueue_.push(fn); + } + } + return this; +}; + +/** + * Trigger the ready listeners + * @return {vjs.Component} + */ +vjs.Component.prototype.triggerReady = function(){ + this.isReady_ = true; + + var readyQueue = this.readyQueue_; + + if (readyQueue && readyQueue.length > 0) { + + for (var i = 0, j = readyQueue.length; i < j; i++) { + readyQueue[i].call(this); + } + + // Reset Ready Queue + this.readyQueue_ = []; + + // Allow for using event listeners also, in case you want to do something everytime a source is ready. + this.trigger('ready'); + } +}; + +/* Display +============================================================================= */ + +/** + * Add a CSS class name to the component's element + * @param {String} classToAdd Classname to add + * @return {vjs.Component} + */ +vjs.Component.prototype.addClass = function(classToAdd){ + vjs.addClass(this.el_, classToAdd); + return this; +}; + +/** + * Remove a CSS class name from the component's element + * @param {String} classToRemove Classname to remove + * @return {vjs.Component} + */ +vjs.Component.prototype.removeClass = function(classToRemove){ + vjs.removeClass(this.el_, classToRemove); + return this; +}; + +/** + * Show the component element if hidden + * @return {vjs.Component} + */ +vjs.Component.prototype.show = function(){ + this.el_.style.display = 'block'; + return this; +}; + +/** + * Hide the component element if hidden + * @return {vjs.Component} + */ +vjs.Component.prototype.hide = function(){ + this.el_.style.display = 'none'; + return this; +}; + +/** + * Lock an item in its visible state. To be used with fadeIn/fadeOut. + * @return {vjs.Component} + */ +vjs.Component.prototype.lockShowing = function(){ + this.addClass('vjs-lock-showing'); + return this; +}; + +/** + * Unlock an item to be hidden. To be used with fadeIn/fadeOut. + * @return {vjs.Component} + */ +vjs.Component.prototype.unlockShowing = function(){ + this.removeClass('vjs-lock-showing'); + return this; +}; + +/** + * Disable component by making it unshowable + */ +vjs.Component.prototype.disable = function(){ + this.hide(); + this.show = function(){}; +}; + +/** + * If a value is provided it will change the width of the player to that value + * otherwise the width is returned + * http://dev.w3.org/html5/spec/dimension-attributes.html#attr-dim-height + * Video tag width/height only work in pixels. No percents. + * But allowing limited percents use. e.g. width() will return number+%, not computed width + * @param {Number|String=} num Optional width number + * @param {[type]} skipListeners Skip the 'resize' event trigger + * @return {vjs.Component|Number|String} Returns 'this' if dimension was set. + * Otherwise it returns the dimension. + */ +vjs.Component.prototype.width = function(num, skipListeners){ + return this.dimension('width', num, skipListeners); +}; + +/** + * Get or set the height of the player + * @param {Number|String=} num Optional new player height + * @param {Boolean=} skipListeners Optional skip resize event trigger + * @return {vjs.Component|Number|String} The player, or the dimension + */ +vjs.Component.prototype.height = function(num, skipListeners){ + return this.dimension('height', num, skipListeners); +}; + +/** + * Set both width and height at the same time. + * @param {Number|String} width + * @param {Number|String} height + * @return {vjs.Component} The player. + */ +vjs.Component.prototype.dimensions = function(width, height){ + // Skip resize listeners on width for optimization + return this.width(width, true).height(height); +}; + +/** + * Get or set width or height. + * All for an integer, integer + 'px' or integer + '%'; + * Known issue: hidden elements. Hidden elements officially have a width of 0. + * So we're defaulting to the style.width value and falling back to computedStyle + * which has the hidden element issue. + * Info, but probably not an efficient fix: + * http://www.foliotek.com/devblog/getting-the-width-of-a-hidden-element-with-jquery-using-width/ + * @param {String=} widthOrHeight 'width' or 'height' + * @param {Number|String=} num New dimension + * @param {Boolean=} skipListeners Skip resize event trigger + * @return {vjs.Component|Number|String} Return the player if setting a dimension. + * Otherwise it returns the dimension. + */ +vjs.Component.prototype.dimension = function(widthOrHeight, num, skipListeners){ + if (num !== undefined) { + + // Check if using css width/height (% or px) and adjust + if ((''+num).indexOf('%') !== -1 || (''+num).indexOf('px') !== -1) { + this.el_.style[widthOrHeight] = num; + } else if (num === 'auto') { + this.el_.style[widthOrHeight] = ''; + } else { + this.el_.style[widthOrHeight] = num+'px'; + } + + // skipListeners allows us to avoid triggering the resize event when setting both width and height + if (!skipListeners) { this.trigger('resize'); } + + // Return component + return this; + } + + // Not setting a value, so getting it + // Make sure element exists + if (!this.el_) return 0; + + // Get dimension value from style + var val = this.el_.style[widthOrHeight]; + var pxIndex = val.indexOf('px'); + if (pxIndex !== -1) { + // Return the pixel value with no 'px' + return parseInt(val.slice(0,pxIndex), 10); + + // No px so using % or no style was set, so falling back to offsetWidth/height + // If component has display:none, offset will return 0 + // TODO: handle display:none and no dimension style using px + } else { + + return parseInt(this.el_['offset'+vjs.capitalize(widthOrHeight)], 10); + + // ComputedStyle version. + // Only difference is if the element is hidden it will return + // the percent value (e.g. '100%'') + // instead of zero like offsetWidth returns. + // var val = vjs.getComputedStyleValue(this.el_, widthOrHeight); + // var pxIndex = val.indexOf('px'); + + // if (pxIndex !== -1) { + // return val.slice(0, pxIndex); + // } else { + // return val; + // } + } +}; + +/** + * Emit 'tap' events when touch events are supported. We're requireing them to + * be enabled because otherwise every component would have this extra overhead + * unnecessarily, on mobile devices where extra overhead is especially bad. + * + * This is being implemented so we can support taps on the video element + * toggling the controls. + */ +vjs.Component.prototype.emitTapEvents = function(){ + var touchStart, touchTime, couldBeTap, noTap; + + // Track the start time so we can determine how long the touch lasted + touchStart = 0; + + this.on('touchstart', function(event) { + // Record start time so we can detect a tap vs. "touch and hold" + touchStart = new Date().getTime(); + // Reset couldBeTap tracking + couldBeTap = true; + }); + + noTap = function(){ + couldBeTap = false; + }; + // TODO: Listen to the original target. http://youtu.be/DujfpXOKUp8?t=13m8s + this.on('touchmove', noTap); + this.on('touchleave', noTap); + this.on('touchcancel', noTap); + + // When the touch ends, measure how long it took and trigger the appropriate + // event + this.on('touchend', function() { + // Proceed only if the touchmove/leave/cancel event didn't happen + if (couldBeTap === true) { + // Measure how long the touch lasted + touchTime = new Date().getTime() - touchStart; + // The touch needs to be quick in order to consider it a tap + if (touchTime < 250) { + this.trigger('tap'); + // It may be good to copy the touchend event object and change the + // type to tap, if the other event properties aren't exact after + // vjs.fixEvent runs (e.g. event.target) + } + } + }); +}; +/* Button - Base class for all buttons +================================================================================ */ +/** + * Base class for all buttons + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.Button = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + var touchstart = false; + this.on('touchstart', function(event) { + // Stop click and other mouse events from triggering also + event.preventDefault(); + touchstart = true; + }); + this.on('touchmove', function() { + touchstart = false; + }); + var self = this; + this.on('touchend', function(event) { + if (touchstart) { + self.onClick(event); + } + event.preventDefault(); + }); + + this.on('click', this.onClick); + this.on('focus', this.onFocus); + this.on('blur', this.onBlur); + } +}); + +vjs.Button.prototype.createEl = function(type, props){ + // Add standard Aria and Tabindex info + props = vjs.obj.merge({ + className: this.buildCSSClass(), + innerHTML: '<div class="vjs-control-content"><span class="vjs-control-text">' + (this.buttonText || 'Need Text') + '</span></div>', + role: 'button', + 'aria-live': 'polite', // let the screen reader user know that the text of the button may change + tabIndex: 0 + }, props); + + return vjs.Component.prototype.createEl.call(this, type, props); +}; + +vjs.Button.prototype.buildCSSClass = function(){ + // TODO: Change vjs-control to vjs-button? + return 'vjs-control ' + vjs.Component.prototype.buildCSSClass.call(this); +}; + + // Click - Override with specific functionality for button +vjs.Button.prototype.onClick = function(){}; + + // Focus - Add keyboard functionality to element +vjs.Button.prototype.onFocus = function(){ + vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress)); +}; + + // KeyPress (document level) - Trigger click when keys are pressed +vjs.Button.prototype.onKeyPress = function(event){ + // Check for space bar (32) or enter (13) keys + if (event.which == 32 || event.which == 13) { + event.preventDefault(); + this.onClick(); + } +}; + +// Blur - Remove keyboard triggers +vjs.Button.prototype.onBlur = function(){ + vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress)); +}; +/* Slider +================================================================================ */ +/** + * Parent for seek bar and volume slider + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.Slider = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + // Set property names to bar and handle to match with the child Slider class is looking for + this.bar = this.getChild(this.options_['barName']); + this.handle = this.getChild(this.options_['handleName']); + + player.on(this.playerEvent, vjs.bind(this, this.update)); + + this.on('mousedown', this.onMouseDown); + this.on('touchstart', this.onMouseDown); + this.on('focus', this.onFocus); + this.on('blur', this.onBlur); + this.on('click', this.onClick); + + this.player_.on('controlsvisible', vjs.bind(this, this.update)); + + // This is actually to fix the volume handle position. http://twitter.com/#!/gerritvanaaken/status/159046254519787520 + // this.player_.one('timeupdate', vjs.bind(this, this.update)); + + player.ready(vjs.bind(this, this.update)); + + this.boundEvents = {}; + } +}); + +vjs.Slider.prototype.createEl = function(type, props) { + props = props || {}; + // Add the slider element class to all sub classes + props.className = props.className + ' vjs-slider'; + props = vjs.obj.merge({ + role: 'slider', + 'aria-valuenow': 0, + 'aria-valuemin': 0, + 'aria-valuemax': 100, + tabIndex: 0 + }, props); + + return vjs.Component.prototype.createEl.call(this, type, props); +}; + +vjs.Slider.prototype.onMouseDown = function(event){ + event.preventDefault(); + vjs.blockTextSelection(); + + this.boundEvents.move = vjs.bind(this, this.onMouseMove); + this.boundEvents.end = vjs.bind(this, this.onMouseUp); + + vjs.on(document, 'mousemove', this.boundEvents.move); + vjs.on(document, 'mouseup', this.boundEvents.end); + vjs.on(document, 'touchmove', this.boundEvents.move); + vjs.on(document, 'touchend', this.boundEvents.end); + + this.onMouseMove(event); +}; + +vjs.Slider.prototype.onMouseUp = function() { + vjs.unblockTextSelection(); + vjs.off(document, 'mousemove', this.boundEvents.move, false); + vjs.off(document, 'mouseup', this.boundEvents.end, false); + vjs.off(document, 'touchmove', this.boundEvents.move, false); + vjs.off(document, 'touchend', this.boundEvents.end, false); + + this.update(); +}; + +vjs.Slider.prototype.update = function(){ + // In VolumeBar init we have a setTimeout for update that pops and update to the end of the + // execution stack. The player is destroyed before then update will cause an error + if (!this.el_) return; + + // If scrubbing, we could use a cached value to make the handle keep up with the user's mouse. + // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later. + // var progress = (this.player_.scrubbing) ? this.player_.getCache().currentTime / this.player_.duration() : this.player_.currentTime() / this.player_.duration(); + + var barProgress, + progress = this.getPercent(), + handle = this.handle, + bar = this.bar; + + // Protect against no duration and other division issues + if (isNaN(progress)) { progress = 0; } + + barProgress = progress; + + // If there is a handle, we need to account for the handle in our calculation for progress bar + // so that it doesn't fall short of or extend past the handle. + if (handle) { + + var box = this.el_, + boxWidth = box.offsetWidth, + + handleWidth = handle.el().offsetWidth, + + // The width of the handle in percent of the containing box + // In IE, widths may not be ready yet causing NaN + handlePercent = (handleWidth) ? handleWidth / boxWidth : 0, + + // Get the adjusted size of the box, considering that the handle's center never touches the left or right side. + // There is a margin of half the handle's width on both sides. + boxAdjustedPercent = 1 - handlePercent, + + // Adjust the progress that we'll use to set widths to the new adjusted box width + adjustedProgress = progress * boxAdjustedPercent; + + // The bar does reach the left side, so we need to account for this in the bar's width + barProgress = adjustedProgress + (handlePercent / 2); + + // Move the handle from the left based on the adjected progress + handle.el().style.left = vjs.round(adjustedProgress * 100, 2) + '%'; + } + + // Set the new bar width + bar.el().style.width = vjs.round(barProgress * 100, 2) + '%'; +}; + +vjs.Slider.prototype.calculateDistance = function(event){ + var el, box, boxX, boxY, boxW, boxH, handle, pageX, pageY; + + el = this.el_; + box = vjs.findPosition(el); + boxW = boxH = el.offsetWidth; + handle = this.handle; + + if (this.options_.vertical) { + boxY = box.top; + + if (event.changedTouches) { + pageY = event.changedTouches[0].pageY; + } else { + pageY = event.pageY; + } + + if (handle) { + var handleH = handle.el().offsetHeight; + // Adjusted X and Width, so handle doesn't go outside the bar + boxY = boxY + (handleH / 2); + boxH = boxH - handleH; + } + + // Percent that the click is through the adjusted area + return Math.max(0, Math.min(1, ((boxY - pageY) + boxH) / boxH)); + + } else { + boxX = box.left; + + if (event.changedTouches) { + pageX = event.changedTouches[0].pageX; + } else { + pageX = event.pageX; + } + + if (handle) { + var handleW = handle.el().offsetWidth; + + // Adjusted X and Width, so handle doesn't go outside the bar + boxX = boxX + (handleW / 2); + boxW = boxW - handleW; + } + + // Percent that the click is through the adjusted area + return Math.max(0, Math.min(1, (pageX - boxX) / boxW)); + } +}; + +vjs.Slider.prototype.onFocus = function(){ + vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress)); +}; + +vjs.Slider.prototype.onKeyPress = function(event){ + if (event.which == 37) { // Left Arrow + event.preventDefault(); + this.stepBack(); + } else if (event.which == 39) { // Right Arrow + event.preventDefault(); + this.stepForward(); + } +}; + +vjs.Slider.prototype.onBlur = function(){ + vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress)); +}; + +/** + * Listener for click events on slider, used to prevent clicks + * from bubbling up to parent elements like button menus. + * @param {Object} event Event object + */ +vjs.Slider.prototype.onClick = function(event){ + event.stopImmediatePropagation(); + event.preventDefault(); +}; + +/** + * SeekBar Behavior includes play progress bar, and seek handle + * Needed so it can determine seek position based on handle position/size + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.SliderHandle = vjs.Component.extend(); + +/** + * Default value of the slider + * @type {Number} + */ +vjs.SliderHandle.prototype.defaultValue = 0; + +/** @inheritDoc */ +vjs.SliderHandle.prototype.createEl = function(type, props) { + props = props || {}; + // Add the slider element class to all sub classes + props.className = props.className + ' vjs-slider-handle'; + props = vjs.obj.merge({ + innerHTML: '<span class="vjs-control-text">'+this.defaultValue+'</span>' + }, props); + + return vjs.Component.prototype.createEl.call(this, 'div', props); +}; +/* Menu +================================================================================ */ +/** + * The base for text track and settings menu buttons. + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.Menu = vjs.Component.extend(); + +/** + * Add a menu item to the menu + * @param {Object|String} component Component or component type to add + */ +vjs.Menu.prototype.addItem = function(component){ + this.addChild(component); + component.on('click', vjs.bind(this, function(){ + this.unlockShowing(); + })); +}; + +/** @inheritDoc */ +vjs.Menu.prototype.createEl = function(){ + var contentElType = this.options().contentElType || 'ul'; + this.contentEl_ = vjs.createEl(contentElType, { + className: 'vjs-menu-content' + }); + var el = vjs.Component.prototype.createEl.call(this, 'div', { + append: this.contentEl_, + className: 'vjs-menu' + }); + el.appendChild(this.contentEl_); + + // Prevent clicks from bubbling up. Needed for Menu Buttons, + // where a click on the parent is significant + vjs.on(el, 'click', function(event){ + event.preventDefault(); + event.stopImmediatePropagation(); + }); + + return el; +}; + +/** + * Menu item + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.MenuItem = vjs.Button.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Button.call(this, player, options); + this.selected(options['selected']); + } +}); + +/** @inheritDoc */ +vjs.MenuItem.prototype.createEl = function(type, props){ + return vjs.Button.prototype.createEl.call(this, 'li', vjs.obj.merge({ + className: 'vjs-menu-item', + innerHTML: this.options_['label'] + }, props)); +}; + +/** @inheritDoc */ +vjs.MenuItem.prototype.onClick = function(){ + this.selected(true); +}; + +/** + * Set this menu item as selected or not + * @param {Boolean} selected + */ +vjs.MenuItem.prototype.selected = function(selected){ + if (selected) { + this.addClass('vjs-selected'); + this.el_.setAttribute('aria-selected',true); + } else { + this.removeClass('vjs-selected'); + this.el_.setAttribute('aria-selected',false); + } +}; + + +/** + * A button class with a popup menu + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.MenuButton = vjs.Button.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Button.call(this, player, options); + + this.menu = this.createMenu(); + + // Add list to element + this.addChild(this.menu); + + // Automatically hide empty menu buttons + if (this.items && this.items.length === 0) { + this.hide(); + } + + this.on('keyup', this.onKeyPress); + this.el_.setAttribute('aria-haspopup', true); + this.el_.setAttribute('role', 'button'); + } +}); + +/** + * Track the state of the menu button + * @type {Boolean} + */ +vjs.MenuButton.prototype.buttonPressed_ = false; + +vjs.MenuButton.prototype.createMenu = function(){ + var menu = new vjs.Menu(this.player_); + + // Add a title list item to the top + if (this.options().title) { + menu.el().appendChild(vjs.createEl('li', { + className: 'vjs-menu-title', + innerHTML: vjs.capitalize(this.kind_), + tabindex: -1 + })); + } + + this.items = this['createItems'](); + + if (this.items) { + // Add menu items to the menu + for (var i = 0; i < this.items.length; i++) { + menu.addItem(this.items[i]); + } + } + + return menu; +}; + +/** + * Create the list of menu items. Specific to each subclass. + */ +vjs.MenuButton.prototype.createItems = function(){}; + +/** @inheritDoc */ +vjs.MenuButton.prototype.buildCSSClass = function(){ + return this.className + ' vjs-menu-button ' + vjs.Button.prototype.buildCSSClass.call(this); +}; + +// Focus - Add keyboard functionality to element +// This function is not needed anymore. Instead, the keyboard functionality is handled by +// treating the button as triggering a submenu. When the button is pressed, the submenu +// appears. Pressing the button again makes the submenu disappear. +vjs.MenuButton.prototype.onFocus = function(){}; +// Can't turn off list display that we turned on with focus, because list would go away. +vjs.MenuButton.prototype.onBlur = function(){}; + +vjs.MenuButton.prototype.onClick = function(){ + // When you click the button it adds focus, which will show the menu indefinitely. + // So we'll remove focus when the mouse leaves the button. + // Focus is needed for tab navigation. + this.one('mouseout', vjs.bind(this, function(){ + this.menu.unlockShowing(); + this.el_.blur(); + })); + if (this.buttonPressed_){ + this.unpressButton(); + } else { + this.pressButton(); + } +}; + +vjs.MenuButton.prototype.onKeyPress = function(event){ + event.preventDefault(); + + // Check for space bar (32) or enter (13) keys + if (event.which == 32 || event.which == 13) { + if (this.buttonPressed_){ + this.unpressButton(); + } else { + this.pressButton(); + } + // Check for escape (27) key + } else if (event.which == 27){ + if (this.buttonPressed_){ + this.unpressButton(); + } + } +}; + +vjs.MenuButton.prototype.pressButton = function(){ + this.buttonPressed_ = true; + this.menu.lockShowing(); + this.el_.setAttribute('aria-pressed', true); + if (this.items && this.items.length > 0) { + this.items[0].el().focus(); // set the focus to the title of the submenu + } +}; + +vjs.MenuButton.prototype.unpressButton = function(){ + this.buttonPressed_ = false; + this.menu.unlockShowing(); + this.el_.setAttribute('aria-pressed', false); +}; + +/** + * Main player class. A player instance is returned by _V_(id); + * @param {Element} tag The original video tag used for configuring options + * @param {Object=} options Player options + * @param {Function=} ready Ready callback function + * @constructor + */ +vjs.Player = vjs.Component.extend({ + /** @constructor */ + init: function(tag, options, ready){ + this.tag = tag; // Store the original tag used to set options + + // Set Options + // The options argument overrides options set in the video tag + // which overrides globally set options. + // This latter part coincides with the load order + // (tag must exist before Player) + options = vjs.obj.merge(this.getTagSettings(tag), options); + + // Cache for video property values. + this.cache_ = {}; + + // Set poster + this.poster_ = options['poster']; + // Set controls + this.controls_ = options['controls']; + // Original tag settings stored in options + // now remove immediately so native controls don't flash. + // May be turned back on by HTML5 tech if nativeControlsForTouch is true + tag.controls = false; + + // Run base component initializing with new options. + // Builds the element through createEl() + // Inits and embeds any child components in opts + vjs.Component.call(this, this, options, ready); + + // Update controls className. Can't do this when the controls are initially + // set because the element doesn't exist yet. + if (this.controls()) { + this.addClass('vjs-controls-enabled'); + } else { + this.addClass('vjs-controls-disabled'); + } + + // TODO: Make this smarter. Toggle user state between touching/mousing + // using events, since devices can have both touch and mouse events. + // if (vjs.TOUCH_ENABLED) { + // this.addClass('vjs-touch-enabled'); + // } + + // Firstplay event implimentation. Not sold on the event yet. + // Could probably just check currentTime==0? + this.one('play', function(e){ + var fpEvent = { type: 'firstplay', target: this.el_ }; + // Using vjs.trigger so we can check if default was prevented + var keepGoing = vjs.trigger(this.el_, fpEvent); + + if (!keepGoing) { + e.preventDefault(); + e.stopPropagation(); + e.stopImmediatePropagation(); + } + }); + + this.on('ended', this.onEnded); + this.on('play', this.onPlay); + this.on('firstplay', this.onFirstPlay); + this.on('pause', this.onPause); + this.on('progress', this.onProgress); + this.on('durationchange', this.onDurationChange); + this.on('error', this.onError); + this.on('fullscreenchange', this.onFullscreenChange); + + // Make player easily findable by ID + vjs.players[this.id_] = this; + + if (options['plugins']) { + vjs.obj.each(options['plugins'], function(key, val){ + this[key](val); + }, this); + } + + this.listenForUserActivity(); + } +}); + +/** + * Player instance options, surfaced using vjs.options + * vjs.options = vjs.Player.prototype.options_ + * Make changes in vjs.options, not here. + * All options should use string keys so they avoid + * renaming by closure compiler + * @type {Object} + * @private + */ +vjs.Player.prototype.options_ = vjs.options; + +vjs.Player.prototype.dispose = function(){ + this.trigger('dispose'); + // prevent dispose from being called twice + this.off('dispose'); + + // Kill reference to this player + vjs.players[this.id_] = null; + if (this.tag && this.tag['player']) { this.tag['player'] = null; } + if (this.el_ && this.el_['player']) { this.el_['player'] = null; } + + // Ensure that tracking progress and time progress will stop and plater deleted + this.stopTrackingProgress(); + this.stopTrackingCurrentTime(); + + if (this.tech) { this.tech.dispose(); } + + // Component dispose + vjs.Component.prototype.dispose.call(this); +}; + +vjs.Player.prototype.getTagSettings = function(tag){ + var options = { + 'sources': [], + 'tracks': [] + }; + + vjs.obj.merge(options, vjs.getAttributeValues(tag)); + + // Get tag children settings + if (tag.hasChildNodes()) { + var children, child, childName, i, j; + + children = tag.childNodes; + + for (i=0,j=children.length; i<j; i++) { + child = children[i]; + // Change case needed: http://ejohn.org/blog/nodename-case-sensitivity/ + childName = child.nodeName.toLowerCase(); + if (childName === 'source') { + options['sources'].push(vjs.getAttributeValues(child)); + } else if (childName === 'track') { + options['tracks'].push(vjs.getAttributeValues(child)); + } + } + } + + return options; +}; + +vjs.Player.prototype.createEl = function(){ + var el = this.el_ = vjs.Component.prototype.createEl.call(this, 'div'); + var tag = this.tag; + + // Remove width/height attrs from tag so CSS can make it 100% width/height + tag.removeAttribute('width'); + tag.removeAttribute('height'); + // Empty video tag sources and tracks so the built-in player doesn't use them also. + // This may not be fast enough to stop HTML5 browsers from reading the tags + // so we'll need to turn off any default tracks if we're manually doing + // captions and subtitles. videoElement.textTracks + if (tag.hasChildNodes()) { + var nodes, nodesLength, i, node, nodeName, removeNodes; + + nodes = tag.childNodes; + nodesLength = nodes.length; + removeNodes = []; + + while (nodesLength--) { + node = nodes[nodesLength]; + nodeName = node.nodeName.toLowerCase(); + if (nodeName === 'source' || nodeName === 'track') { + removeNodes.push(node); + } + } + + for (i=0; i<removeNodes.length; i++) { + tag.removeChild(removeNodes[i]); + } + } + + // Make sure tag ID exists + tag.id = tag.id || 'vjs_video_' + vjs.guid++; + + // Give video tag ID and class to player div + // ID will now reference player box, not the video tag + el.id = tag.id; + el.className = tag.className; + + // Update tag id/class for use as HTML5 playback tech + // Might think we should do this after embedding in container so .vjs-tech class + // doesn't flash 100% width/height, but class only applies with .video-js parent + tag.id += '_html5_api'; + tag.className = 'vjs-tech'; + + // Make player findable on elements + tag['player'] = el['player'] = this; + // Default state of video is paused + this.addClass('vjs-paused'); + + // Make box use width/height of tag, or rely on default implementation + // Enforce with CSS since width/height attrs don't work on divs + this.width(this.options_['width'], true); // (true) Skip resize listener on load + this.height(this.options_['height'], true); + + // Wrap video tag in div (el/box) container + if (tag.parentNode) { + tag.parentNode.insertBefore(el, tag); + } + vjs.insertFirst(tag, el); // Breaks iPhone, fixed in HTML5 setup. + + return el; +}; + +// /* Media Technology (tech) +// ================================================================================ */ +// Load/Create an instance of playback technlogy including element and API methods +// And append playback element in player div. +vjs.Player.prototype.loadTech = function(techName, source){ + + // Pause and remove current playback technology + if (this.tech) { + this.unloadTech(); + + // If the first time loading, HTML5 tag will exist but won't be initialized + // So we need to remove it if we're not loading HTML5 + } else if (techName !== 'Html5' && this.tag) { + this.el_.removeChild(this.tag); + this.tag['player'] = null; + this.tag = null; + } + + this.techName = techName; + + // Turn off API access because we're loading a new tech that might load asynchronously + this.isReady_ = false; + + var techReady = function(){ + this.player_.triggerReady(); + + // Manually track progress in cases where the browser/flash player doesn't report it. + if (!this.features['progressEvents']) { + this.player_.manualProgressOn(); + } + + // Manually track timeudpates in cases where the browser/flash player doesn't report it. + if (!this.features['timeupdateEvents']) { + this.player_.manualTimeUpdatesOn(); + } + }; + + // Grab tech-specific options from player options and add source and parent element to use. + var techOptions = vjs.obj.merge({ 'source': source, 'parentEl': this.el_ }, this.options_[techName.toLowerCase()]); + + if (source) { + if (source.src == this.cache_.src && this.cache_.currentTime > 0) { + techOptions['startTime'] = this.cache_.currentTime; + } + + this.cache_.src = source.src; + } + + // Initialize tech instance + this.tech = new window['videojs'][techName](this, techOptions); + + this.tech.ready(techReady); +}; + +vjs.Player.prototype.unloadTech = function(){ + this.isReady_ = false; + this.tech.dispose(); + + // Turn off any manual progress or timeupdate tracking + if (this.manualProgress) { this.manualProgressOff(); } + + if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); } + + this.tech = false; +}; + +// There's many issues around changing the size of a Flash (or other plugin) object. +// First is a plugin reload issue in Firefox that has been around for 11 years: https://bugzilla.mozilla.org/show_bug.cgi?id=90268 +// Then with the new fullscreen API, Mozilla and webkit browsers will reload the flash object after going to fullscreen. +// To get around this, we're unloading the tech, caching source and currentTime values, and reloading the tech once the plugin is resized. +// reloadTech: function(betweenFn){ +// vjs.log('unloadingTech') +// this.unloadTech(); +// vjs.log('unloadedTech') +// if (betweenFn) { betweenFn.call(); } +// vjs.log('LoadingTech') +// this.loadTech(this.techName, { src: this.cache_.src }) +// vjs.log('loadedTech') +// }, + +/* Fallbacks for unsupported event types +================================================================================ */ +// Manually trigger progress events based on changes to the buffered amount +// Many flash players and older HTML5 browsers don't send progress or progress-like events +vjs.Player.prototype.manualProgressOn = function(){ + this.manualProgress = true; + + // Trigger progress watching when a source begins loading + this.trackProgress(); + + // Watch for a native progress event call on the tech element + // In HTML5, some older versions don't support the progress event + // So we're assuming they don't, and turning off manual progress if they do. + // As opposed to doing user agent detection + this.tech.one('progress', function(){ + + // Update known progress support for this playback technology + this.features['progressEvents'] = true; + + // Turn off manual progress tracking + this.player_.manualProgressOff(); + }); +}; + +vjs.Player.prototype.manualProgressOff = function(){ + this.manualProgress = false; + this.stopTrackingProgress(); +}; + +vjs.Player.prototype.trackProgress = function(){ + + this.progressInterval = setInterval(vjs.bind(this, function(){ + // Don't trigger unless buffered amount is greater than last time + // log(this.cache_.bufferEnd, this.buffered().end(0), this.duration()) + /* TODO: update for multiple buffered regions */ + if (this.cache_.bufferEnd < this.buffered().end(0)) { + this.trigger('progress'); + } else if (this.bufferedPercent() == 1) { + this.stopTrackingProgress(); + this.trigger('progress'); // Last update + } + }), 500); +}; +vjs.Player.prototype.stopTrackingProgress = function(){ clearInterval(this.progressInterval); }; + +/* Time Tracking -------------------------------------------------------------- */ +vjs.Player.prototype.manualTimeUpdatesOn = function(){ + this.manualTimeUpdates = true; + + this.on('play', this.trackCurrentTime); + this.on('pause', this.stopTrackingCurrentTime); + // timeupdate is also called by .currentTime whenever current time is set + + // Watch for native timeupdate event + this.tech.one('timeupdate', function(){ + // Update known progress support for this playback technology + this.features['timeupdateEvents'] = true; + // Turn off manual progress tracking + this.player_.manualTimeUpdatesOff(); + }); +}; + +vjs.Player.prototype.manualTimeUpdatesOff = function(){ + this.manualTimeUpdates = false; + this.stopTrackingCurrentTime(); + this.off('play', this.trackCurrentTime); + this.off('pause', this.stopTrackingCurrentTime); +}; + +vjs.Player.prototype.trackCurrentTime = function(){ + if (this.currentTimeInterval) { this.stopTrackingCurrentTime(); } + this.currentTimeInterval = setInterval(vjs.bind(this, function(){ + this.trigger('timeupdate'); + }), 250); // 42 = 24 fps // 250 is what Webkit uses // FF uses 15 +}; + +// Turn off play progress tracking (when paused or dragging) +vjs.Player.prototype.stopTrackingCurrentTime = function(){ clearInterval(this.currentTimeInterval); }; + +// /* Player event handlers (how the player reacts to certain events) +// ================================================================================ */ +vjs.Player.prototype.onEnded = function(){ + if (this.options_['loop']) { + this.currentTime(0); + this.play(); + } +}; + +vjs.Player.prototype.onPlay = function(){ + vjs.removeClass(this.el_, 'vjs-paused'); + vjs.addClass(this.el_, 'vjs-playing'); +}; + +vjs.Player.prototype.onFirstPlay = function(){ + //If the first starttime attribute is specified + //then we will start at the given offset in seconds + if(this.options_['starttime']){ + this.currentTime(this.options_['starttime']); + } + + this.addClass('vjs-has-started'); +}; + +vjs.Player.prototype.onPause = function(){ + vjs.removeClass(this.el_, 'vjs-playing'); + vjs.addClass(this.el_, 'vjs-paused'); +}; + +vjs.Player.prototype.onProgress = function(){ + // Add custom event for when source is finished downloading. + if (this.bufferedPercent() == 1) { + this.trigger('loadedalldata'); + } +}; + +// Update duration with durationchange event +// Allows for cacheing value instead of asking player each time. +vjs.Player.prototype.onDurationChange = function(){ + this.duration(this.techGet('duration')); +}; + +vjs.Player.prototype.onError = function(e) { + vjs.log('Video Error', e); +}; + +vjs.Player.prototype.onFullscreenChange = function() { + if (this.isFullScreen) { + this.addClass('vjs-fullscreen'); + } else { + this.removeClass('vjs-fullscreen'); + } +}; + +// /* Player API +// ================================================================================ */ + +/** + * Object for cached values. + * @private + */ +vjs.Player.prototype.cache_; + +vjs.Player.prototype.getCache = function(){ + return this.cache_; +}; + +// Pass values to the playback tech +vjs.Player.prototype.techCall = function(method, arg){ + // If it's not ready yet, call method when it is + if (this.tech && !this.tech.isReady_) { + this.tech.ready(function(){ + this[method](arg); + }); + + // Otherwise call method now + } else { + try { + this.tech[method](arg); + } catch(e) { + vjs.log(e); + throw e; + } + } +}; + +// Get calls can't wait for the tech, and sometimes don't need to. +vjs.Player.prototype.techGet = function(method){ + + if (this.tech && this.tech.isReady_) { + + // Flash likes to die and reload when you hide or reposition it. + // In these cases the object methods go away and we get errors. + // When that happens we'll catch the errors and inform tech that it's not ready any more. + try { + return this.tech[method](); + } catch(e) { + // When building additional tech libs, an expected method may not be defined yet + if (this.tech[method] === undefined) { + vjs.log('Video.js: ' + method + ' method not defined for '+this.techName+' playback technology.', e); + } else { + // When a method isn't available on the object it throws a TypeError + if (e.name == 'TypeError') { + vjs.log('Video.js: ' + method + ' unavailable on '+this.techName+' playback technology element.', e); + this.tech.isReady_ = false; + } else { + vjs.log(e); + } + } + throw e; + } + } + + return; +}; + +/** + * Start media playback + * http://dev.w3.org/html5/spec/video.html#dom-media-play + * We're triggering the 'play' event here instead of relying on the + * media element to allow using event.preventDefault() to stop + * play from happening if desired. Usecase: preroll ads. + */ +vjs.Player.prototype.play = function(){ + this.techCall('play'); + return this; +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-pause +vjs.Player.prototype.pause = function(){ + this.techCall('pause'); + return this; +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-paused +// The initial state of paused should be true (in Safari it's actually false) +vjs.Player.prototype.paused = function(){ + return (this.techGet('paused') === false) ? false : true; +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-currenttime +vjs.Player.prototype.currentTime = function(seconds){ + if (seconds !== undefined) { + + // Cache the last set value for smoother scrubbing. + this.cache_.lastSetCurrentTime = seconds; + + this.techCall('setCurrentTime', seconds); + + // Improve the accuracy of manual timeupdates + if (this.manualTimeUpdates) { this.trigger('timeupdate'); } + + return this; + } + + // Cache last currentTime and return + // Default to 0 seconds + return this.cache_.currentTime = (this.techGet('currentTime') || 0); +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-duration +// Duration should return NaN if not available. ParseFloat will turn false-ish values to NaN. +vjs.Player.prototype.duration = function(seconds){ + if (seconds !== undefined) { + + // Cache the last set value for optimiized scrubbing (esp. Flash) + this.cache_.duration = parseFloat(seconds); + + return this; + } + + return this.cache_.duration; +}; + +// Calculates how much time is left. Not in spec, but useful. +vjs.Player.prototype.remainingTime = function(){ + return this.duration() - this.currentTime(); +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-buffered +// Buffered returns a timerange object. +// Kind of like an array of portions of the video that have been downloaded. +// So far no browsers return more than one range (portion) +vjs.Player.prototype.buffered = function(){ + var buffered = this.techGet('buffered'), + start = 0, + buflast = buffered.length - 1, + // Default end to 0 and store in values + end = this.cache_.bufferEnd = this.cache_.bufferEnd || 0; + + if (buffered && buflast >= 0 && buffered.end(buflast) !== end) { + end = buffered.end(buflast); + // Storing values allows them be overridden by setBufferedFromProgress + this.cache_.bufferEnd = end; + } + + return vjs.createTimeRange(start, end); +}; + +// Calculates amount of buffer is full. Not in spec but useful. +vjs.Player.prototype.bufferedPercent = function(){ + return (this.duration()) ? this.buffered().end(0) / this.duration() : 0; +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-volume +vjs.Player.prototype.volume = function(percentAsDecimal){ + var vol; + + if (percentAsDecimal !== undefined) { + vol = Math.max(0, Math.min(1, parseFloat(percentAsDecimal))); // Force value to between 0 and 1 + this.cache_.volume = vol; + this.techCall('setVolume', vol); + vjs.setLocalStorage('volume', vol); + return this; + } + + // Default to 1 when returning current volume. + vol = parseFloat(this.techGet('volume')); + return (isNaN(vol)) ? 1 : vol; +}; + +// http://dev.w3.org/html5/spec/video.html#attr-media-muted +vjs.Player.prototype.muted = function(muted){ + if (muted !== undefined) { + this.techCall('setMuted', muted); + return this; + } + return this.techGet('muted') || false; // Default to false +}; + +// Check if current tech can support native fullscreen (e.g. with built in controls lik iOS, so not our flash swf) +vjs.Player.prototype.supportsFullScreen = function(){ return this.techGet('supportsFullScreen') || false; }; + +// Turn on fullscreen (or window) mode +vjs.Player.prototype.requestFullScreen = function(){ + var requestFullScreen = vjs.support.requestFullScreen; + this.isFullScreen = true; + + if (requestFullScreen) { + // the browser supports going fullscreen at the element level so we can + // take the controls fullscreen as well as the video + + // Trigger fullscreenchange event after change + // We have to specifically add this each time, and remove + // when cancelling fullscreen. Otherwise if there's multiple + // players on a page, they would all be reacting to the same fullscreen + // events + vjs.on(document, requestFullScreen.eventName, vjs.bind(this, function(e){ + this.isFullScreen = document[requestFullScreen.isFullScreen]; + + // If cancelling fullscreen, remove event listener. + if (this.isFullScreen === false) { + vjs.off(document, requestFullScreen.eventName, arguments.callee); + } + + this.trigger('fullscreenchange'); + })); + + this.el_[requestFullScreen.requestFn](); + + } else if (this.tech.supportsFullScreen()) { + // we can't take the video.js controls fullscreen but we can go fullscreen + // with native controls + this.techCall('enterFullScreen'); + } else { + // fullscreen isn't supported so we'll just stretch the video element to + // fill the viewport + this.enterFullWindow(); + this.trigger('fullscreenchange'); + } + + return this; +}; + +vjs.Player.prototype.cancelFullScreen = function(){ + var requestFullScreen = vjs.support.requestFullScreen; + this.isFullScreen = false; + + // Check for browser element fullscreen support + if (requestFullScreen) { + document[requestFullScreen.cancelFn](); + } else if (this.tech.supportsFullScreen()) { + this.techCall('exitFullScreen'); + } else { + this.exitFullWindow(); + this.trigger('fullscreenchange'); + } + + return this; +}; + +// When fullscreen isn't supported we can stretch the video container to as wide as the browser will let us. +vjs.Player.prototype.enterFullWindow = function(){ + this.isFullWindow = true; + + // Storing original doc overflow value to return to when fullscreen is off + this.docOrigOverflow = document.documentElement.style.overflow; + + // Add listener for esc key to exit fullscreen + vjs.on(document, 'keydown', vjs.bind(this, this.fullWindowOnEscKey)); + + // Hide any scroll bars + document.documentElement.style.overflow = 'hidden'; + + // Apply fullscreen styles + vjs.addClass(document.body, 'vjs-full-window'); + + this.trigger('enterFullWindow'); +}; +vjs.Player.prototype.fullWindowOnEscKey = function(event){ + if (event.keyCode === 27) { + if (this.isFullScreen === true) { + this.cancelFullScreen(); + } else { + this.exitFullWindow(); + } + } +}; + +vjs.Player.prototype.exitFullWindow = function(){ + this.isFullWindow = false; + vjs.off(document, 'keydown', this.fullWindowOnEscKey); + + // Unhide scroll bars. + document.documentElement.style.overflow = this.docOrigOverflow; + + // Remove fullscreen styles + vjs.removeClass(document.body, 'vjs-full-window'); + + // Resize the box, controller, and poster to original sizes + // this.positionAll(); + this.trigger('exitFullWindow'); +}; + +vjs.Player.prototype.selectSource = function(sources){ + + // Loop through each playback technology in the options order + for (var i=0,j=this.options_['techOrder'];i<j.length;i++) { + var techName = vjs.capitalize(j[i]), + tech = window['videojs'][techName]; + + // Check if the browser supports this technology + if (tech.isSupported()) { + // Loop through each source object + for (var a=0,b=sources;a<b.length;a++) { + var source = b[a]; + + // Check if source can be played with this technology + if (tech['canPlaySource'](source)) { + return { source: source, tech: techName }; + } + } + } + } + + return false; +}; + +// src is a pretty powerful function +// If you pass it an array of source objects, it will find the best source to play and use that object.src +// If the new source requires a new playback technology, it will switch to that. +// If you pass it an object, it will set the source to object.src +// If you pass it anything else (url string) it will set the video source to that +vjs.Player.prototype.src = function(source){ + // Case: Array of source objects to choose from and pick the best to play + if (source instanceof Array) { + + var sourceTech = this.selectSource(source), + techName; + + if (sourceTech) { + source = sourceTech.source; + techName = sourceTech.tech; + + // If this technology is already loaded, set source + if (techName == this.techName) { + this.src(source); // Passing the source object + // Otherwise load this technology with chosen source + } else { + this.loadTech(techName, source); + } + } else { + this.el_.appendChild(vjs.createEl('p', { + innerHTML: this.options()['notSupportedMessage'] + })); + } + + // Case: Source object { src: '', type: '' ... } + } else if (source instanceof Object) { + + if (window['videojs'][this.techName]['canPlaySource'](source)) { + this.src(source.src); + } else { + // Send through tech loop to check for a compatible technology. + this.src([source]); + } + + // Case: URL String (http://myvideo...) + } else { + // Cache for getting last set source + this.cache_.src = source; + + if (!this.isReady_) { + this.ready(function(){ + this.src(source); + }); + } else { + this.techCall('src', source); + if (this.options_['preload'] == 'auto') { + this.load(); + } + if (this.options_['autoplay']) { + this.play(); + } + } + } + return this; +}; + +// Begin loading the src data +// http://dev.w3.org/html5/spec/video.html#dom-media-load +vjs.Player.prototype.load = function(){ + this.techCall('load'); + return this; +}; + +// http://dev.w3.org/html5/spec/video.html#dom-media-currentsrc +vjs.Player.prototype.currentSrc = function(){ + return this.techGet('currentSrc') || this.cache_.src || ''; +}; + +// Attributes/Options +vjs.Player.prototype.preload = function(value){ + if (value !== undefined) { + this.techCall('setPreload', value); + this.options_['preload'] = value; + return this; + } + return this.techGet('preload'); +}; +vjs.Player.prototype.autoplay = function(value){ + if (value !== undefined) { + this.techCall('setAutoplay', value); + this.options_['autoplay'] = value; + return this; + } + return this.techGet('autoplay', value); +}; +vjs.Player.prototype.loop = function(value){ + if (value !== undefined) { + this.techCall('setLoop', value); + this.options_['loop'] = value; + return this; + } + return this.techGet('loop'); +}; + +/** + * The url of the poster image source. + * @type {String} + * @private + */ +vjs.Player.prototype.poster_; + +/** + * Get or set the poster image source url. + * @param {String} src Poster image source URL + * @return {String} Poster image source URL or null + */ +vjs.Player.prototype.poster = function(src){ + if (src !== undefined) { + this.poster_ = src; + } + return this.poster_; +}; + +/** + * Whether or not the controls are showing + * @type {Boolean} + * @private + */ +vjs.Player.prototype.controls_; + +/** + * Get or set whether or not the controls are showing. + * @param {Boolean} controls Set controls to showing or not + * @return {Boolean} Controls are showing + */ +vjs.Player.prototype.controls = function(bool){ + if (bool !== undefined) { + bool = !!bool; // force boolean + // Don't trigger a change event unless it actually changed + if (this.controls_ !== bool) { + this.controls_ = bool; + if (bool) { + this.removeClass('vjs-controls-disabled'); + this.addClass('vjs-controls-enabled'); + this.trigger('controlsenabled'); + } else { + this.removeClass('vjs-controls-enabled'); + this.addClass('vjs-controls-disabled'); + this.trigger('controlsdisabled'); + } + } + return this; + } + return this.controls_; +}; + +vjs.Player.prototype.usingNativeControls_; + +/** + * Toggle native controls on/off. Native controls are the controls built into + * devices (e.g. default iPhone controls), Flash, or other techs + * (e.g. Vimeo Controls) + * + * **This should only be set by the current tech, because only the tech knows + * if it can support native controls** + * + * @param {Boolean} bool True signals that native controls are on + * @return {vjs.Player} Returns the player + */ +vjs.Player.prototype.usingNativeControls = function(bool){ + if (bool !== undefined) { + bool = !!bool; // force boolean + // Don't trigger a change event unless it actually changed + if (this.usingNativeControls_ !== bool) { + this.usingNativeControls_ = bool; + if (bool) { + this.addClass('vjs-using-native-controls'); + this.trigger('usingnativecontrols'); + } else { + this.removeClass('vjs-using-native-controls'); + this.trigger('usingcustomcontrols'); + } + } + return this; + } + return this.usingNativeControls_; +}; + +vjs.Player.prototype.error = function(){ return this.techGet('error'); }; +vjs.Player.prototype.ended = function(){ return this.techGet('ended'); }; +vjs.Player.prototype.seeking = function(){ return this.techGet('seeking'); }; + +// When the player is first initialized, trigger activity so components +// like the control bar show themselves if needed +vjs.Player.prototype.userActivity_ = true; +vjs.Player.prototype.reportUserActivity = function(event){ + this.userActivity_ = true; +}; + +vjs.Player.prototype.userActive_ = true; +vjs.Player.prototype.userActive = function(bool){ + if (bool !== undefined) { + bool = !!bool; + if (bool !== this.userActive_) { + this.userActive_ = bool; + if (bool) { + // If the user was inactive and is now active we want to reset the + // inactivity timer + this.userActivity_ = true; + this.removeClass('vjs-user-inactive'); + this.addClass('vjs-user-active'); + this.trigger('useractive'); + } else { + // We're switching the state to inactive manually, so erase any other + // activity + this.userActivity_ = false; + + // Chrome/Safari/IE have bugs where when you change the cursor it can + // trigger a mousemove event. This causes an issue when you're hiding + // the cursor when the user is inactive, and a mousemove signals user + // activity. Making it impossible to go into inactive mode. Specifically + // this happens in fullscreen when we really need to hide the cursor. + // + // When this gets resolved in ALL browsers it can be removed + // https://code.google.com/p/chromium/issues/detail?id=103041 + this.tech.one('mousemove', function(e){ + e.stopPropagation(); + e.preventDefault(); + }); + this.removeClass('vjs-user-active'); + this.addClass('vjs-user-inactive'); + this.trigger('userinactive'); + } + } + return this; + } + return this.userActive_; +}; + +vjs.Player.prototype.listenForUserActivity = function(){ + var onMouseActivity, onMouseDown, mouseInProgress, onMouseUp, + activityCheck, inactivityTimeout; + + onMouseActivity = this.reportUserActivity; + + onMouseDown = function() { + onMouseActivity(); + // For as long as the they are touching the device or have their mouse down, + // we consider them active even if they're not moving their finger or mouse. + // So we want to continue to update that they are active + clearInterval(mouseInProgress); + // Setting userActivity=true now and setting the interval to the same time + // as the activityCheck interval (250) should ensure we never miss the + // next activityCheck + mouseInProgress = setInterval(vjs.bind(this, onMouseActivity), 250); + }; + + onMouseUp = function(event) { + onMouseActivity(); + // Stop the interval that maintains activity if the mouse/touch is down + clearInterval(mouseInProgress); + }; + + // Any mouse movement will be considered user activity + this.on('mousedown', onMouseDown); + this.on('mousemove', onMouseActivity); + this.on('mouseup', onMouseUp); + + // Listen for keyboard navigation + // Shouldn't need to use inProgress interval because of key repeat + this.on('keydown', onMouseActivity); + this.on('keyup', onMouseActivity); + + // Consider any touch events that bubble up to be activity + // Certain touches on the tech will be blocked from bubbling because they + // toggle controls + this.on('touchstart', onMouseDown); + this.on('touchmove', onMouseActivity); + this.on('touchend', onMouseUp); + this.on('touchcancel', onMouseUp); + + // Run an interval every 250 milliseconds instead of stuffing everything into + // the mousemove/touchmove function itself, to prevent performance degradation. + // `this.reportUserActivity` simply sets this.userActivity_ to true, which + // then gets picked up by this loop + // http://ejohn.org/blog/learning-from-twitter/ + activityCheck = setInterval(vjs.bind(this, function() { + // Check to see if mouse/touch activity has happened + if (this.userActivity_) { + // Reset the activity tracker + this.userActivity_ = false; + + // If the user state was inactive, set the state to active + this.userActive(true); + + // Clear any existing inactivity timeout to start the timer over + clearTimeout(inactivityTimeout); + + // In X seconds, if no more activity has occurred the user will be + // considered inactive + inactivityTimeout = setTimeout(vjs.bind(this, function() { + // Protect against the case where the inactivityTimeout can trigger just + // before the next user activity is picked up by the activityCheck loop + // causing a flicker + if (!this.userActivity_) { + this.userActive(false); + } + }), 2000); + } + }), 250); + + // Clean up the intervals when we kill the player + this.on('dispose', function(){ + clearInterval(activityCheck); + clearTimeout(inactivityTimeout); + }); +}; + +// Methods to add support for +// networkState: function(){ return this.techCall('networkState'); }, +// readyState: function(){ return this.techCall('readyState'); }, +// seeking: function(){ return this.techCall('seeking'); }, +// initialTime: function(){ return this.techCall('initialTime'); }, +// startOffsetTime: function(){ return this.techCall('startOffsetTime'); }, +// played: function(){ return this.techCall('played'); }, +// seekable: function(){ return this.techCall('seekable'); }, +// videoTracks: function(){ return this.techCall('videoTracks'); }, +// audioTracks: function(){ return this.techCall('audioTracks'); }, +// videoWidth: function(){ return this.techCall('videoWidth'); }, +// videoHeight: function(){ return this.techCall('videoHeight'); }, +// defaultPlaybackRate: function(){ return this.techCall('defaultPlaybackRate'); }, +// playbackRate: function(){ return this.techCall('playbackRate'); }, +// mediaGroup: function(){ return this.techCall('mediaGroup'); }, +// controller: function(){ return this.techCall('controller'); }, +// defaultMuted: function(){ return this.techCall('defaultMuted'); } + +// TODO +// currentSrcList: the array of sources including other formats and bitrates +// playList: array of source lists in order of playback + +// RequestFullscreen API +(function(){ + var prefix, requestFS, div; + + div = document.createElement('div'); + + requestFS = {}; + + // Current W3C Spec + // http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api + // Mozilla Draft: https://wiki.mozilla.org/Gecko:FullScreenAPI#fullscreenchange_event + // New: https://dvcs.w3.org/hg/fullscreen/raw-file/529a67b8d9f3/Overview.html + if (div.cancelFullscreen !== undefined) { + requestFS.requestFn = 'requestFullscreen'; + requestFS.cancelFn = 'exitFullscreen'; + requestFS.eventName = 'fullscreenchange'; + requestFS.isFullScreen = 'fullScreen'; + + // Webkit (Chrome/Safari) and Mozilla (Firefox) have working implementations + // that use prefixes and vary slightly from the new W3C spec. Specifically, + // using 'exit' instead of 'cancel', and lowercasing the 'S' in Fullscreen. + // Other browsers don't have any hints of which version they might follow yet, + // so not going to try to predict by looping through all prefixes. + } else { + + if (document.mozCancelFullScreen) { + prefix = 'moz'; + requestFS.isFullScreen = prefix + 'FullScreen'; + } else { + prefix = 'webkit'; + requestFS.isFullScreen = prefix + 'IsFullScreen'; + } + + if (div[prefix + 'RequestFullScreen']) { + requestFS.requestFn = prefix + 'RequestFullScreen'; + requestFS.cancelFn = prefix + 'CancelFullScreen'; + } + requestFS.eventName = prefix + 'fullscreenchange'; + } + + if (document[requestFS.cancelFn]) { + vjs.support.requestFullScreen = requestFS; + } + +})(); + + +/** + * Container of main controls + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.ControlBar = vjs.Component.extend(); + +vjs.ControlBar.prototype.options_ = { + loadEvent: 'play', + children: { + 'playToggle': {}, + 'currentTimeDisplay': {}, + 'timeDivider': {}, + 'durationDisplay': {}, + 'remainingTimeDisplay': {}, + 'progressControl': {}, + 'fullscreenToggle': {}, + 'volumeControl': {}, + 'muteToggle': {} + // 'volumeMenuButton': {} + } +}; + +vjs.ControlBar.prototype.createEl = function(){ + return vjs.createEl('div', { + className: 'vjs-control-bar' + }); +}; +/** + * Button to toggle between play and pause + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.PlayToggle = vjs.Button.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Button.call(this, player, options); + + player.on('play', vjs.bind(this, this.onPlay)); + player.on('pause', vjs.bind(this, this.onPause)); + } +}); + +vjs.PlayToggle.prototype.buttonText = 'Play'; + +vjs.PlayToggle.prototype.buildCSSClass = function(){ + return 'vjs-play-control ' + vjs.Button.prototype.buildCSSClass.call(this); +}; + + // OnClick - Toggle between play and pause +vjs.PlayToggle.prototype.onClick = function(){ + if (this.player_.paused()) { + this.player_.play(); + } else { + this.player_.pause(); + } +}; + + // OnPlay - Add the vjs-playing class to the element so it can change appearance +vjs.PlayToggle.prototype.onPlay = function(){ + vjs.removeClass(this.el_, 'vjs-paused'); + vjs.addClass(this.el_, 'vjs-playing'); + this.el_.children[0].children[0].innerHTML = 'Pause'; // change the button text to "Pause" +}; + + // OnPause - Add the vjs-paused class to the element so it can change appearance +vjs.PlayToggle.prototype.onPause = function(){ + vjs.removeClass(this.el_, 'vjs-playing'); + vjs.addClass(this.el_, 'vjs-paused'); + this.el_.children[0].children[0].innerHTML = 'Play'; // change the button text to "Play" +};/** + * Displays the current time + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.CurrentTimeDisplay = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + player.on('timeupdate', vjs.bind(this, this.updateContent)); + } +}); + +vjs.CurrentTimeDisplay.prototype.createEl = function(){ + var el = vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-current-time vjs-time-controls vjs-control' + }); + + this.content = vjs.createEl('div', { + className: 'vjs-current-time-display', + innerHTML: '<span class="vjs-control-text">Current Time </span>' + '0:00', // label the current time for screen reader users + 'aria-live': 'off' // tell screen readers not to automatically read the time as it changes + }); + + el.appendChild(vjs.createEl('div').appendChild(this.content)); + return el; +}; + +vjs.CurrentTimeDisplay.prototype.updateContent = function(){ + // Allows for smooth scrubbing, when player can't keep up. + var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime(); + this.content.innerHTML = '<span class="vjs-control-text">Current Time </span>' + vjs.formatTime(time, this.player_.duration()); +}; + +/** + * Displays the duration + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.DurationDisplay = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + player.on('timeupdate', vjs.bind(this, this.updateContent)); // this might need to be changes to 'durationchange' instead of 'timeupdate' eventually, however the durationchange event fires before this.player_.duration() is set, so the value cannot be written out using this method. Once the order of durationchange and this.player_.duration() being set is figured out, this can be updated. + } +}); + +vjs.DurationDisplay.prototype.createEl = function(){ + var el = vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-duration vjs-time-controls vjs-control' + }); + + this.content = vjs.createEl('div', { + className: 'vjs-duration-display', + innerHTML: '<span class="vjs-control-text">Duration Time </span>' + '0:00', // label the duration time for screen reader users + 'aria-live': 'off' // tell screen readers not to automatically read the time as it changes + }); + + el.appendChild(vjs.createEl('div').appendChild(this.content)); + return el; +}; + +vjs.DurationDisplay.prototype.updateContent = function(){ + var duration = this.player_.duration(); + if (duration) { + this.content.innerHTML = '<span class="vjs-control-text">Duration Time </span>' + vjs.formatTime(duration); // label the duration time for screen reader users + } +}; + +/** + * Time Separator (Not used in main skin, but still available, and could be used as a 'spare element') + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.TimeDivider = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + } +}); + +vjs.TimeDivider.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-time-divider', + innerHTML: '<div><span>/</span></div>' + }); +}; + +/** + * Displays the time left in the video + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.RemainingTimeDisplay = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + player.on('timeupdate', vjs.bind(this, this.updateContent)); + } +}); + +vjs.RemainingTimeDisplay.prototype.createEl = function(){ + var el = vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-remaining-time vjs-time-controls vjs-control' + }); + + this.content = vjs.createEl('div', { + className: 'vjs-remaining-time-display', + innerHTML: '<span class="vjs-control-text">Remaining Time </span>' + '-0:00', // label the remaining time for screen reader users + 'aria-live': 'off' // tell screen readers not to automatically read the time as it changes + }); + + el.appendChild(vjs.createEl('div').appendChild(this.content)); + return el; +}; + +vjs.RemainingTimeDisplay.prototype.updateContent = function(){ + if (this.player_.duration()) { + this.content.innerHTML = '<span class="vjs-control-text">Remaining Time </span>' + '-'+ vjs.formatTime(this.player_.remainingTime()); + } + + // Allows for smooth scrubbing, when player can't keep up. + // var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime(); + // this.content.innerHTML = vjs.formatTime(time, this.player_.duration()); +}; +/** + * Toggle fullscreen video + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.FullscreenToggle = vjs.Button.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Button.call(this, player, options); + } +}); + +vjs.FullscreenToggle.prototype.buttonText = 'Fullscreen'; + +vjs.FullscreenToggle.prototype.buildCSSClass = function(){ + return 'vjs-fullscreen-control ' + vjs.Button.prototype.buildCSSClass.call(this); +}; + +vjs.FullscreenToggle.prototype.onClick = function(){ + if (!this.player_.isFullScreen) { + this.player_.requestFullScreen(); + this.el_.children[0].children[0].innerHTML = 'Non-Fullscreen'; // change the button text to "Non-Fullscreen" + } else { + this.player_.cancelFullScreen(); + this.el_.children[0].children[0].innerHTML = 'Fullscreen'; // change the button to "Fullscreen" + } +};/** + * Seek, Load Progress, and Play Progress + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.ProgressControl = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + } +}); + +vjs.ProgressControl.prototype.options_ = { + children: { + 'seekBar': {} + } +}; + +vjs.ProgressControl.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-progress-control vjs-control' + }); +}; + +/** + * Seek Bar and holder for the progress bars + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.SeekBar = vjs.Slider.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Slider.call(this, player, options); + player.on('timeupdate', vjs.bind(this, this.updateARIAAttributes)); + player.ready(vjs.bind(this, this.updateARIAAttributes)); + } +}); + +vjs.SeekBar.prototype.options_ = { + children: { + 'loadProgressBar': {}, + 'playProgressBar': {}, + 'seekHandle': {} + }, + 'barName': 'playProgressBar', + 'handleName': 'seekHandle' +}; + +vjs.SeekBar.prototype.playerEvent = 'timeupdate'; + +vjs.SeekBar.prototype.createEl = function(){ + return vjs.Slider.prototype.createEl.call(this, 'div', { + className: 'vjs-progress-holder', + 'aria-label': 'video progress bar' + }); +}; + +vjs.SeekBar.prototype.updateARIAAttributes = function(){ + // Allows for smooth scrubbing, when player can't keep up. + var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime(); + this.el_.setAttribute('aria-valuenow',vjs.round(this.getPercent()*100, 2)); // machine readable value of progress bar (percentage complete) + this.el_.setAttribute('aria-valuetext',vjs.formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete) +}; + +vjs.SeekBar.prototype.getPercent = function(){ + var currentTime; + // Flash RTMP provider will not report the correct time + // immediately after a seek. This isn't noticeable if you're + // seeking while the video is playing, but it is if you seek + // while the video is paused. + if (this.player_.techName === 'Flash' && this.player_.seeking()) { + var cache = this.player_.getCache(); + if (cache.lastSetCurrentTime) { + currentTime = cache.lastSetCurrentTime; + } + else { + currentTime = this.player_.currentTime(); + } + } + else { + currentTime = this.player_.currentTime(); + } + + return currentTime / this.player_.duration(); +}; + +vjs.SeekBar.prototype.onMouseDown = function(event){ + vjs.Slider.prototype.onMouseDown.call(this, event); + + this.player_.scrubbing = true; + + this.videoWasPlaying = !this.player_.paused(); + this.player_.pause(); +}; + +vjs.SeekBar.prototype.onMouseMove = function(event){ + var newTime = this.calculateDistance(event) * this.player_.duration(); + + // Don't let video end while scrubbing. + if (newTime == this.player_.duration()) { newTime = newTime - 0.1; } + + // Set new time (tell player to seek to new time) + this.player_.currentTime(newTime); +}; + +vjs.SeekBar.prototype.onMouseUp = function(event){ + vjs.Slider.prototype.onMouseUp.call(this, event); + + this.player_.scrubbing = false; + if (this.videoWasPlaying) { + this.player_.play(); + } +}; + +vjs.SeekBar.prototype.stepForward = function(){ + this.player_.currentTime(this.player_.currentTime() + 5); // more quickly fast forward for keyboard-only users +}; + +vjs.SeekBar.prototype.stepBack = function(){ + this.player_.currentTime(this.player_.currentTime() - 5); // more quickly rewind for keyboard-only users +}; + + +/** + * Shows load progres + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.LoadProgressBar = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + player.on('progress', vjs.bind(this, this.update)); + } +}); + +vjs.LoadProgressBar.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-load-progress', + innerHTML: '<span class="vjs-control-text">Loaded: 0%</span>' + }); +}; + +vjs.LoadProgressBar.prototype.update = function(){ + if (this.el_.style) { this.el_.style.width = vjs.round(this.player_.bufferedPercent() * 100, 2) + '%'; } +}; + + +/** + * Shows play progress + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.PlayProgressBar = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + } +}); + +vjs.PlayProgressBar.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-play-progress', + innerHTML: '<span class="vjs-control-text">Progress: 0%</span>' + }); +}; + +/** + * SeekBar component includes play progress bar, and seek handle + * Needed so it can determine seek position based on handle position/size + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.SeekHandle = vjs.SliderHandle.extend(); + +/** @inheritDoc */ +vjs.SeekHandle.prototype.defaultValue = '00:00'; + +/** @inheritDoc */ +vjs.SeekHandle.prototype.createEl = function(){ + return vjs.SliderHandle.prototype.createEl.call(this, 'div', { + className: 'vjs-seek-handle' + }); +};/** + * Control the volume + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.VolumeControl = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + // hide volume controls when they're not supported by the current tech + if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) { + this.addClass('vjs-hidden'); + } + player.on('loadstart', vjs.bind(this, function(){ + if (player.tech.features && player.tech.features['volumeControl'] === false) { + this.addClass('vjs-hidden'); + } else { + this.removeClass('vjs-hidden'); + } + })); + } +}); + +vjs.VolumeControl.prototype.options_ = { + children: { + 'volumeBar': {} + } +}; + +vjs.VolumeControl.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-volume-control vjs-control' + }); +}; + +/** + * Contains volume level + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.VolumeBar = vjs.Slider.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Slider.call(this, player, options); + player.on('volumechange', vjs.bind(this, this.updateARIAAttributes)); + player.ready(vjs.bind(this, this.updateARIAAttributes)); + setTimeout(vjs.bind(this, this.update), 0); // update when elements is in DOM + } +}); + +vjs.VolumeBar.prototype.updateARIAAttributes = function(){ + // Current value of volume bar as a percentage + this.el_.setAttribute('aria-valuenow',vjs.round(this.player_.volume()*100, 2)); + this.el_.setAttribute('aria-valuetext',vjs.round(this.player_.volume()*100, 2)+'%'); +}; + +vjs.VolumeBar.prototype.options_ = { + children: { + 'volumeLevel': {}, + 'volumeHandle': {} + }, + 'barName': 'volumeLevel', + 'handleName': 'volumeHandle' +}; + +vjs.VolumeBar.prototype.playerEvent = 'volumechange'; + +vjs.VolumeBar.prototype.createEl = function(){ + return vjs.Slider.prototype.createEl.call(this, 'div', { + className: 'vjs-volume-bar', + 'aria-label': 'volume level' + }); +}; + +vjs.VolumeBar.prototype.onMouseMove = function(event) { + this.player_.volume(this.calculateDistance(event)); +}; + +vjs.VolumeBar.prototype.getPercent = function(){ + if (this.player_.muted()) { + return 0; + } else { + return this.player_.volume(); + } +}; + +vjs.VolumeBar.prototype.stepForward = function(){ + this.player_.volume(this.player_.volume() + 0.1); +}; + +vjs.VolumeBar.prototype.stepBack = function(){ + this.player_.volume(this.player_.volume() - 0.1); +}; + +/** + * Shows volume level + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.VolumeLevel = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + } +}); + +vjs.VolumeLevel.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-volume-level', + innerHTML: '<span class="vjs-control-text"></span>' + }); +}; + +/** + * Change volume level + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ + vjs.VolumeHandle = vjs.SliderHandle.extend(); + + /** @inheritDoc */ + vjs.VolumeHandle.prototype.defaultValue = '00:00'; + + /** @inheritDoc */ + vjs.VolumeHandle.prototype.createEl = function(){ + return vjs.SliderHandle.prototype.createEl.call(this, 'div', { + className: 'vjs-volume-handle' + }); + }; +/** + * Mute the audio + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.MuteToggle = vjs.Button.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Button.call(this, player, options); + + player.on('volumechange', vjs.bind(this, this.update)); + + // hide mute toggle if the current tech doesn't support volume control + if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) { + this.addClass('vjs-hidden'); + } + player.on('loadstart', vjs.bind(this, function(){ + if (player.tech.features && player.tech.features['volumeControl'] === false) { + this.addClass('vjs-hidden'); + } else { + this.removeClass('vjs-hidden'); + } + })); + } +}); + +vjs.MuteToggle.prototype.createEl = function(){ + return vjs.Button.prototype.createEl.call(this, 'div', { + className: 'vjs-mute-control vjs-control', + innerHTML: '<div><span class="vjs-control-text">Mute</span></div>' + }); +}; + +vjs.MuteToggle.prototype.onClick = function(){ + this.player_.muted( this.player_.muted() ? false : true ); +}; + +vjs.MuteToggle.prototype.update = function(){ + var vol = this.player_.volume(), + level = 3; + + if (vol === 0 || this.player_.muted()) { + level = 0; + } else if (vol < 0.33) { + level = 1; + } else if (vol < 0.67) { + level = 2; + } + + // Don't rewrite the button text if the actual text doesn't change. + // This causes unnecessary and confusing information for screen reader users. + // This check is needed because this function gets called every time the volume level is changed. + if(this.player_.muted()){ + if(this.el_.children[0].children[0].innerHTML!='Unmute'){ + this.el_.children[0].children[0].innerHTML = 'Unmute'; // change the button text to "Unmute" + } + } else { + if(this.el_.children[0].children[0].innerHTML!='Mute'){ + this.el_.children[0].children[0].innerHTML = 'Mute'; // change the button text to "Mute" + } + } + + /* TODO improve muted icon classes */ + for (var i = 0; i < 4; i++) { + vjs.removeClass(this.el_, 'vjs-vol-'+i); + } + vjs.addClass(this.el_, 'vjs-vol-'+level); +}; +/** + * Menu button with a popup for showing the volume slider. + * @constructor + */ +vjs.VolumeMenuButton = vjs.MenuButton.extend({ + /** @constructor */ + init: function(player, options){ + vjs.MenuButton.call(this, player, options); + + // Same listeners as MuteToggle + player.on('volumechange', vjs.bind(this, this.update)); + + // hide mute toggle if the current tech doesn't support volume control + if (player.tech && player.tech.features && player.tech.features.volumeControl === false) { + this.addClass('vjs-hidden'); + } + player.on('loadstart', vjs.bind(this, function(){ + if (player.tech.features && player.tech.features.volumeControl === false) { + this.addClass('vjs-hidden'); + } else { + this.removeClass('vjs-hidden'); + } + })); + this.addClass('vjs-menu-button'); + } +}); + +vjs.VolumeMenuButton.prototype.createMenu = function(){ + var menu = new vjs.Menu(this.player_, { + contentElType: 'div' + }); + var vc = new vjs.VolumeBar(this.player_, vjs.obj.merge({vertical: true}, this.options_.volumeBar)); + menu.addChild(vc); + return menu; +}; + +vjs.VolumeMenuButton.prototype.onClick = function(){ + vjs.MuteToggle.prototype.onClick.call(this); + vjs.MenuButton.prototype.onClick.call(this); +}; + +vjs.VolumeMenuButton.prototype.createEl = function(){ + return vjs.Button.prototype.createEl.call(this, 'div', { + className: 'vjs-volume-menu-button vjs-menu-button vjs-control', + innerHTML: '<div><span class="vjs-control-text">Mute</span></div>' + }); +}; +vjs.VolumeMenuButton.prototype.update = vjs.MuteToggle.prototype.update; +/* Poster Image +================================================================================ */ +/** + * Poster image. Shows before the video plays. + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.PosterImage = vjs.Button.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Button.call(this, player, options); + + if (!player.poster() || !player.controls()) { + this.hide(); + } + + player.on('play', vjs.bind(this, this.hide)); + } +}); + +vjs.PosterImage.prototype.createEl = function(){ + var el = vjs.createEl('div', { + className: 'vjs-poster', + + // Don't want poster to be tabbable. + tabIndex: -1 + }), + poster = this.player_.poster(); + + if (poster) { + if ('backgroundSize' in el.style) { + el.style.backgroundImage = 'url("' + poster + '")'; + } else { + el.appendChild(vjs.createEl('img', { src: poster })); + } + } + + return el; +}; + +vjs.PosterImage.prototype.onClick = function(){ + // Only accept clicks when controls are enabled + if (this.player().controls()) { + this.player_.play(); + } +}; +/* Loading Spinner +================================================================================ */ +/** + * Loading spinner for waiting events + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.LoadingSpinner = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + player.on('canplay', vjs.bind(this, this.hide)); + player.on('canplaythrough', vjs.bind(this, this.hide)); + player.on('playing', vjs.bind(this, this.hide)); + player.on('seeked', vjs.bind(this, this.hide)); + + player.on('seeking', vjs.bind(this, this.show)); + + // in some browsers seeking does not trigger the 'playing' event, + // so we also need to trap 'seeked' if we are going to set a + // 'seeking' event + player.on('seeked', vjs.bind(this, this.hide)); + + player.on('error', vjs.bind(this, this.show)); + + // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner. + // Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing + // player.on('stalled', vjs.bind(this, this.show)); + + player.on('waiting', vjs.bind(this, this.show)); + } +}); + +vjs.LoadingSpinner.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-loading-spinner' + }); +}; +/* Big Play Button +================================================================================ */ +/** + * Initial play button. Shows before the video has played. The hiding of the + * big play button is done via CSS and player states. + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.BigPlayButton = vjs.Button.extend(); + +vjs.BigPlayButton.prototype.createEl = function(){ + return vjs.Button.prototype.createEl.call(this, 'div', { + className: 'vjs-big-play-button', + innerHTML: '<span></span>', + 'aria-label': 'play video' + }); +}; + +vjs.BigPlayButton.prototype.onClick = function(){ + this.player_.play(); +}; +/** + * @fileoverview Media Technology Controller - Base class for media playback + * technology controllers like Flash and HTML5 + */ + +/** + * Base class for media (HTML5 Video, Flash) controllers + * @param {vjs.Player|Object} player Central player instance + * @param {Object=} options Options object + * @constructor + */ +vjs.MediaTechController = vjs.Component.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.Component.call(this, player, options, ready); + + this.initControlsListeners(); + } +}); + +/** + * Set up click and touch listeners for the playback element + * On desktops, a click on the video itself will toggle playback, + * on a mobile device a click on the video toggles controls. + * (toggling controls is done by toggling the user state between active and + * inactive) + * + * A tap can signal that a user has become active, or has become inactive + * e.g. a quick tap on an iPhone movie should reveal the controls. Another + * quick tap should hide them again (signaling the user is in an inactive + * viewing state) + * + * In addition to this, we still want the user to be considered inactive after + * a few seconds of inactivity. + * + * Note: the only part of iOS interaction we can't mimic with this setup + * is a touch and hold on the video element counting as activity in order to + * keep the controls showing, but that shouldn't be an issue. A touch and hold on + * any controls will still keep the user active + */ +vjs.MediaTechController.prototype.initControlsListeners = function(){ + var player, tech, activateControls, deactivateControls; + + tech = this; + player = this.player(); + + var activateControls = function(){ + if (player.controls() && !player.usingNativeControls()) { + tech.addControlsListeners(); + } + }; + + deactivateControls = vjs.bind(tech, tech.removeControlsListeners); + + // Set up event listeners once the tech is ready and has an element to apply + // listeners to + this.ready(activateControls); + player.on('controlsenabled', activateControls); + player.on('controlsdisabled', deactivateControls); +}; + +vjs.MediaTechController.prototype.addControlsListeners = function(){ + var preventBubble, userWasActive; + + // Some browsers (Chrome & IE) don't trigger a click on a flash swf, but do + // trigger mousedown/up. + // http://stackoverflow.com/questions/1444562/javascript-onclick-event-over-flash-object + // Any touch events are set to block the mousedown event from happening + this.on('mousedown', this.onClick); + + // We need to block touch events on the video element from bubbling up, + // otherwise they'll signal activity prematurely. The specific use case is + // when the video is playing and the controls have faded out. In this case + // only a tap (fast touch) should toggle the user active state and turn the + // controls back on. A touch and move or touch and hold should not trigger + // the controls (per iOS as an example at least) + // + // We always want to stop propagation on touchstart because touchstart + // at the player level starts the touchInProgress interval. We can still + // report activity on the other events, but won't let them bubble for + // consistency. We don't want to bubble a touchend without a touchstart. + this.on('touchstart', function(event) { + // Stop the mouse events from also happening + event.preventDefault(); + event.stopPropagation(); + // Record if the user was active now so we don't have to keep polling it + userWasActive = this.player_.userActive(); + }); + + preventBubble = function(event){ + event.stopPropagation(); + if (userWasActive) { + this.player_.reportUserActivity(); + } + }; + + // Treat all touch events the same for consistency + this.on('touchmove', preventBubble); + this.on('touchleave', preventBubble); + this.on('touchcancel', preventBubble); + this.on('touchend', preventBubble); + + // Turn on component tap events + this.emitTapEvents(); + + // The tap listener needs to come after the touchend listener because the tap + // listener cancels out any reportedUserActivity when setting userActive(false) + this.on('tap', this.onTap); +}; + +/** + * Remove the listeners used for click and tap controls. This is needed for + * toggling to controls disabled, where a tap/touch should do nothing. + */ +vjs.MediaTechController.prototype.removeControlsListeners = function(){ + // We don't want to just use `this.off()` because there might be other needed + // listeners added by techs that extend this. + this.off('tap'); + this.off('touchstart'); + this.off('touchmove'); + this.off('touchleave'); + this.off('touchcancel'); + this.off('touchend'); + this.off('click'); + this.off('mousedown'); +}; + +/** + * Handle a click on the media element. By default will play/pause the media. + */ +vjs.MediaTechController.prototype.onClick = function(event){ + // We're using mousedown to detect clicks thanks to Flash, but mousedown + // will also be triggered with right-clicks, so we need to prevent that + if (event.button !== 0) return; + + // When controls are disabled a click should not toggle playback because + // the click is considered a control + if (this.player().controls()) { + if (this.player().paused()) { + this.player().play(); + } else { + this.player().pause(); + } + } +}; + +/** + * Handle a tap on the media element. By default it will toggle the user + * activity state, which hides and shows the controls. + */ + +vjs.MediaTechController.prototype.onTap = function(){ + this.player().userActive(!this.player().userActive()); +}; + +vjs.MediaTechController.prototype.features = { + 'volumeControl': true, + + // Resizing plugins using request fullscreen reloads the plugin + 'fullscreenResize': false, + + // Optional events that we can manually mimic with timers + // currently not triggered by video-js-swf + 'progressEvents': false, + 'timeupdateEvents': false +}; + +vjs.media = {}; + +/** + * List of default API methods for any MediaTechController + * @type {String} + */ +vjs.media.ApiMethods = 'play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted'.split(','); +// Create placeholder methods for each that warn when a method isn't supported by the current playback technology + +function createMethod(methodName){ + return function(){ + throw new Error('The "'+methodName+'" method is not available on the playback technology\'s API'); + }; +} + +for (var i = vjs.media.ApiMethods.length - 1; i >= 0; i--) { + var methodName = vjs.media.ApiMethods[i]; + vjs.MediaTechController.prototype[vjs.media.ApiMethods[i]] = createMethod(methodName); +} +/** + * @fileoverview HTML5 Media Controller - Wrapper for HTML5 Media API + */ + +/** + * HTML5 Media Controller - Wrapper for HTML5 Media API + * @param {vjs.Player|Object} player + * @param {Object=} options + * @param {Function=} ready + * @constructor + */ +vjs.Html5 = vjs.MediaTechController.extend({ + /** @constructor */ + init: function(player, options, ready){ + // volume cannot be changed from 1 on iOS + this.features['volumeControl'] = vjs.Html5.canControlVolume(); + + // In iOS, if you move a video element in the DOM, it breaks video playback. + this.features['movingMediaElementInDOM'] = !vjs.IS_IOS; + + // HTML video is able to automatically resize when going to fullscreen + this.features['fullscreenResize'] = true; + + vjs.MediaTechController.call(this, player, options, ready); + + var source = options['source']; + + // If the element source is already set, we may have missed the loadstart event, and want to trigger it. + // We don't want to set the source again and interrupt playback. + if (source && this.el_.currentSrc == source.src) { + player.trigger('loadstart'); + + // Otherwise set the source if one was provided. + } else if (source) { + this.el_.src = source.src; + } + + // Determine if native controls should be used + // Our goal should be to get the custom controls on mobile solid everywhere + // so we can remove this all together. Right now this will block custom + // controls on touch enabled laptops like the Chrome Pixel + if (vjs.TOUCH_ENABLED && player.options()['nativeControlsForTouch'] !== false) { + this.useNativeControls(); + } + + // Chrome and Safari both have issues with autoplay. + // In Safari (5.1.1), when we move the video element into the container div, autoplay doesn't work. + // In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays) + // This fixes both issues. Need to wait for API, so it updates displays correctly + player.ready(function(){ + if (this.tag && this.options_['autoplay'] && this.paused()) { + delete this.tag['poster']; // Chrome Fix. Fixed in Chrome v16. + this.play(); + } + }); + + this.setupTriggers(); + this.triggerReady(); + } +}); + +vjs.Html5.prototype.dispose = function(){ + vjs.MediaTechController.prototype.dispose.call(this); +}; + +vjs.Html5.prototype.createEl = function(){ + var player = this.player_, + // If possible, reuse original tag for HTML5 playback technology element + el = player.tag, + newEl; + + // Check if this browser supports moving the element into the box. + // On the iPhone video will break if you move the element, + // So we have to create a brand new element. + if (!el || this.features['movingMediaElementInDOM'] === false) { + + // If the original tag is still there, remove it. + if (el) { + el['player'] = null; + player.tag = null; + player.el().removeChild(el); + el = el.cloneNode(false); + } else { + el = vjs.createEl('video', { + id:player.id() + '_html5_api', + className:'vjs-tech' + }); + } + // associate the player with the new tag + el['player'] = player; + + vjs.insertFirst(el, player.el()); + } + + // Update specific tag settings, in case they were overridden + var attrs = ['autoplay','preload','loop','muted']; + for (var i = attrs.length - 1; i >= 0; i--) { + var attr = attrs[i]; + if (player.options_[attr] !== null) { + el[attr] = player.options_[attr]; + } + } + + return el; + // jenniisawesome = true; +}; + +// Make video events trigger player events +// May seem verbose here, but makes other APIs possible. +vjs.Html5.prototype.setupTriggers = function(){ + for (var i = vjs.Html5.Events.length - 1; i >= 0; i--) { + vjs.on(this.el_, vjs.Html5.Events[i], vjs.bind(this.player_, this.eventHandler)); + } +}; +// Triggers removed using this.off when disposed + +vjs.Html5.prototype.eventHandler = function(e){ + this.trigger(e); + + // No need for media events to bubble up. + e.stopPropagation(); +}; + +vjs.Html5.prototype.useNativeControls = function(){ + var tech, player, controlsOn, controlsOff, cleanUp; + + tech = this; + player = this.player(); + + // If the player controls are enabled turn on the native controls + tech.setControls(player.controls()); + + // Update the native controls when player controls state is updated + controlsOn = function(){ + tech.setControls(true); + }; + controlsOff = function(){ + tech.setControls(false); + }; + player.on('controlsenabled', controlsOn); + player.on('controlsdisabled', controlsOff); + + // Clean up when not using native controls anymore + cleanUp = function(){ + player.off('controlsenabled', controlsOn); + player.off('controlsdisabled', controlsOff); + }; + tech.on('dispose', cleanUp); + player.on('usingcustomcontrols', cleanUp); + + // Update the state of the player to using native controls + player.usingNativeControls(true); +}; + + +vjs.Html5.prototype.play = function(){ this.el_.play(); }; +vjs.Html5.prototype.pause = function(){ this.el_.pause(); }; +vjs.Html5.prototype.paused = function(){ return this.el_.paused; }; + +vjs.Html5.prototype.currentTime = function(){ return this.el_.currentTime; }; +vjs.Html5.prototype.setCurrentTime = function(seconds){ + try { + this.el_.currentTime = seconds; + } catch(e) { + vjs.log(e, 'Video is not ready. (Video.js)'); + // this.warning(VideoJS.warnings.videoNotReady); + } +}; + +vjs.Html5.prototype.duration = function(){ return this.el_.duration || 0; }; +vjs.Html5.prototype.buffered = function(){ return this.el_.buffered; }; + +vjs.Html5.prototype.volume = function(){ return this.el_.volume; }; +vjs.Html5.prototype.setVolume = function(percentAsDecimal){ this.el_.volume = percentAsDecimal; }; +vjs.Html5.prototype.muted = function(){ return this.el_.muted; }; +vjs.Html5.prototype.setMuted = function(muted){ this.el_.muted = muted; }; + +vjs.Html5.prototype.width = function(){ return this.el_.offsetWidth; }; +vjs.Html5.prototype.height = function(){ return this.el_.offsetHeight; }; + +vjs.Html5.prototype.supportsFullScreen = function(){ + if (typeof this.el_.webkitEnterFullScreen == 'function') { + + // Seems to be broken in Chromium/Chrome && Safari in Leopard + if (/Android/.test(vjs.USER_AGENT) || !/Chrome|Mac OS X 10.5/.test(vjs.USER_AGENT)) { + return true; + } + } + return false; +}; + +vjs.Html5.prototype.enterFullScreen = function(){ + var video = this.el_; + if (video.paused && video.networkState <= video.HAVE_METADATA) { + // attempt to prime the video element for programmatic access + // this isn't necessary on the desktop but shouldn't hurt + this.el_.play(); + + // playing and pausing synchronously during the transition to fullscreen + // can get iOS ~6.1 devices into a play/pause loop + setTimeout(function(){ + video.pause(); + video.webkitEnterFullScreen(); + }, 0); + } else { + video.webkitEnterFullScreen(); + } +}; +vjs.Html5.prototype.exitFullScreen = function(){ + this.el_.webkitExitFullScreen(); +}; +vjs.Html5.prototype.src = function(src){ this.el_.src = src; }; +vjs.Html5.prototype.load = function(){ this.el_.load(); }; +vjs.Html5.prototype.currentSrc = function(){ return this.el_.currentSrc; }; + +vjs.Html5.prototype.preload = function(){ return this.el_.preload; }; +vjs.Html5.prototype.setPreload = function(val){ this.el_.preload = val; }; + +vjs.Html5.prototype.autoplay = function(){ return this.el_.autoplay; }; +vjs.Html5.prototype.setAutoplay = function(val){ this.el_.autoplay = val; }; + +vjs.Html5.prototype.controls = function(){ return this.el_.controls; } +vjs.Html5.prototype.setControls = function(val){ this.el_.controls = !!val; } + +vjs.Html5.prototype.loop = function(){ return this.el_.loop; }; +vjs.Html5.prototype.setLoop = function(val){ this.el_.loop = val; }; + +vjs.Html5.prototype.error = function(){ return this.el_.error; }; +vjs.Html5.prototype.seeking = function(){ return this.el_.seeking; }; +vjs.Html5.prototype.ended = function(){ return this.el_.ended; }; +vjs.Html5.prototype.defaultMuted = function(){ return this.el_.defaultMuted; }; + +/* HTML5 Support Testing ---------------------------------------------------- */ + +vjs.Html5.isSupported = function(){ + return !!vjs.TEST_VID.canPlayType; +}; + +vjs.Html5.canPlaySource = function(srcObj){ + // IE9 on Windows 7 without MediaPlayer throws an error here + // https://github.com/videojs/video.js/issues/519 + try { + return !!vjs.TEST_VID.canPlayType(srcObj.type); + } catch(e) { + return ''; + } + // TODO: Check Type + // If no Type, check ext + // Check Media Type +}; + +vjs.Html5.canControlVolume = function(){ + var volume = vjs.TEST_VID.volume; + vjs.TEST_VID.volume = (volume / 2) + 0.1; + return volume !== vjs.TEST_VID.volume; +}; + +// List of all HTML5 events (various uses). +vjs.Html5.Events = 'loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange'.split(','); + + +// HTML5 Feature detection and Device Fixes --------------------------------- // + + // Override Android 2.2 and less canPlayType method which is broken +if (vjs.IS_OLD_ANDROID) { + document.createElement('video').constructor.prototype.canPlayType = function(type){ + return (type && type.toLowerCase().indexOf('video/mp4') != -1) ? 'maybe' : ''; + }; +} +/** + * @fileoverview VideoJS-SWF - Custom Flash Player with HTML5-ish API + * https://github.com/zencoder/video-js-swf + * Not using setupTriggers. Using global onEvent func to distribute events + */ + +/** + * HTML5 Media Controller - Wrapper for HTML5 Media API + * @param {vjs.Player|Object} player + * @param {Object=} options + * @param {Function=} ready + * @constructor + */ +vjs.Flash = vjs.MediaTechController.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.MediaTechController.call(this, player, options, ready); + + var source = options['source'], + + // Which element to embed in + parentEl = options['parentEl'], + + // Create a temporary element to be replaced by swf object + placeHolder = this.el_ = vjs.createEl('div', { id: player.id() + '_temp_flash' }), + + // Generate ID for swf object + objId = player.id()+'_flash_api', + + // Store player options in local var for optimization + // TODO: switch to using player methods instead of options + // e.g. player.autoplay(); + playerOptions = player.options_, + + // Merge default flashvars with ones passed in to init + flashVars = vjs.obj.merge({ + + // SWF Callback Functions + 'readyFunction': 'videojs.Flash.onReady', + 'eventProxyFunction': 'videojs.Flash.onEvent', + 'errorEventProxyFunction': 'videojs.Flash.onError', + + // Player Settings + 'autoplay': playerOptions.autoplay, + 'preload': playerOptions.preload, + 'loop': playerOptions.loop, + 'muted': playerOptions.muted + + }, options['flashVars']), + + // Merge default parames with ones passed in + params = vjs.obj.merge({ + 'wmode': 'opaque', // Opaque is needed to overlay controls, but can affect playback performance + 'bgcolor': '#000000' // Using bgcolor prevents a white flash when the object is loading + }, options['params']), + + // Merge default attributes with ones passed in + attributes = vjs.obj.merge({ + 'id': objId, + 'name': objId, // Both ID and Name needed or swf to identifty itself + 'class': 'vjs-tech' + }, options['attributes']) + ; + + // If source was supplied pass as a flash var. + if (source) { + if (source.type && vjs.Flash.isStreamingType(source.type)) { + var parts = vjs.Flash.streamToParts(source.src); + flashVars['rtmpConnection'] = encodeURIComponent(parts.connection); + flashVars['rtmpStream'] = encodeURIComponent(parts.stream); + } + else { + flashVars['src'] = encodeURIComponent(vjs.getAbsoluteURL(source.src)); + } + } + + // Add placeholder to player div + vjs.insertFirst(placeHolder, parentEl); + + // Having issues with Flash reloading on certain page actions (hide/resize/fullscreen) in certain browsers + // This allows resetting the playhead when we catch the reload + if (options['startTime']) { + this.ready(function(){ + this.load(); + this.play(); + this.currentTime(options['startTime']); + }); + } + + // Flash iFrame Mode + // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload. + // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13) + // - Webkit when hiding the plugin + // - Webkit and Firefox when using requestFullScreen on a parent element + // Loading the flash plugin into a dynamically generated iFrame gets around most of these issues. + // Issues that remain include hiding the element and requestFullScreen in Firefox specifically + + // There's on particularly annoying issue with this method which is that Firefox throws a security error on an offsite Flash object loaded into a dynamically created iFrame. + // Even though the iframe was inserted into a page on the web, Firefox + Flash considers it a local app trying to access an internet file. + // I tried mulitple ways of setting the iframe src attribute but couldn't find a src that worked well. Tried a real/fake source, in/out of domain. + // Also tried a method from stackoverflow that caused a security error in all browsers. http://stackoverflow.com/questions/2486901/how-to-set-document-domain-for-a-dynamically-generated-iframe + // In the end the solution I found to work was setting the iframe window.location.href right before doing a document.write of the Flash object. + // The only downside of this it seems to trigger another http request to the original page (no matter what's put in the href). Not sure why that is. + + // NOTE (2012-01-29): Cannot get Firefox to load the remote hosted SWF into a dynamically created iFrame + // Firefox 9 throws a security error, unleess you call location.href right before doc.write. + // Not sure why that even works, but it causes the browser to look like it's continuously trying to load the page. + // Firefox 3.6 keeps calling the iframe onload function anytime I write to it, causing an endless loop. + + if (options['iFrameMode'] === true && !vjs.IS_FIREFOX) { + + // Create iFrame with vjs-tech class so it's 100% width/height + var iFrm = vjs.createEl('iframe', { + 'id': objId + '_iframe', + 'name': objId + '_iframe', + 'className': 'vjs-tech', + 'scrolling': 'no', + 'marginWidth': 0, + 'marginHeight': 0, + 'frameBorder': 0 + }); + + // Update ready function names in flash vars for iframe window + flashVars['readyFunction'] = 'ready'; + flashVars['eventProxyFunction'] = 'events'; + flashVars['errorEventProxyFunction'] = 'errors'; + + // Tried multiple methods to get this to work in all browsers + + // Tried embedding the flash object in the page first, and then adding a place holder to the iframe, then replacing the placeholder with the page object. + // The goal here was to try to load the swf URL in the parent page first and hope that got around the firefox security error + // var newObj = vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes); + // (in onload) + // var temp = vjs.createEl('a', { id:'asdf', innerHTML: 'asdf' } ); + // iDoc.body.appendChild(temp); + + // Tried embedding the flash object through javascript in the iframe source. + // This works in webkit but still triggers the firefox security error + // iFrm.src = 'javascript: document.write('"+vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes)+"');"; + + // Tried an actual local iframe just to make sure that works, but it kills the easiness of the CDN version if you require the user to host an iframe + // We should add an option to host the iframe locally though, because it could help a lot of issues. + // iFrm.src = "iframe.html"; + + // Wait until iFrame has loaded to write into it. + vjs.on(iFrm, 'load', vjs.bind(this, function(){ + + var iDoc, + iWin = iFrm.contentWindow; + + // The one working method I found was to use the iframe's document.write() to create the swf object + // This got around the security issue in all browsers except firefox. + // I did find a hack where if I call the iframe's window.location.href='', it would get around the security error + // However, the main page would look like it was loading indefinitely (URL bar loading spinner would never stop) + // Plus Firefox 3.6 didn't work no matter what I tried. + // if (vjs.USER_AGENT.match('Firefox')) { + // iWin.location.href = ''; + // } + + // Get the iFrame's document depending on what the browser supports + iDoc = iFrm.contentDocument ? iFrm.contentDocument : iFrm.contentWindow.document; + + // Tried ensuring both document domains were the same, but they already were, so that wasn't the issue. + // Even tried adding /. that was mentioned in a browser security writeup + // document.domain = document.domain+'/.'; + // iDoc.domain = document.domain+'/.'; + + // Tried adding the object to the iframe doc's innerHTML. Security error in all browsers. + // iDoc.body.innerHTML = swfObjectHTML; + + // Tried appending the object to the iframe doc's body. Security error in all browsers. + // iDoc.body.appendChild(swfObject); + + // Using document.write actually got around the security error that browsers were throwing. + // Again, it's a dynamically generated (same domain) iframe, loading an external Flash swf. + // Not sure why that's a security issue, but apparently it is. + iDoc.write(vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes)); + + // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers + // So far no issues with swf ready event being called before it's set on the window. + iWin['player'] = this.player_; + + // Create swf ready function for iFrame window + iWin['ready'] = vjs.bind(this.player_, function(currSwf){ + var el = iDoc.getElementById(currSwf), + player = this, + tech = player.tech; + + // Update reference to playback technology element + tech.el_ = el; + + // Make sure swf is actually ready. Sometimes the API isn't actually yet. + vjs.Flash.checkReady(tech); + }); + + // Create event listener for all swf events + iWin['events'] = vjs.bind(this.player_, function(swfID, eventName){ + var player = this; + if (player && player.techName === 'flash') { + player.trigger(eventName); + } + }); + + // Create error listener for all swf errors + iWin['errors'] = vjs.bind(this.player_, function(swfID, eventName){ + vjs.log('Flash Error', eventName); + }); + + })); + + // Replace placeholder with iFrame (it will load now) + placeHolder.parentNode.replaceChild(iFrm, placeHolder); + + // If not using iFrame mode, embed as normal object + } else { + vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes); + } + } +}); + +vjs.Flash.prototype.dispose = function(){ + vjs.MediaTechController.prototype.dispose.call(this); +}; + +vjs.Flash.prototype.play = function(){ + this.el_.vjs_play(); +}; + +vjs.Flash.prototype.pause = function(){ + this.el_.vjs_pause(); +}; + +vjs.Flash.prototype.src = function(src){ + if (vjs.Flash.isStreamingSrc(src)) { + src = vjs.Flash.streamToParts(src); + this.setRtmpConnection(src.connection); + this.setRtmpStream(src.stream); + } + else { + // Make sure source URL is abosolute. + src = vjs.getAbsoluteURL(src); + this.el_.vjs_src(src); + } + + // Currently the SWF doesn't autoplay if you load a source later. + // e.g. Load player w/ no source, wait 2s, set src. + if (this.player_.autoplay()) { + var tech = this; + setTimeout(function(){ tech.play(); }, 0); + } +}; + +vjs.Flash.prototype.currentSrc = function(){ + var src = this.el_.vjs_getProperty('currentSrc'); + // no src, check and see if RTMP + if (src == null) { + var connection = this.rtmpConnection(), + stream = this.rtmpStream(); + + if (connection && stream) { + src = vjs.Flash.streamFromParts(connection, stream); + } + } + return src; +}; + +vjs.Flash.prototype.load = function(){ + this.el_.vjs_load(); +}; + +vjs.Flash.prototype.poster = function(){ + this.el_.vjs_getProperty('poster'); +}; + +vjs.Flash.prototype.buffered = function(){ + return vjs.createTimeRange(0, this.el_.vjs_getProperty('buffered')); +}; + +vjs.Flash.prototype.supportsFullScreen = function(){ + return false; // Flash does not allow fullscreen through javascript +}; + +vjs.Flash.prototype.enterFullScreen = function(){ + return false; +}; + + +// Create setters and getters for attributes +var api = vjs.Flash.prototype, + readWrite = 'rtmpConnection,rtmpStream,preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted'.split(','), + readOnly = 'error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks'.split(','); + // Overridden: buffered + +/** + * @this {*} + */ +var createSetter = function(attr){ + var attrUpper = attr.charAt(0).toUpperCase() + attr.slice(1); + api['set'+attrUpper] = function(val){ return this.el_.vjs_setProperty(attr, val); }; +}; + +/** + * @this {*} + */ +var createGetter = function(attr){ + api[attr] = function(){ return this.el_.vjs_getProperty(attr); }; +}; + +(function(){ + var i; + // Create getter and setters for all read/write attributes + for (i = 0; i < readWrite.length; i++) { + createGetter(readWrite[i]); + createSetter(readWrite[i]); + } + + // Create getters for read-only attributes + for (i = 0; i < readOnly.length; i++) { + createGetter(readOnly[i]); + } +})(); + +/* Flash Support Testing -------------------------------------------------------- */ + +vjs.Flash.isSupported = function(){ + return vjs.Flash.version()[0] >= 10; + // return swfobject.hasFlashPlayerVersion('10'); +}; + +vjs.Flash.canPlaySource = function(srcObj){ + if (srcObj.type in vjs.Flash.formats || srcObj.type in vjs.Flash.streamingFormats) { return 'maybe'; } +}; + +vjs.Flash.formats = { + 'video/flv': 'FLV', + 'video/x-flv': 'FLV', + 'video/mp4': 'MP4', + 'video/m4v': 'MP4' +}; + +vjs.Flash.streamingFormats = { + 'rtmp/mp4': 'MP4', + 'rtmp/flv': 'FLV' +}; + +vjs.Flash['onReady'] = function(currSwf){ + var el = vjs.el(currSwf); + + // Get player from box + // On firefox reloads, el might already have a player + var player = el['player'] || el.parentNode['player'], + tech = player.tech; + + // Reference player on tech element + el['player'] = player; + + // Update reference to playback technology element + tech.el_ = el; + + vjs.Flash.checkReady(tech); +}; + +// The SWF isn't alwasy ready when it says it is. Sometimes the API functions still need to be added to the object. +// If it's not ready, we set a timeout to check again shortly. +vjs.Flash.checkReady = function(tech){ + + // Check if API property exists + if (tech.el().vjs_getProperty) { + + // If so, tell tech it's ready + tech.triggerReady(); + + // Otherwise wait longer. + } else { + + setTimeout(function(){ + vjs.Flash.checkReady(tech); + }, 50); + + } +}; + +// Trigger events from the swf on the player +vjs.Flash['onEvent'] = function(swfID, eventName){ + var player = vjs.el(swfID)['player']; + player.trigger(eventName); +}; + +// Log errors from the swf +vjs.Flash['onError'] = function(swfID, err){ + var player = vjs.el(swfID)['player']; + player.trigger('error'); + vjs.log('Flash Error', err, swfID); +}; + +// Flash Version Check +vjs.Flash.version = function(){ + var version = '0,0,0'; + + // IE + try { + version = new window.ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1]; + + // other browsers + } catch(e) { + try { + if (navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin){ + version = (navigator.plugins['Shockwave Flash 2.0'] || navigator.plugins['Shockwave Flash']).description.replace(/\D+/g, ',').match(/^,?(.+),?$/)[1]; + } + } catch(err) {} + } + return version.split(','); +}; + +// Flash embedding method. Only used in non-iframe mode +vjs.Flash.embed = function(swf, placeHolder, flashVars, params, attributes){ + var code = vjs.Flash.getEmbedCode(swf, flashVars, params, attributes), + + // Get element by embedding code and retrieving created element + obj = vjs.createEl('div', { innerHTML: code }).childNodes[0], + + par = placeHolder.parentNode + ; + + placeHolder.parentNode.replaceChild(obj, placeHolder); + + // IE6 seems to have an issue where it won't initialize the swf object after injecting it. + // This is a dumb fix + var newObj = par.childNodes[0]; + setTimeout(function(){ + newObj.style.display = 'block'; + }, 1000); + + return obj; + +}; + +vjs.Flash.getEmbedCode = function(swf, flashVars, params, attributes){ + + var objTag = '<object type="application/x-shockwave-flash"', + flashVarsString = '', + paramsString = '', + attrsString = ''; + + // Convert flash vars to string + if (flashVars) { + vjs.obj.each(flashVars, function(key, val){ + flashVarsString += (key + '=' + val + '&'); + }); + } + + // Add swf, flashVars, and other default params + params = vjs.obj.merge({ + 'movie': swf, + 'flashvars': flashVarsString, + 'allowScriptAccess': 'always', // Required to talk to swf + 'allowNetworking': 'all' // All should be default, but having security issues. + }, params); + + // Create param tags string + vjs.obj.each(params, function(key, val){ + paramsString += '<param name="'+key+'" value="'+val+'" />'; + }); + + attributes = vjs.obj.merge({ + // Add swf to attributes (need both for IE and Others to work) + 'data': swf, + + // Default to 100% width/height + 'width': '100%', + 'height': '100%' + + }, attributes); + + // Create Attributes string + vjs.obj.each(attributes, function(key, val){ + attrsString += (key + '="' + val + '" '); + }); + + return objTag + attrsString + '>' + paramsString + '</object>'; +}; + +vjs.Flash.streamFromParts = function(connection, stream) { + return connection + '&' + stream; +}; + +vjs.Flash.streamToParts = function(src) { + var parts = { + connection: '', + stream: '' + }; + + if (! src) { + return parts; + } + + // Look for the normal URL separator we expect, '&'. + // If found, we split the URL into two pieces around the + // first '&'. + var connEnd = src.indexOf('&'); + var streamBegin; + if (connEnd !== -1) { + streamBegin = connEnd + 1; + } + else { + // If there's not a '&', we use the last '/' as the delimiter. + connEnd = streamBegin = src.lastIndexOf('/') + 1; + if (connEnd === 0) { + // really, there's not a '/'? + connEnd = streamBegin = src.length; + } + } + parts.connection = src.substring(0, connEnd); + parts.stream = src.substring(streamBegin, src.length); + + return parts; +}; + +vjs.Flash.isStreamingType = function(srcType) { + return srcType in vjs.Flash.streamingFormats; +}; + +// RTMP has four variations, any string starting +// with one of these protocols should be valid +vjs.Flash.RTMP_RE = /^rtmp[set]?:\/\//i; + +vjs.Flash.isStreamingSrc = function(src) { + return vjs.Flash.RTMP_RE.test(src); +}; +/** + * @constructor + */ +vjs.MediaLoader = vjs.Component.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.Component.call(this, player, options, ready); + + // If there are no sources when the player is initialized, + // load the first supported playback technology. + if (!player.options_['sources'] || player.options_['sources'].length === 0) { + for (var i=0,j=player.options_['techOrder']; i<j.length; i++) { + var techName = vjs.capitalize(j[i]), + tech = window['videojs'][techName]; + + // Check if the browser supports this technology + if (tech && tech.isSupported()) { + player.loadTech(techName); + break; + } + } + } else { + // // Loop through playback technologies (HTML5, Flash) and check for support. + // // Then load the best source. + // // A few assumptions here: + // // All playback technologies respect preload false. + player.src(player.options_['sources']); + } + } +});/** + * @fileoverview Text Tracks + * Text tracks are tracks of timed text events. + * Captions - text displayed over the video for the hearing impared + * Subtitles - text displayed over the video for those who don't understand langauge in the video + * Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video + * Descriptions (not supported yet) - audio descriptions that are read back to the user by a screen reading device + */ + +// Player Additions - Functions add to the player object for easier access to tracks + +/** + * List of associated text tracks + * @type {Array} + * @private + */ +vjs.Player.prototype.textTracks_; + +/** + * Get an array of associated text tracks. captions, subtitles, chapters, descriptions + * http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-texttracks + * @return {Array} Array of track objects + */ +vjs.Player.prototype.textTracks = function(){ + this.textTracks_ = this.textTracks_ || []; + return this.textTracks_; +}; + +/** + * Add a text track + * In addition to the W3C settings we allow adding additional info through options. + * http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-addtexttrack + * @param {String} kind Captions, subtitles, chapters, descriptions, or metadata + * @param {String=} label Optional label + * @param {String=} language Optional language + * @param {Object=} options Additional track options, like src + */ +vjs.Player.prototype.addTextTrack = function(kind, label, language, options){ + var tracks = this.textTracks_ = this.textTracks_ || []; + options = options || {}; + + options['kind'] = kind; + options['label'] = label; + options['language'] = language; + + // HTML5 Spec says default to subtitles. + // Uppercase first letter to match class names + var Kind = vjs.capitalize(kind || 'subtitles'); + + // Create correct texttrack class. CaptionsTrack, etc. + var track = new window['videojs'][Kind + 'Track'](this, options); + + tracks.push(track); + + // If track.dflt() is set, start showing immediately + // TODO: Add a process to deterime the best track to show for the specific kind + // Incase there are mulitple defaulted tracks of the same kind + // Or the user has a set preference of a specific language that should override the default + // if (track.dflt()) { + // this.ready(vjs.bind(track, track.show)); + // } + + return track; +}; + +/** + * Add an array of text tracks. captions, subtitles, chapters, descriptions + * Track objects will be stored in the player.textTracks() array + * @param {Array} trackList Array of track elements or objects (fake track elements) + */ +vjs.Player.prototype.addTextTracks = function(trackList){ + var trackObj; + + for (var i = 0; i < trackList.length; i++) { + trackObj = trackList[i]; + this.addTextTrack(trackObj['kind'], trackObj['label'], trackObj['language'], trackObj); + } + + return this; +}; + +// Show a text track +// disableSameKind: disable all other tracks of the same kind. Value should be a track kind (captions, etc.) +vjs.Player.prototype.showTextTrack = function(id, disableSameKind){ + var tracks = this.textTracks_, + i = 0, + j = tracks.length, + track, showTrack, kind; + + // Find Track with same ID + for (;i<j;i++) { + track = tracks[i]; + if (track.id() === id) { + track.show(); + showTrack = track; + + // Disable tracks of the same kind + } else if (disableSameKind && track.kind() == disableSameKind && track.mode() > 0) { + track.disable(); + } + } + + // Get track kind from shown track or disableSameKind + kind = (showTrack) ? showTrack.kind() : ((disableSameKind) ? disableSameKind : false); + + // Trigger trackchange event, captionstrackchange, subtitlestrackchange, etc. + if (kind) { + this.trigger(kind+'trackchange'); + } + + return this; +}; + +/** + * Track Class + * Contains track methods for loading, showing, parsing cues of tracks + * @param {vjs.Player|Object} player + * @param {Object=} options + * @constructor + */ +vjs.TextTrack = vjs.Component.extend({ + /** @constructor */ + init: function(player, options){ + vjs.Component.call(this, player, options); + + // Apply track info to track object + // Options will often be a track element + + // Build ID if one doesn't exist + this.id_ = options['id'] || ('vjs_' + options['kind'] + '_' + options['language'] + '_' + vjs.guid++); + this.src_ = options['src']; + // 'default' is a reserved keyword in js so we use an abbreviated version + this.dflt_ = options['default'] || options['dflt']; + this.title_ = options['title']; + this.language_ = options['srclang']; + this.label_ = options['label']; + this.cues_ = []; + this.activeCues_ = []; + this.readyState_ = 0; + this.mode_ = 0; + + this.player_.on('fullscreenchange', vjs.bind(this, this.adjustFontSize)); + } +}); + +/** + * Track kind value. Captions, subtitles, etc. + * @private + */ +vjs.TextTrack.prototype.kind_; + +/** + * Get the track kind value + * @return {String} + */ +vjs.TextTrack.prototype.kind = function(){ + return this.kind_; +}; + +/** + * Track src value + * @private + */ +vjs.TextTrack.prototype.src_; + +/** + * Get the track src value + * @return {String} + */ +vjs.TextTrack.prototype.src = function(){ + return this.src_; +}; + +/** + * Track default value + * If default is used, subtitles/captions to start showing + * @private + */ +vjs.TextTrack.prototype.dflt_; + +/** + * Get the track default value + * 'default' is a reserved keyword + * @return {Boolean} + */ +vjs.TextTrack.prototype.dflt = function(){ + return this.dflt_; +}; + +/** + * Track title value + * @private + */ +vjs.TextTrack.prototype.title_; + +/** + * Get the track title value + * @return {String} + */ +vjs.TextTrack.prototype.title = function(){ + return this.title_; +}; + +/** + * Language - two letter string to represent track language, e.g. 'en' for English + * Spec def: readonly attribute DOMString language; + * @private + */ +vjs.TextTrack.prototype.language_; + +/** + * Get the track language value + * @return {String} + */ +vjs.TextTrack.prototype.language = function(){ + return this.language_; +}; + +/** + * Track label e.g. 'English' + * Spec def: readonly attribute DOMString label; + * @private + */ +vjs.TextTrack.prototype.label_; + +/** + * Get the track label value + * @return {String} + */ +vjs.TextTrack.prototype.label = function(){ + return this.label_; +}; + +/** + * All cues of the track. Cues have a startTime, endTime, text, and other properties. + * Spec def: readonly attribute TextTrackCueList cues; + * @private + */ +vjs.TextTrack.prototype.cues_; + +/** + * Get the track cues + * @return {Array} + */ +vjs.TextTrack.prototype.cues = function(){ + return this.cues_; +}; + +/** + * ActiveCues is all cues that are currently showing + * Spec def: readonly attribute TextTrackCueList activeCues; + * @private + */ +vjs.TextTrack.prototype.activeCues_; + +/** + * Get the track active cues + * @return {Array} + */ +vjs.TextTrack.prototype.activeCues = function(){ + return this.activeCues_; +}; + +/** + * ReadyState describes if the text file has been loaded + * const unsigned short NONE = 0; + * const unsigned short LOADING = 1; + * const unsigned short LOADED = 2; + * const unsigned short ERROR = 3; + * readonly attribute unsigned short readyState; + * @private + */ +vjs.TextTrack.prototype.readyState_; + +/** + * Get the track readyState + * @return {Number} + */ +vjs.TextTrack.prototype.readyState = function(){ + return this.readyState_; +}; + +/** + * Mode describes if the track is showing, hidden, or disabled + * const unsigned short OFF = 0; + * const unsigned short HIDDEN = 1; (still triggering cuechange events, but not visible) + * const unsigned short SHOWING = 2; + * attribute unsigned short mode; + * @private + */ +vjs.TextTrack.prototype.mode_; + +/** + * Get the track mode + * @return {Number} + */ +vjs.TextTrack.prototype.mode = function(){ + return this.mode_; +}; + +/** + * Change the font size of the text track to make it larger when playing in fullscreen mode + * and restore it to its normal size when not in fullscreen mode. + */ +vjs.TextTrack.prototype.adjustFontSize = function(){ + if (this.player_.isFullScreen) { + // Scale the font by the same factor as increasing the video width to the full screen window width. + // Additionally, multiply that factor by 1.4, which is the default font size for + // the caption track (from the CSS) + this.el_.style.fontSize = screen.width / this.player_.width() * 1.4 * 100 + '%'; + } else { + // Change the font size of the text track back to its original non-fullscreen size + this.el_.style.fontSize = ''; + } +}; + +/** + * Create basic div to hold cue text + * @return {Element} + */ +vjs.TextTrack.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-' + this.kind_ + ' vjs-text-track' + }); +}; + +/** + * Show: Mode Showing (2) + * Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily. + * The user agent is maintaining a list of which cues are active, and events are being fired accordingly. + * In addition, for text tracks whose kind is subtitles or captions, the cues are being displayed over the video as appropriate; + * for text tracks whose kind is descriptions, the user agent is making the cues available to the user in a non-visual fashion; + * and for text tracks whose kind is chapters, the user agent is making available to the user a mechanism by which the user can navigate to any point in the media resource by selecting a cue. + * The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute. + * This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences. + */ +vjs.TextTrack.prototype.show = function(){ + this.activate(); + + this.mode_ = 2; + + // Show element. + vjs.Component.prototype.show.call(this); +}; + +/** + * Hide: Mode Hidden (1) + * Indicates that the text track is active, but that the user agent is not actively displaying the cues. + * If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily. + * The user agent is maintaining a list of which cues are active, and events are being fired accordingly. + */ +vjs.TextTrack.prototype.hide = function(){ + // When hidden, cues are still triggered. Disable to stop triggering. + this.activate(); + + this.mode_ = 1; + + // Hide element. + vjs.Component.prototype.hide.call(this); +}; + +/** + * Disable: Mode Off/Disable (0) + * Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track. + * No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues. + */ +vjs.TextTrack.prototype.disable = function(){ + // If showing, hide. + if (this.mode_ == 2) { this.hide(); } + + // Stop triggering cues + this.deactivate(); + + // Switch Mode to Off + this.mode_ = 0; +}; + +/** + * Turn on cue tracking. Tracks that are showing OR hidden are active. + */ +vjs.TextTrack.prototype.activate = function(){ + // Load text file if it hasn't been yet. + if (this.readyState_ === 0) { this.load(); } + + // Only activate if not already active. + if (this.mode_ === 0) { + // Update current cue on timeupdate + // Using unique ID for bind function so other tracks don't remove listener + this.player_.on('timeupdate', vjs.bind(this, this.update, this.id_)); + + // Reset cue time on media end + this.player_.on('ended', vjs.bind(this, this.reset, this.id_)); + + // Add to display + if (this.kind_ === 'captions' || this.kind_ === 'subtitles') { + this.player_.getChild('textTrackDisplay').addChild(this); + } + } +}; + +/** + * Turn off cue tracking. + */ +vjs.TextTrack.prototype.deactivate = function(){ + // Using unique ID for bind function so other tracks don't remove listener + this.player_.off('timeupdate', vjs.bind(this, this.update, this.id_)); + this.player_.off('ended', vjs.bind(this, this.reset, this.id_)); + this.reset(); // Reset + + // Remove from display + this.player_.getChild('textTrackDisplay').removeChild(this); +}; + +// A readiness state +// One of the following: +// +// Not loaded +// Indicates that the text track is known to exist (e.g. it has been declared with a track element), but its cues have not been obtained. +// +// Loading +// Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track. +// +// Loaded +// Indicates that the text track has been loaded with no fatal errors. No new cues will be added to the track except if the text track corresponds to a MutableTextTrack object. +// +// Failed to load +// Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way (e.g. URL could not be resolved, network error, unknown text track format). Some or all of the cues are likely missing and will not be obtained. +vjs.TextTrack.prototype.load = function(){ + + // Only load if not loaded yet. + if (this.readyState_ === 0) { + this.readyState_ = 1; + vjs.get(this.src_, vjs.bind(this, this.parseCues), vjs.bind(this, this.onError)); + } + +}; + +vjs.TextTrack.prototype.onError = function(err){ + this.error = err; + this.readyState_ = 3; + this.trigger('error'); +}; + +// Parse the WebVTT text format for cue times. +// TODO: Separate parser into own class so alternative timed text formats can be used. (TTML, DFXP) +vjs.TextTrack.prototype.parseCues = function(srcContent) { + var cue, time, text, + lines = srcContent.split('\n'), + line = '', id; + + for (var i=1, j=lines.length; i<j; i++) { + // Line 0 should be 'WEBVTT', so skipping i=0 + + line = vjs.trim(lines[i]); // Trim whitespace and linebreaks + + if (line) { // Loop until a line with content + + // First line could be an optional cue ID + // Check if line has the time separator + if (line.indexOf('-->') == -1) { + id = line; + // Advance to next line for timing. + line = vjs.trim(lines[++i]); + } else { + id = this.cues_.length; + } + + // First line - Number + cue = { + id: id, // Cue Number + index: this.cues_.length // Position in Array + }; + + // Timing line + time = line.split(' --> '); + cue.startTime = this.parseCueTime(time[0]); + cue.endTime = this.parseCueTime(time[1]); + + // Additional lines - Cue Text + text = []; + + // Loop until a blank line or end of lines + // Assumeing trim('') returns false for blank lines + while (lines[++i] && (line = vjs.trim(lines[i]))) { + text.push(line); + } + + cue.text = text.join('<br/>'); + + // Add this cue + this.cues_.push(cue); + } + } + + this.readyState_ = 2; + this.trigger('loaded'); +}; + + +vjs.TextTrack.prototype.parseCueTime = function(timeText) { + var parts = timeText.split(':'), + time = 0, + hours, minutes, other, seconds, ms; + + // Check if optional hours place is included + // 00:00:00.000 vs. 00:00.000 + if (parts.length == 3) { + hours = parts[0]; + minutes = parts[1]; + other = parts[2]; + } else { + hours = 0; + minutes = parts[0]; + other = parts[1]; + } + + // Break other (seconds, milliseconds, and flags) by spaces + // TODO: Make additional cue layout settings work with flags + other = other.split(/\s+/); + // Remove seconds. Seconds is the first part before any spaces. + seconds = other.splice(0,1)[0]; + // Could use either . or , for decimal + seconds = seconds.split(/\.|,/); + // Get milliseconds + ms = parseFloat(seconds[1]); + seconds = seconds[0]; + + // hours => seconds + time += parseFloat(hours) * 3600; + // minutes => seconds + time += parseFloat(minutes) * 60; + // Add seconds + time += parseFloat(seconds); + // Add milliseconds + if (ms) { time += ms/1000; } + + return time; +}; + +// Update active cues whenever timeupdate events are triggered on the player. +vjs.TextTrack.prototype.update = function(){ + if (this.cues_.length > 0) { + + // Get curent player time + var time = this.player_.currentTime(); + + // Check if the new time is outside the time box created by the the last update. + if (this.prevChange === undefined || time < this.prevChange || this.nextChange <= time) { + var cues = this.cues_, + + // Create a new time box for this state. + newNextChange = this.player_.duration(), // Start at beginning of the timeline + newPrevChange = 0, // Start at end + + reverse = false, // Set the direction of the loop through the cues. Optimized the cue check. + newCues = [], // Store new active cues. + + // Store where in the loop the current active cues are, to provide a smart starting point for the next loop. + firstActiveIndex, lastActiveIndex, + cue, i; // Loop vars + + // Check if time is going forwards or backwards (scrubbing/rewinding) + // If we know the direction we can optimize the starting position and direction of the loop through the cues array. + if (time >= this.nextChange || this.nextChange === undefined) { // NextChange should happen + // Forwards, so start at the index of the first active cue and loop forward + i = (this.firstActiveIndex !== undefined) ? this.firstActiveIndex : 0; + } else { + // Backwards, so start at the index of the last active cue and loop backward + reverse = true; + i = (this.lastActiveIndex !== undefined) ? this.lastActiveIndex : cues.length - 1; + } + + while (true) { // Loop until broken + cue = cues[i]; + + // Cue ended at this point + if (cue.endTime <= time) { + newPrevChange = Math.max(newPrevChange, cue.endTime); + + if (cue.active) { + cue.active = false; + } + + // No earlier cues should have an active start time. + // Nevermind. Assume first cue could have a duration the same as the video. + // In that case we need to loop all the way back to the beginning. + // if (reverse && cue.startTime) { break; } + + // Cue hasn't started + } else if (time < cue.startTime) { + newNextChange = Math.min(newNextChange, cue.startTime); + + if (cue.active) { + cue.active = false; + } + + // No later cues should have an active start time. + if (!reverse) { break; } + + // Cue is current + } else { + + if (reverse) { + // Add cue to front of array to keep in time order + newCues.splice(0,0,cue); + + // If in reverse, the first current cue is our lastActiveCue + if (lastActiveIndex === undefined) { lastActiveIndex = i; } + firstActiveIndex = i; + } else { + // Add cue to end of array + newCues.push(cue); + + // If forward, the first current cue is our firstActiveIndex + if (firstActiveIndex === undefined) { firstActiveIndex = i; } + lastActiveIndex = i; + } + + newNextChange = Math.min(newNextChange, cue.endTime); + newPrevChange = Math.max(newPrevChange, cue.startTime); + + cue.active = true; + } + + if (reverse) { + // Reverse down the array of cues, break if at first + if (i === 0) { break; } else { i--; } + } else { + // Walk up the array fo cues, break if at last + if (i === cues.length - 1) { break; } else { i++; } + } + + } + + this.activeCues_ = newCues; + this.nextChange = newNextChange; + this.prevChange = newPrevChange; + this.firstActiveIndex = firstActiveIndex; + this.lastActiveIndex = lastActiveIndex; + + this.updateDisplay(); + + this.trigger('cuechange'); + } + } +}; + +// Add cue HTML to display +vjs.TextTrack.prototype.updateDisplay = function(){ + var cues = this.activeCues_, + html = '', + i=0,j=cues.length; + + for (;i<j;i++) { + html += '<span class="vjs-tt-cue">'+cues[i].text+'</span>'; + } + + this.el_.innerHTML = html; +}; + +// Set all loop helper values back +vjs.TextTrack.prototype.reset = function(){ + this.nextChange = 0; + this.prevChange = this.player_.duration(); + this.firstActiveIndex = 0; + this.lastActiveIndex = 0; +}; + +// Create specific track types +/** + * @constructor + */ +vjs.CaptionsTrack = vjs.TextTrack.extend(); +vjs.CaptionsTrack.prototype.kind_ = 'captions'; +// Exporting here because Track creation requires the track kind +// to be available on global object. e.g. new window['videojs'][Kind + 'Track'] + +/** + * @constructor + */ +vjs.SubtitlesTrack = vjs.TextTrack.extend(); +vjs.SubtitlesTrack.prototype.kind_ = 'subtitles'; + +/** + * @constructor + */ +vjs.ChaptersTrack = vjs.TextTrack.extend(); +vjs.ChaptersTrack.prototype.kind_ = 'chapters'; + + +/* Text Track Display +============================================================================= */ +// Global container for both subtitle and captions text. Simple div container. + +/** + * @constructor + */ +vjs.TextTrackDisplay = vjs.Component.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.Component.call(this, player, options, ready); + + // This used to be called during player init, but was causing an error + // if a track should show by default and the display hadn't loaded yet. + // Should probably be moved to an external track loader when we support + // tracks that don't need a display. + if (player.options_['tracks'] && player.options_['tracks'].length > 0) { + this.player_.addTextTracks(player.options_['tracks']); + } + } +}); + +vjs.TextTrackDisplay.prototype.createEl = function(){ + return vjs.Component.prototype.createEl.call(this, 'div', { + className: 'vjs-text-track-display' + }); +}; + + +/* Text Track Menu Items +============================================================================= */ +/** + * @constructor + */ +vjs.TextTrackMenuItem = vjs.MenuItem.extend({ + /** @constructor */ + init: function(player, options){ + var track = this.track = options['track']; + + // Modify options for parent MenuItem class's init. + options['label'] = track.label(); + options['selected'] = track.dflt(); + vjs.MenuItem.call(this, player, options); + + this.player_.on(track.kind() + 'trackchange', vjs.bind(this, this.update)); + } +}); + +vjs.TextTrackMenuItem.prototype.onClick = function(){ + vjs.MenuItem.prototype.onClick.call(this); + this.player_.showTextTrack(this.track.id_, this.track.kind()); +}; + +vjs.TextTrackMenuItem.prototype.update = function(){ + this.selected(this.track.mode() == 2); +}; + +/** + * @constructor + */ +vjs.OffTextTrackMenuItem = vjs.TextTrackMenuItem.extend({ + /** @constructor */ + init: function(player, options){ + // Create pseudo track info + // Requires options['kind'] + options['track'] = { + kind: function() { return options['kind']; }, + player: player, + label: function(){ return options['kind'] + ' off'; }, + dflt: function(){ return false; }, + mode: function(){ return false; } + }; + vjs.TextTrackMenuItem.call(this, player, options); + this.selected(true); + } +}); + +vjs.OffTextTrackMenuItem.prototype.onClick = function(){ + vjs.TextTrackMenuItem.prototype.onClick.call(this); + this.player_.showTextTrack(this.track.id_, this.track.kind()); +}; + +vjs.OffTextTrackMenuItem.prototype.update = function(){ + var tracks = this.player_.textTracks(), + i=0, j=tracks.length, track, + off = true; + + for (;i<j;i++) { + track = tracks[i]; + if (track.kind() == this.track.kind() && track.mode() == 2) { + off = false; + } + } + + this.selected(off); +}; + +/* Captions Button +================================================================================ */ +/** + * @constructor + */ +vjs.TextTrackButton = vjs.MenuButton.extend({ + /** @constructor */ + init: function(player, options){ + vjs.MenuButton.call(this, player, options); + + if (this.items.length <= 1) { + this.hide(); + } + } +}); + +// vjs.TextTrackButton.prototype.buttonPressed = false; + +// vjs.TextTrackButton.prototype.createMenu = function(){ +// var menu = new vjs.Menu(this.player_); + +// // Add a title list item to the top +// // menu.el().appendChild(vjs.createEl('li', { +// // className: 'vjs-menu-title', +// // innerHTML: vjs.capitalize(this.kind_), +// // tabindex: -1 +// // })); + +// this.items = this.createItems(); + +// // Add menu items to the menu +// for (var i = 0; i < this.items.length; i++) { +// menu.addItem(this.items[i]); +// } + +// // Add list to element +// this.addChild(menu); + +// return menu; +// }; + +// Create a menu item for each text track +vjs.TextTrackButton.prototype.createItems = function(){ + var items = [], track; + + // Add an OFF menu item to turn all tracks off + items.push(new vjs.OffTextTrackMenuItem(this.player_, { 'kind': this.kind_ })); + + for (var i = 0; i < this.player_.textTracks().length; i++) { + track = this.player_.textTracks()[i]; + if (track.kind() === this.kind_) { + items.push(new vjs.TextTrackMenuItem(this.player_, { + 'track': track + })); + } + } + + return items; +}; + +/** + * @constructor + */ +vjs.CaptionsButton = vjs.TextTrackButton.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.TextTrackButton.call(this, player, options, ready); + this.el_.setAttribute('aria-label','Captions Menu'); + } +}); +vjs.CaptionsButton.prototype.kind_ = 'captions'; +vjs.CaptionsButton.prototype.buttonText = 'Captions'; +vjs.CaptionsButton.prototype.className = 'vjs-captions-button'; + +/** + * @constructor + */ +vjs.SubtitlesButton = vjs.TextTrackButton.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.TextTrackButton.call(this, player, options, ready); + this.el_.setAttribute('aria-label','Subtitles Menu'); + } +}); +vjs.SubtitlesButton.prototype.kind_ = 'subtitles'; +vjs.SubtitlesButton.prototype.buttonText = 'Subtitles'; +vjs.SubtitlesButton.prototype.className = 'vjs-subtitles-button'; + +// Chapters act much differently than other text tracks +// Cues are navigation vs. other tracks of alternative languages +/** + * @constructor + */ +vjs.ChaptersButton = vjs.TextTrackButton.extend({ + /** @constructor */ + init: function(player, options, ready){ + vjs.TextTrackButton.call(this, player, options, ready); + this.el_.setAttribute('aria-label','Chapters Menu'); + } +}); +vjs.ChaptersButton.prototype.kind_ = 'chapters'; +vjs.ChaptersButton.prototype.buttonText = 'Chapters'; +vjs.ChaptersButton.prototype.className = 'vjs-chapters-button'; + +// Create a menu item for each text track +vjs.ChaptersButton.prototype.createItems = function(){ + var items = [], track; + + for (var i = 0; i < this.player_.textTracks().length; i++) { + track = this.player_.textTracks()[i]; + if (track.kind() === this.kind_) { + items.push(new vjs.TextTrackMenuItem(this.player_, { + 'track': track + })); + } + } + + return items; +}; + +vjs.ChaptersButton.prototype.createMenu = function(){ + var tracks = this.player_.textTracks(), + i = 0, + j = tracks.length, + track, chaptersTrack, + items = this.items = []; + + for (;i<j;i++) { + track = tracks[i]; + if (track.kind() == this.kind_ && track.dflt()) { + if (track.readyState() < 2) { + this.chaptersTrack = track; + track.on('loaded', vjs.bind(this, this.createMenu)); + return; + } else { + chaptersTrack = track; + break; + } + } + } + + var menu = this.menu = new vjs.Menu(this.player_); + + menu.el_.appendChild(vjs.createEl('li', { + className: 'vjs-menu-title', + innerHTML: vjs.capitalize(this.kind_), + tabindex: -1 + })); + + if (chaptersTrack) { + var cues = chaptersTrack.cues_, cue, mi; + i = 0; + j = cues.length; + + for (;i<j;i++) { + cue = cues[i]; + + mi = new vjs.ChaptersTrackMenuItem(this.player_, { + 'track': chaptersTrack, + 'cue': cue + }); + + items.push(mi); + + menu.addChild(mi); + } + } + + if (this.items.length > 0) { + this.show(); + } + + return menu; +}; + + +/** + * @constructor + */ +vjs.ChaptersTrackMenuItem = vjs.MenuItem.extend({ + /** @constructor */ + init: function(player, options){ + var track = this.track = options['track'], + cue = this.cue = options['cue'], + currentTime = player.currentTime(); + + // Modify options for parent MenuItem class's init. + options['label'] = cue.text; + options['selected'] = (cue.startTime <= currentTime && currentTime < cue.endTime); + vjs.MenuItem.call(this, player, options); + + track.on('cuechange', vjs.bind(this, this.update)); + } +}); + +vjs.ChaptersTrackMenuItem.prototype.onClick = function(){ + vjs.MenuItem.prototype.onClick.call(this); + this.player_.currentTime(this.cue.startTime); + this.update(this.cue.startTime); +}; + +vjs.ChaptersTrackMenuItem.prototype.update = function(){ + var cue = this.cue, + currentTime = this.player_.currentTime(); + + // vjs.log(currentTime, cue.startTime); + this.selected(cue.startTime <= currentTime && currentTime < cue.endTime); +}; + +// Add Buttons to controlBar +vjs.obj.merge(vjs.ControlBar.prototype.options_['children'], { + 'subtitlesButton': {}, + 'captionsButton': {}, + 'chaptersButton': {} +}); + +// vjs.Cue = vjs.Component.extend({ +// /** @constructor */ +// init: function(player, options){ +// vjs.Component.call(this, player, options); +// } +// }); +/** + * @fileoverview Add JSON support + * @suppress {undefinedVars} + * (Compiler doesn't like JSON not being declared) + */ + +/** + * Javascript JSON implementation + * (Parse Method Only) + * https://github.com/douglascrockford/JSON-js/blob/master/json2.js + * Only using for parse method when parsing data-setup attribute JSON. + * @type {Object} + * @suppress {undefinedVars} + */ +vjs.JSON; + +/** + * @suppress {undefinedVars} + */ +if (typeof window.JSON !== 'undefined' && window.JSON.parse === 'function') { + vjs.JSON = window.JSON; + +} else { + vjs.JSON = {}; + + var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g; + + vjs.JSON.parse = function (text, reviver) { + var j; + + function walk(holder, key) { + var k, v, value = holder[key]; + if (value && typeof value === 'object') { + for (k in value) { + if (Object.prototype.hasOwnProperty.call(value, k)) { + v = walk(value, k); + if (v !== undefined) { + value[k] = v; + } else { + delete value[k]; + } + } + } + } + return reviver.call(holder, key, value); + } + text = String(text); + cx.lastIndex = 0; + if (cx.test(text)) { + text = text.replace(cx, function (a) { + return '\\u' + + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }); + } + + if (/^[\],:{}\s]*$/ + .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@') + .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']') + .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) { + + j = eval('(' + text + ')'); + + return typeof reviver === 'function' ? + walk({'': j}, '') : j; + } + + throw new SyntaxError('JSON.parse(): invalid or malformed JSON data'); + }; +} +/** + * @fileoverview Functions for automatically setting up a player + * based on the data-setup attribute of the video tag + */ + +// Automatically set up any tags that have a data-setup attribute +vjs.autoSetup = function(){ + var options, vid, player, + vids = document.getElementsByTagName('video'); + + // Check if any media elements exist + if (vids && vids.length > 0) { + + for (var i=0,j=vids.length; i<j; i++) { + vid = vids[i]; + + // Check if element exists, has getAttribute func. + // IE seems to consider typeof el.getAttribute == 'object' instead of 'function' like expected, at least when loading the player immediately. + if (vid && vid.getAttribute) { + + // Make sure this player hasn't already been set up. + if (vid['player'] === undefined) { + options = vid.getAttribute('data-setup'); + + // Check if data-setup attr exists. + // We only auto-setup if they've added the data-setup attr. + if (options !== null) { + + // Parse options JSON + // If empty string, make it a parsable json object. + options = vjs.JSON.parse(options || '{}'); + + // Create new video.js instance. + player = videojs(vid, options); + } + } + + // If getAttribute isn't defined, we need to wait for the DOM. + } else { + vjs.autoSetupTimeout(1); + break; + } + } + + // No videos were found, so keep looping unless page is finisehd loading. + } else if (!vjs.windowLoaded) { + vjs.autoSetupTimeout(1); + } +}; + +// Pause to let the DOM keep processing +vjs.autoSetupTimeout = function(wait){ + setTimeout(vjs.autoSetup, wait); +}; + +if (document.readyState === 'complete') { + vjs.windowLoaded = true; +} else { + vjs.one(window, 'load', function(){ + vjs.windowLoaded = true; + }); +} + +// Run Auto-load players +// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version) +vjs.autoSetupTimeout(1); +vjs.plugin = function(name, init){ + vjs.Player.prototype[name] = init; +}; diff --git a/extlib/video-js/video.js b/extlib/video-js/video.js new file mode 100644 index 00000000..8c2621d6 --- /dev/null +++ b/extlib/video-js/video.js @@ -0,0 +1,127 @@ +/*! Video.js v4.2.1 Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ (function() {var b=void 0,f=!0,j=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function q(a){return function(){return a}}var t;document.createElement("video");document.createElement("audio");document.createElement("track");function u(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(u.wa[a])return u.wa[a];a=u.v(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new u.w(a,c,d)}var v=u; +window.Qd=window.Rd=u;u.Rb="4.2";u.Bc="https:"==document.location.protocol?"https://":"http://";u.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}},notSupportedMessage:'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'}; +"GENERATED_CDN_VSN"!==u.Rb&&(v.options.flash.swf=u.Bc+"vjs.zencdn.net/"+u.Rb+"/video-js.swf");u.wa={};u.ka=u.CoreObject=m();u.ka.extend=function(a){var c,d;a=a||{};c=a.init||a.i||this.prototype.init||this.prototype.i||m();d=function(){c.apply(this,arguments)};d.prototype=u.k.create(this.prototype);d.prototype.constructor=d;d.extend=u.ka.extend;d.create=u.ka.create;for(var e in a)a.hasOwnProperty(e)&&(d.prototype[e]=a[e]);return d}; +u.ka.create=function(){var a=u.k.create(this.prototype);this.apply(a,arguments);return a};u.d=function(a,c,d){var e=u.getData(a);e.z||(e.z={});e.z[c]||(e.z[c]=[]);d.s||(d.s=u.s++);e.z[c].push(d);e.W||(e.disabled=l,e.W=function(c){if(!e.disabled){c=u.gc(c);var d=e.z[c.type];if(d)for(var d=d.slice(0),k=0,r=d.length;k<r&&!c.lc();k++)d[k].call(a,c)}});1==e.z[c].length&&(document.addEventListener?a.addEventListener(c,e.W,l):document.attachEvent&&a.attachEvent("on"+c,e.W))}; +u.n=function(a,c,d){if(u.kc(a)){var e=u.getData(a);if(e.z)if(c){var g=e.z[c];if(g){if(d){if(d.s)for(e=0;e<g.length;e++)g[e].s===d.s&&g.splice(e--,1)}else e.z[c]=[];u.dc(a,c)}}else for(g in e.z)c=g,e.z[c]=[],u.dc(a,c)}};u.dc=function(a,c){var d=u.getData(a);0===d.z[c].length&&(delete d.z[c],document.removeEventListener?a.removeEventListener(c,d.W,l):document.detachEvent&&a.detachEvent("on"+c,d.W));u.Ab(d.z)&&(delete d.z,delete d.W,delete d.disabled);u.Ab(d)&&u.qc(a)}; +u.gc=function(a){function c(){return f}function d(){return l}if(!a||!a.Bb){var e=a||window.event;a={};for(var g in e)"layerX"!==g&&"layerY"!==g&&(a[g]=e[g]);a.target||(a.target=a.srcElement||document);a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;a.preventDefault=function(){e.preventDefault&&e.preventDefault();a.returnValue=l;a.zb=c};a.zb=d;a.stopPropagation=function(){e.stopPropagation&&e.stopPropagation();a.cancelBubble=f;a.Bb=c};a.Bb=d;a.stopImmediatePropagation=function(){e.stopImmediatePropagation&& +e.stopImmediatePropagation();a.lc=c;a.stopPropagation()};a.lc=d;if(a.clientX!=j){g=document.documentElement;var h=document.body;a.pageX=a.clientX+(g&&g.scrollLeft||h&&h.scrollLeft||0)-(g&&g.clientLeft||h&&h.clientLeft||0);a.pageY=a.clientY+(g&&g.scrollTop||h&&h.scrollTop||0)-(g&&g.clientTop||h&&h.clientTop||0)}a.which=a.charCode||a.keyCode;a.button!=j&&(a.button=a.button&1?0:a.button&4?1:a.button&2?2:0)}return a}; +u.j=function(a,c){var d=u.kc(a)?u.getData(a):{},e=a.parentNode||a.ownerDocument;"string"===typeof c&&(c={type:c,target:a});c=u.gc(c);d.W&&d.W.call(a,c);if(e&&!c.Bb()&&c.bubbles!==l)u.j(e,c);else if(!e&&!c.zb()&&(d=u.getData(c.target),c.target[c.type])){d.disabled=f;if("function"===typeof c.target[c.type])c.target[c.type]();d.disabled=l}return!c.zb()};u.U=function(a,c,d){function e(){u.n(a,c,e);d.apply(this,arguments)}e.s=d.s=d.s||u.s++;u.d(a,c,e)};var w=Object.prototype.hasOwnProperty; +u.e=function(a,c){var d,e;d=document.createElement(a||"div");for(e in c)w.call(c,e)&&(-1!==e.indexOf("aria-")||"role"==e?d.setAttribute(e,c[e]):d[e]=c[e]);return d};u.$=function(a){return a.charAt(0).toUpperCase()+a.slice(1)};u.k={};u.k.create=Object.create||function(a){function c(){}c.prototype=a;return new c};u.k.ta=function(a,c,d){for(var e in a)w.call(a,e)&&c.call(d||this,e,a[e])};u.k.B=function(a,c){if(!c)return a;for(var d in c)w.call(c,d)&&(a[d]=c[d]);return a}; +u.k.fc=function(a,c){var d,e,g;a=u.k.copy(a);for(d in c)w.call(c,d)&&(e=a[d],g=c[d],a[d]=u.k.mc(e)&&u.k.mc(g)?u.k.fc(e,g):c[d]);return a};u.k.copy=function(a){return u.k.B({},a)};u.k.mc=function(a){return!!a&&"object"===typeof a&&"[object Object]"===a.toString()&&a.constructor===Object};u.bind=function(a,c,d){function e(){return c.apply(a,arguments)}c.s||(c.s=u.s++);e.s=d?d+"_"+c.s:c.s;return e};u.qa={};u.s=1;u.expando="vdata"+(new Date).getTime(); +u.getData=function(a){var c=a[u.expando];c||(c=a[u.expando]=u.s++,u.qa[c]={});return u.qa[c]};u.kc=function(a){a=a[u.expando];return!(!a||u.Ab(u.qa[a]))};u.qc=function(a){var c=a[u.expando];if(c){delete u.qa[c];try{delete a[u.expando]}catch(d){a.removeAttribute?a.removeAttribute(u.expando):a[u.expando]=j}}};u.Ab=function(a){for(var c in a)if(a[c]!==j)return l;return f};u.m=function(a,c){-1==(" "+a.className+" ").indexOf(" "+c+" ")&&(a.className=""===a.className?c:a.className+" "+c)}; +u.t=function(a,c){var d,e;if(-1!=a.className.indexOf(c)){d=a.className.split(" ");for(e=d.length-1;0<=e;e--)d[e]===c&&d.splice(e,1);a.className=d.join(" ")}};u.ma=u.e("video");u.G=navigator.userAgent;u.Hc=/iPhone/i.test(u.G);u.Gc=/iPad/i.test(u.G);u.Ic=/iPod/i.test(u.G);u.Fc=u.Hc||u.Gc||u.Ic;var aa=u,x;var y=u.G.match(/OS (\d+)_/i);x=y&&y[1]?y[1]:b;aa.Cd=x;u.Dc=/Android/i.test(u.G);var ba=u,z;var A=u.G.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i),B,C; +A?(B=A[1]&&parseFloat(A[1]),C=A[2]&&parseFloat(A[2]),z=B&&C?parseFloat(A[1]+"."+A[2]):B?B:j):z=j;ba.Cc=z;u.Jc=u.Dc&&/webkit/i.test(u.G)&&2.3>u.Cc;u.Ec=/Firefox/i.test(u.G);u.Dd=/Chrome/i.test(u.G);u.Mc="ontouchstart"in window;u.wb=function(a){var c,d,e,g;c={};if(a&&a.attributes&&0<a.attributes.length){d=a.attributes;for(var h=d.length-1;0<=h;h--){e=d[h].name;g=d[h].value;if("boolean"===typeof a[e]||-1!==",autoplay,controls,loop,muted,default,".indexOf(","+e+","))g=g!==j?f:l;c[e]=g}}return c}; +u.Hd=function(a,c){var d="";document.defaultView&&document.defaultView.getComputedStyle?d=document.defaultView.getComputedStyle(a,"").getPropertyValue(c):a.currentStyle&&(d=a["client"+c.substr(0,1).toUpperCase()+c.substr(1)]+"px");return d};u.yb=function(a,c){c.firstChild?c.insertBefore(a,c.firstChild):c.appendChild(a)};u.Nb={};u.v=function(a){0===a.indexOf("#")&&(a=a.slice(1));return document.getElementById(a)}; +u.Ka=function(a,c){c=c||a;var d=Math.floor(a%60),e=Math.floor(a/60%60),g=Math.floor(a/3600),h=Math.floor(c/60%60),k=Math.floor(c/3600);if(isNaN(a)||Infinity===a)g=e=d="-";g=0<g||0<k?g+":":"";return g+(((g||10<=h)&&10>e?"0"+e:e)+":")+(10>d?"0"+d:d)};u.Pc=function(){document.body.focus();document.onselectstart=q(l)};u.yd=function(){document.onselectstart=q(f)};u.trim=function(a){return(a+"").replace(/^\s+|\s+$/g,"")};u.round=function(a,c){c||(c=0);return Math.round(a*Math.pow(10,c))/Math.pow(10,c)}; +u.sb=function(a,c){return{length:1,start:function(){return a},end:function(){return c}}}; +u.get=function(a,c,d){var e,g;"undefined"===typeof XMLHttpRequest&&(window.XMLHttpRequest=function(){try{return new window.ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new window.ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(c){}try{return new window.ActiveXObject("Msxml2.XMLHTTP")}catch(d){}throw Error("This browser does not support XMLHttpRequest.");});g=new XMLHttpRequest;try{g.open("GET",a)}catch(h){d(h)}e=0===a.indexOf("file:")||0===window.location.href.indexOf("file:")&&-1===a.indexOf("http"); +g.onreadystatechange=function(){4===g.readyState&&(200===g.status||e&&0===g.status?c(g.responseText):d&&d())};try{g.send()}catch(k){d&&d(k)}};u.qd=function(a){try{var c=window.localStorage||l;c&&(c.volume=a)}catch(d){22==d.code||1014==d.code?u.log("LocalStorage Full (VideoJS)",d):18==d.code?u.log("LocalStorage not allowed (VideoJS)",d):u.log("LocalStorage Error (VideoJS)",d)}};u.ic=function(a){a.match(/^https?:\/\//)||(a=u.e("div",{innerHTML:'<a href="'+a+'">x</a>'}).firstChild.href);return a}; +u.log=function(){u.log.history=u.log.history||[];u.log.history.push(arguments);window.console&&window.console.log(Array.prototype.slice.call(arguments))};u.Xc=function(a){var c,d;a.getBoundingClientRect&&a.parentNode&&(c=a.getBoundingClientRect());if(!c)return{left:0,top:0};a=document.documentElement;d=document.body;return{left:c.left+(window.pageXOffset||d.scrollLeft)-(a.clientLeft||d.clientLeft||0),top:c.top+(window.pageYOffset||d.scrollTop)-(a.clientTop||d.clientTop||0)}}; +u.c=u.ka.extend({i:function(a,c,d){this.b=a;this.g=u.k.copy(this.g);c=this.options(c);this.Q=c.id||(c.el&&c.el.id?c.el.id:a.id()+"_component_"+u.s++);this.cd=c.name||j;this.a=c.el||this.e();this.H=[];this.pb={};this.V={};if((a=this.g)&&a.children){var e=this;u.k.ta(a.children,function(a,c){c!==l&&!c.loadEvent&&(e[a]=e.Z(a,c))})}this.M(d)}});t=u.c.prototype; +t.D=function(){this.j("dispose");if(this.H)for(var a=this.H.length-1;0<=a;a--)this.H[a].D&&this.H[a].D();this.V=this.pb=this.H=j;this.n();this.a.parentNode&&this.a.parentNode.removeChild(this.a);u.qc(this.a);this.a=j};t.L=p("b");t.options=function(a){return a===b?this.g:this.g=u.k.fc(this.g,a)};t.e=function(a,c){return u.e(a,c)};t.v=p("a");t.id=p("Q");t.name=p("cd");t.children=p("H"); +t.Z=function(a,c){var d,e;"string"===typeof a?(e=a,c=c||{},d=c.componentClass||u.$(e),c.name=e,d=new window.videojs[d](this.b||this,c)):d=a;this.H.push(d);"function"===typeof d.id&&(this.pb[d.id()]=d);(e=e||d.name&&d.name())&&(this.V[e]=d);"function"===typeof d.el&&d.el()&&(this.ra||this.a).appendChild(d.el());return d}; +t.removeChild=function(a){"string"===typeof a&&(a=this.V[a]);if(a&&this.H){for(var c=l,d=this.H.length-1;0<=d;d--)if(this.H[d]===a){c=f;this.H.splice(d,1);break}c&&(this.pb[a.id]=j,this.V[a.name]=j,(c=a.v())&&c.parentNode===(this.ra||this.a)&&(this.ra||this.a).removeChild(a.v()))}};t.T=q("");t.d=function(a,c){u.d(this.a,a,u.bind(this,c));return this};t.n=function(a,c){u.n(this.a,a,c);return this};t.U=function(a,c){u.U(this.a,a,u.bind(this,c));return this};t.j=function(a,c){u.j(this.a,a,c);return this}; +t.M=function(a){a&&(this.aa?a.call(this):(this.Ra===b&&(this.Ra=[]),this.Ra.push(a)));return this};t.Ta=function(){this.aa=f;var a=this.Ra;if(a&&0<a.length){for(var c=0,d=a.length;c<d;c++)a[c].call(this);this.Ra=[];this.j("ready")}};t.m=function(a){u.m(this.a,a);return this};t.t=function(a){u.t(this.a,a);return this};t.show=function(){this.a.style.display="block";return this};t.C=function(){this.a.style.display="none";return this};function D(a){a.t("vjs-lock-showing")} +t.disable=function(){this.C();this.show=m()};t.width=function(a,c){return E(this,"width",a,c)};t.height=function(a,c){return E(this,"height",a,c)};t.Tc=function(a,c){return this.width(a,f).height(c)};function E(a,c,d,e){if(d!==b)return a.a.style[c]=-1!==(""+d).indexOf("%")||-1!==(""+d).indexOf("px")?d:"auto"===d?"":d+"px",e||a.j("resize"),a;if(!a.a)return 0;d=a.a.style[c];e=d.indexOf("px");return-1!==e?parseInt(d.slice(0,e),10):parseInt(a.a["offset"+u.$(c)],10)} +u.q=u.c.extend({i:function(a,c){u.c.call(this,a,c);var d=l;this.d("touchstart",function(a){a.preventDefault();d=f});this.d("touchmove",function(){d=l});var e=this;this.d("touchend",function(a){d&&e.p(a);a.preventDefault()});this.d("click",this.p);this.d("focus",this.Na);this.d("blur",this.Ma)}});t=u.q.prototype; +t.e=function(a,c){c=u.k.B({className:this.T(),innerHTML:'<div class="vjs-control-content"><span class="vjs-control-text">'+(this.pa||"Need Text")+"</span></div>",nd:"button","aria-live":"polite",tabIndex:0},c);return u.c.prototype.e.call(this,a,c)};t.T=function(){return"vjs-control "+u.c.prototype.T.call(this)};t.p=m();t.Na=function(){u.d(document,"keyup",u.bind(this,this.ba))};t.ba=function(a){if(32==a.which||13==a.which)a.preventDefault(),this.p()}; +t.Ma=function(){u.n(document,"keyup",u.bind(this,this.ba))};u.O=u.c.extend({i:function(a,c){u.c.call(this,a,c);this.Oc=this.V[this.g.barName];this.handle=this.V[this.g.handleName];a.d(this.oc,u.bind(this,this.update));this.d("mousedown",this.Oa);this.d("touchstart",this.Oa);this.d("focus",this.Na);this.d("blur",this.Ma);this.d("click",this.p);this.b.d("controlsvisible",u.bind(this,this.update));a.M(u.bind(this,this.update));this.P={}}});t=u.O.prototype; +t.e=function(a,c){c=c||{};c.className+=" vjs-slider";c=u.k.B({nd:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},c);return u.c.prototype.e.call(this,a,c)};t.Oa=function(a){a.preventDefault();u.Pc();this.P.move=u.bind(this,this.Gb);this.P.end=u.bind(this,this.Hb);u.d(document,"mousemove",this.P.move);u.d(document,"mouseup",this.P.end);u.d(document,"touchmove",this.P.move);u.d(document,"touchend",this.P.end);this.Gb(a)}; +t.Hb=function(){u.yd();u.n(document,"mousemove",this.P.move,l);u.n(document,"mouseup",this.P.end,l);u.n(document,"touchmove",this.P.move,l);u.n(document,"touchend",this.P.end,l);this.update()};t.update=function(){if(this.a){var a,c=this.xb(),d=this.handle,e=this.Oc;isNaN(c)&&(c=0);a=c;if(d){a=this.a.offsetWidth;var g=d.v().offsetWidth;a=g?g/a:0;c*=1-a;a=c+a/2;d.v().style.left=u.round(100*c,2)+"%"}e.v().style.width=u.round(100*a,2)+"%"}}; +function F(a,c){var d,e,g,h;d=a.a;e=u.Xc(d);h=g=d.offsetWidth;d=a.handle;if(a.g.zd)return h=e.top,e=c.changedTouches?c.changedTouches[0].pageY:c.pageY,d&&(d=d.v().offsetHeight,h+=d/2,g-=d),Math.max(0,Math.min(1,(h-e+g)/g));g=e.left;e=c.changedTouches?c.changedTouches[0].pageX:c.pageX;d&&(d=d.v().offsetWidth,g+=d/2,h-=d);return Math.max(0,Math.min(1,(e-g)/h))}t.Na=function(){u.d(document,"keyup",u.bind(this,this.ba))}; +t.ba=function(a){37==a.which?(a.preventDefault(),this.uc()):39==a.which&&(a.preventDefault(),this.vc())};t.Ma=function(){u.n(document,"keyup",u.bind(this,this.ba))};t.p=function(a){a.stopImmediatePropagation();a.preventDefault()};u.ea=u.c.extend();u.ea.prototype.defaultValue=0;u.ea.prototype.e=function(a,c){c=c||{};c.className+=" vjs-slider-handle";c=u.k.B({innerHTML:'<span class="vjs-control-text">'+this.defaultValue+"</span>"},c);return u.c.prototype.e.call(this,"div",c)};u.la=u.c.extend(); +function ca(a,c){a.Z(c);c.d("click",u.bind(a,function(){D(this)}))}u.la.prototype.e=function(){var a=this.options().Rc||"ul";this.ra=u.e(a,{className:"vjs-menu-content"});a=u.c.prototype.e.call(this,"div",{append:this.ra,className:"vjs-menu"});a.appendChild(this.ra);u.d(a,"click",function(a){a.preventDefault();a.stopImmediatePropagation()});return a};u.N=u.q.extend({i:function(a,c){u.q.call(this,a,c);this.selected(c.selected)}}); +u.N.prototype.e=function(a,c){return u.q.prototype.e.call(this,"li",u.k.B({className:"vjs-menu-item",innerHTML:this.g.label},c))};u.N.prototype.p=function(){this.selected(f)};u.N.prototype.selected=function(a){a?(this.m("vjs-selected"),this.a.setAttribute("aria-selected",f)):(this.t("vjs-selected"),this.a.setAttribute("aria-selected",l))}; +u.R=u.q.extend({i:function(a,c){u.q.call(this,a,c);this.va=this.Ja();this.Z(this.va);this.J&&0===this.J.length&&this.C();this.d("keyup",this.ba);this.a.setAttribute("aria-haspopup",f);this.a.setAttribute("role","button")}});t=u.R.prototype;t.oa=l;t.Ja=function(){var a=new u.la(this.b);this.options().title&&a.v().appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.$(this.A),wd:-1}));if(this.J=this.createItems())for(var c=0;c<this.J.length;c++)ca(a,this.J[c]);return a};t.sa=m(); +t.T=function(){return this.className+" vjs-menu-button "+u.q.prototype.T.call(this)};t.Na=m();t.Ma=m();t.p=function(){this.U("mouseout",u.bind(this,function(){D(this.va);this.a.blur()}));this.oa?G(this):H(this)};t.ba=function(a){a.preventDefault();32==a.which||13==a.which?this.oa?G(this):H(this):27==a.which&&this.oa&&G(this)};function H(a){a.oa=f;a.va.m("vjs-lock-showing");a.a.setAttribute("aria-pressed",f);a.J&&0<a.J.length&&a.J[0].v().focus()} +function G(a){a.oa=l;D(a.va);a.a.setAttribute("aria-pressed",l)} +u.w=u.c.extend({i:function(a,c,d){this.F=a;c=u.k.B(da(a),c);this.u={};this.pc=c.poster;this.rb=c.controls;a.controls=l;u.c.call(this,this,c,d);this.controls()?this.m("vjs-controls-enabled"):this.m("vjs-controls-disabled");this.U("play",function(a){u.j(this.a,{type:"firstplay",target:this.a})||(a.preventDefault(),a.stopPropagation(),a.stopImmediatePropagation())});this.d("ended",this.ed);this.d("play",this.Jb);this.d("firstplay",this.fd);this.d("pause",this.Ib);this.d("progress",this.hd);this.d("durationchange", +this.dd);this.d("error",this.Fb);this.d("fullscreenchange",this.gd);u.wa[this.Q]=this;c.plugins&&u.k.ta(c.plugins,function(a,c){this[a](c)},this);var e,g,h,k;e=this.rc;a=function(){e();clearInterval(g);g=setInterval(u.bind(this,e),250)};c=function(){e();clearInterval(g)};this.d("mousedown",a);this.d("mousemove",e);this.d("mouseup",c);this.d("keydown",e);this.d("keyup",e);this.d("touchstart",a);this.d("touchmove",e);this.d("touchend",c);this.d("touchcancel",c);h=setInterval(u.bind(this,function(){this.ja&& +(this.ja=l,I(this,f),clearTimeout(k),k=setTimeout(u.bind(this,function(){this.ja||I(this,l)}),2E3))}),250);this.d("dispose",function(){clearInterval(h);clearTimeout(k)})}});t=u.w.prototype;t.g=u.options;t.D=function(){this.j("dispose");this.n("dispose");u.wa[this.Q]=j;this.F&&this.F.player&&(this.F.player=j);this.a&&this.a.player&&(this.a.player=j);clearInterval(this.Qa);this.ya();this.h&&this.h.D();u.c.prototype.D.call(this)}; +function da(a){var c={sources:[],tracks:[]};u.k.B(c,u.wb(a));if(a.hasChildNodes()){var d,e,g,h;a=a.childNodes;g=0;for(h=a.length;g<h;g++)d=a[g],e=d.nodeName.toLowerCase(),"source"===e?c.sources.push(u.wb(d)):"track"===e&&c.tracks.push(u.wb(d))}return c} +t.e=function(){var a=this.a=u.c.prototype.e.call(this,"div"),c=this.F;c.removeAttribute("width");c.removeAttribute("height");if(c.hasChildNodes()){var d,e,g,h,k;d=c.childNodes;e=d.length;for(k=[];e--;)g=d[e],h=g.nodeName.toLowerCase(),("source"===h||"track"===h)&&k.push(g);for(d=0;d<k.length;d++)c.removeChild(k[d])}c.id=c.id||"vjs_video_"+u.s++;a.id=c.id;a.className=c.className;c.id+="_html5_api";c.className="vjs-tech";c.player=a.player=this;this.m("vjs-paused");this.width(this.g.width,f);this.height(this.g.height, +f);c.parentNode&&c.parentNode.insertBefore(a,c);u.yb(c,a);return a}; +function J(a,c,d){a.h?(a.aa=l,a.h.D(),a.Db&&(a.Db=l,clearInterval(a.Qa)),a.Eb&&K(a),a.h=l):"Html5"!==c&&a.F&&(a.a.removeChild(a.F),a.F.player=j,a.F=j);a.ia=c;a.aa=l;var e=u.k.B({source:d,parentEl:a.a},a.g[c.toLowerCase()]);d&&(d.src==a.u.src&&0<a.u.currentTime&&(e.startTime=a.u.currentTime),a.u.src=d.src);a.h=new window.videojs[c](a,e);a.h.M(function(){this.b.Ta();if(!this.l.progressEvents){var a=this.b;a.Db=f;a.Qa=setInterval(u.bind(a,function(){this.u.kb<this.buffered().end(0)?this.j("progress"): +1==this.Ia()&&(clearInterval(this.Qa),this.j("progress"))}),500);a.h.U("progress",function(){this.l.progressEvents=f;var a=this.b;a.Db=l;clearInterval(a.Qa)})}this.l.timeupdateEvents||(a=this.b,a.Eb=f,a.d("play",a.yc),a.d("pause",a.ya),a.h.U("timeupdate",function(){this.l.timeupdateEvents=f;K(this.b)}))})}function K(a){a.Eb=l;a.ya();a.n("play",a.yc);a.n("pause",a.ya)}t.yc=function(){this.ec&&this.ya();this.ec=setInterval(u.bind(this,function(){this.j("timeupdate")}),250)};t.ya=function(){clearInterval(this.ec)}; +t.ed=function(){this.g.loop&&(this.currentTime(0),this.play())};t.Jb=function(){u.t(this.a,"vjs-paused");u.m(this.a,"vjs-playing")};t.fd=function(){this.g.starttime&&this.currentTime(this.g.starttime);this.m("vjs-has-started")};t.Ib=function(){u.t(this.a,"vjs-playing");u.m(this.a,"vjs-paused")};t.hd=function(){1==this.Ia()&&this.j("loadedalldata")};t.dd=function(){this.duration(L(this,"duration"))};t.Fb=function(a){u.log("Video Error",a)};t.gd=function(){this.I?this.m("vjs-fullscreen"):this.t("vjs-fullscreen")}; +function M(a,c,d){if(a.h&&!a.h.aa)a.h.M(function(){this[c](d)});else try{a.h[c](d)}catch(e){throw u.log(e),e;}}function L(a,c){if(a.h&&a.h.aa)try{return a.h[c]()}catch(d){throw a.h[c]===b?u.log("Video.js: "+c+" method not defined for "+a.ia+" playback technology.",d):"TypeError"==d.name?(u.log("Video.js: "+c+" unavailable on "+a.ia+" playback technology element.",d),a.h.aa=l):u.log(d),d;}}t.play=function(){M(this,"play");return this};t.pause=function(){M(this,"pause");return this}; +t.paused=function(){return L(this,"paused")===l?l:f};t.currentTime=function(a){return a!==b?(this.u.nc=a,M(this,"setCurrentTime",a),this.Eb&&this.j("timeupdate"),this):this.u.currentTime=L(this,"currentTime")||0};t.duration=function(a){return a!==b?(this.u.duration=parseFloat(a),this):this.u.duration};t.buffered=function(){var a=L(this,"buffered"),c=a.length-1,d=this.u.kb=this.u.kb||0;a&&(0<=c&&a.end(c)!==d)&&(d=a.end(c),this.u.kb=d);return u.sb(0,d)}; +t.Ia=function(){return this.duration()?this.buffered().end(0)/this.duration():0};t.volume=function(a){if(a!==b)return a=Math.max(0,Math.min(1,parseFloat(a))),this.u.volume=a,M(this,"setVolume",a),u.qd(a),this;a=parseFloat(L(this,"volume"));return isNaN(a)?1:a};t.muted=function(a){return a!==b?(M(this,"setMuted",a),this):L(this,"muted")||l};t.Sa=function(){return L(this,"supportsFullScreen")||l}; +t.xa=function(){var a=u.Nb.xa;this.I=f;a?(u.d(document,a.ub,u.bind(this,function(c){this.I=document[a.I];this.I===l&&u.n(document,a.ub,arguments.callee);this.j("fullscreenchange")})),this.a[a.sc]()):this.h.Sa()?M(this,"enterFullScreen"):(this.Zc=f,this.Uc=document.documentElement.style.overflow,u.d(document,"keydown",u.bind(this,this.hc)),document.documentElement.style.overflow="hidden",u.m(document.body,"vjs-full-window"),this.j("enterFullWindow"),this.j("fullscreenchange"));return this}; +t.nb=function(){var a=u.Nb.xa;this.I=l;if(a)document[a.mb]();else this.h.Sa()?M(this,"exitFullScreen"):(N(this),this.j("fullscreenchange"));return this};t.hc=function(a){27===a.keyCode&&(this.I===f?this.nb():N(this))};function N(a){a.Zc=l;u.n(document,"keydown",a.hc);document.documentElement.style.overflow=a.Uc;u.t(document.body,"vjs-full-window");a.j("exitFullWindow")} +t.src=function(a){if(a instanceof Array){var c;a:{c=a;for(var d=0,e=this.g.techOrder;d<e.length;d++){var g=u.$(e[d]),h=window.videojs[g];if(h.isSupported())for(var k=0,r=c;k<r.length;k++){var n=r[k];if(h.canPlaySource(n)){c={source:n,h:g};break a}}}c=l}c?(a=c.source,c=c.h,c==this.ia?this.src(a):J(this,c,a)):this.a.appendChild(u.e("p",{innerHTML:this.options().notSupportedMessage}))}else a instanceof Object?window.videojs[this.ia].canPlaySource(a)?this.src(a.src):this.src([a]):(this.u.src=a,this.aa? +(M(this,"src",a),"auto"==this.g.preload&&this.load(),this.g.autoplay&&this.play()):this.M(function(){this.src(a)}));return this};t.load=function(){M(this,"load");return this};t.currentSrc=function(){return L(this,"currentSrc")||this.u.src||""};t.Pa=function(a){return a!==b?(M(this,"setPreload",a),this.g.preload=a,this):L(this,"preload")};t.autoplay=function(a){return a!==b?(M(this,"setAutoplay",a),this.g.autoplay=a,this):L(this,"autoplay")}; +t.loop=function(a){return a!==b?(M(this,"setLoop",a),this.g.loop=a,this):L(this,"loop")};t.poster=function(a){a!==b&&(this.pc=a);return this.pc};t.controls=function(a){return a!==b?(a=!!a,this.rb!==a&&((this.rb=a)?(this.t("vjs-controls-disabled"),this.m("vjs-controls-enabled"),this.j("controlsenabled")):(this.t("vjs-controls-enabled"),this.m("vjs-controls-disabled"),this.j("controlsdisabled"))),this):this.rb};u.w.prototype.Qb;t=u.w.prototype; +t.Pb=function(a){return a!==b?(a=!!a,this.Qb!==a&&((this.Qb=a)?(this.m("vjs-using-native-controls"),this.j("usingnativecontrols")):(this.t("vjs-using-native-controls"),this.j("usingcustomcontrols"))),this):this.Qb};t.error=function(){return L(this,"error")};t.seeking=function(){return L(this,"seeking")};t.ja=f;t.rc=function(){this.ja=f};t.Ob=f; +function I(a,c){return c!==b?(c=!!c,c!==a.Ob&&((a.Ob=c)?(a.ja=f,a.t("vjs-user-inactive"),a.m("vjs-user-active"),a.j("useractive")):(a.ja=l,a.h.U("mousemove",function(a){a.stopPropagation();a.preventDefault()}),a.t("vjs-user-active"),a.m("vjs-user-inactive"),a.j("userinactive"))),a):a.Ob}var O,P,Q;Q=document.createElement("div");P={}; +Q.Ed!==b?(P.sc="requestFullscreen",P.mb="exitFullscreen",P.ub="fullscreenchange",P.I="fullScreen"):(document.mozCancelFullScreen?(O="moz",P.I=O+"FullScreen"):(O="webkit",P.I=O+"IsFullScreen"),Q[O+"RequestFullScreen"]&&(P.sc=O+"RequestFullScreen",P.mb=O+"CancelFullScreen"),P.ub=O+"fullscreenchange");document[P.mb]&&(u.Nb.xa=P);u.Ea=u.c.extend(); +u.Ea.prototype.g={Jd:"play",children:{playToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},fullscreenToggle:{},volumeControl:{},muteToggle:{}}};u.Ea.prototype.e=function(){return u.e("div",{className:"vjs-control-bar"})};u.Wb=u.q.extend({i:function(a,c){u.q.call(this,a,c);a.d("play",u.bind(this,this.Jb));a.d("pause",u.bind(this,this.Ib))}});t=u.Wb.prototype;t.pa="Play";t.T=function(){return"vjs-play-control "+u.q.prototype.T.call(this)}; +t.p=function(){this.b.paused()?this.b.play():this.b.pause()};t.Jb=function(){u.t(this.a,"vjs-paused");u.m(this.a,"vjs-playing");this.a.children[0].children[0].innerHTML="Pause"};t.Ib=function(){u.t(this.a,"vjs-playing");u.m(this.a,"vjs-paused");this.a.children[0].children[0].innerHTML="Play"};u.Xa=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.Ba))}}); +u.Xa.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-current-time-display",innerHTML:'<span class="vjs-control-text">Current Time </span>0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a}; +u.Xa.prototype.Ba=function(){var a=this.b.Lb?this.b.u.currentTime:this.b.currentTime();this.content.innerHTML='<span class="vjs-control-text">Current Time </span>'+u.Ka(a,this.b.duration())};u.Ya=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.Ba))}}); +u.Ya.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-duration vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-duration-display",innerHTML:'<span class="vjs-control-text">Duration Time </span>0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};u.Ya.prototype.Ba=function(){var a=this.b.duration();a&&(this.content.innerHTML='<span class="vjs-control-text">Duration Time </span>'+u.Ka(a))}; +u.$b=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.$b.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})};u.eb=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.Ba))}}); +u.eb.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-remaining-time-display",innerHTML:'<span class="vjs-control-text">Remaining Time </span>-0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};u.eb.prototype.Ba=function(){this.b.duration()&&(this.content.innerHTML='<span class="vjs-control-text">Remaining Time </span>-'+u.Ka(this.b.duration()-this.b.currentTime()))}; +u.Fa=u.q.extend({i:function(a,c){u.q.call(this,a,c)}});u.Fa.prototype.pa="Fullscreen";u.Fa.prototype.T=function(){return"vjs-fullscreen-control "+u.q.prototype.T.call(this)};u.Fa.prototype.p=function(){this.b.I?(this.b.nb(),this.a.children[0].children[0].innerHTML="Fullscreen"):(this.b.xa(),this.a.children[0].children[0].innerHTML="Non-Fullscreen")};u.cb=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.cb.prototype.g={children:{seekBar:{}}}; +u.cb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-progress-control vjs-control"})};u.Xb=u.O.extend({i:function(a,c){u.O.call(this,a,c);a.d("timeupdate",u.bind(this,this.Aa));a.M(u.bind(this,this.Aa))}});t=u.Xb.prototype;t.g={children:{loadProgressBar:{},playProgressBar:{},seekHandle:{}},barName:"playProgressBar",handleName:"seekHandle"};t.oc="timeupdate";t.e=function(){return u.O.prototype.e.call(this,"div",{className:"vjs-progress-holder","aria-label":"video progress bar"})}; +t.Aa=function(){var a=this.b.Lb?this.b.u.currentTime:this.b.currentTime();this.a.setAttribute("aria-valuenow",u.round(100*this.xb(),2));this.a.setAttribute("aria-valuetext",u.Ka(a,this.b.duration()))};t.xb=function(){var a;"Flash"===this.b.ia&&this.b.seeking()?(a=this.b.u,a=a.nc?a.nc:this.b.currentTime()):a=this.b.currentTime();return a/this.b.duration()};t.Oa=function(a){u.O.prototype.Oa.call(this,a);this.b.Lb=f;this.Ad=!this.b.paused();this.b.pause()}; +t.Gb=function(a){a=F(this,a)*this.b.duration();a==this.b.duration()&&(a-=0.1);this.b.currentTime(a)};t.Hb=function(a){u.O.prototype.Hb.call(this,a);this.b.Lb=l;this.Ad&&this.b.play()};t.vc=function(){this.b.currentTime(this.b.currentTime()+5)};t.uc=function(){this.b.currentTime(this.b.currentTime()-5)};u.$a=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("progress",u.bind(this,this.update))}});u.$a.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})}; +u.$a.prototype.update=function(){this.a.style&&(this.a.style.width=u.round(100*this.b.Ia(),2)+"%")};u.Vb=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.Vb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})};u.fb=u.ea.extend();u.fb.prototype.defaultValue="00:00";u.fb.prototype.e=function(){return u.ea.prototype.e.call(this,"div",{className:"vjs-seek-handle"})}; +u.hb=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.h&&(a.h.l&&a.h.l.volumeControl===l)&&this.m("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.l&&a.h.l.volumeControl===l?this.m("vjs-hidden"):this.t("vjs-hidden")}))}});u.hb.prototype.g={children:{volumeBar:{}}};u.hb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-volume-control vjs-control"})}; +u.gb=u.O.extend({i:function(a,c){u.O.call(this,a,c);a.d("volumechange",u.bind(this,this.Aa));a.M(u.bind(this,this.Aa));setTimeout(u.bind(this,this.update),0)}});t=u.gb.prototype;t.Aa=function(){this.a.setAttribute("aria-valuenow",u.round(100*this.b.volume(),2));this.a.setAttribute("aria-valuetext",u.round(100*this.b.volume(),2)+"%")};t.g={children:{volumeLevel:{},volumeHandle:{}},barName:"volumeLevel",handleName:"volumeHandle"};t.oc="volumechange"; +t.e=function(){return u.O.prototype.e.call(this,"div",{className:"vjs-volume-bar","aria-label":"volume level"})};t.Gb=function(a){this.b.volume(F(this,a))};t.xb=function(){return this.b.muted()?0:this.b.volume()};t.vc=function(){this.b.volume(this.b.volume()+0.1)};t.uc=function(){this.b.volume(this.b.volume()-0.1)};u.ac=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.ac.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})}; +u.ib=u.ea.extend();u.ib.prototype.defaultValue="00:00";u.ib.prototype.e=function(){return u.ea.prototype.e.call(this,"div",{className:"vjs-volume-handle"})};u.da=u.q.extend({i:function(a,c){u.q.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.h&&(a.h.l&&a.h.l.volumeControl===l)&&this.m("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.l&&a.h.l.volumeControl===l?this.m("vjs-hidden"):this.t("vjs-hidden")}))}}); +u.da.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.da.prototype.p=function(){this.b.muted(this.b.muted()?l:f)}; +u.da.prototype.update=function(){var a=this.b.volume(),c=3;0===a||this.b.muted()?c=0:0.33>a?c=1:0.67>a&&(c=2);this.b.muted()?"Unmute"!=this.a.children[0].children[0].innerHTML&&(this.a.children[0].children[0].innerHTML="Unmute"):"Mute"!=this.a.children[0].children[0].innerHTML&&(this.a.children[0].children[0].innerHTML="Mute");for(a=0;4>a;a++)u.t(this.a,"vjs-vol-"+a);u.m(this.a,"vjs-vol-"+c)}; +u.na=u.R.extend({i:function(a,c){u.R.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.h&&(a.h.l&&a.h.l.zc===l)&&this.m("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.l&&a.h.l.zc===l?this.m("vjs-hidden"):this.t("vjs-hidden")}));this.m("vjs-menu-button")}});u.na.prototype.Ja=function(){var a=new u.la(this.b,{Rc:"div"}),c=new u.gb(this.b,u.k.B({zd:f},this.g.Sd));a.Z(c);return a};u.na.prototype.p=function(){u.da.prototype.p.call(this);u.R.prototype.p.call(this)}; +u.na.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-volume-menu-button vjs-menu-button vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.na.prototype.update=u.da.prototype.update;u.bb=u.q.extend({i:function(a,c){u.q.call(this,a,c);(!a.poster()||!a.controls())&&this.C();a.d("play",u.bind(this,this.C))}}); +u.bb.prototype.e=function(){var a=u.e("div",{className:"vjs-poster",tabIndex:-1}),c=this.b.poster();c&&("backgroundSize"in a.style?a.style.backgroundImage='url("'+c+'")':a.appendChild(u.e("img",{src:c})));return a};u.bb.prototype.p=function(){this.L().controls()&&this.b.play()}; +u.Ub=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("canplay",u.bind(this,this.C));a.d("canplaythrough",u.bind(this,this.C));a.d("playing",u.bind(this,this.C));a.d("seeked",u.bind(this,this.C));a.d("seeking",u.bind(this,this.show));a.d("seeked",u.bind(this,this.C));a.d("error",u.bind(this,this.show));a.d("waiting",u.bind(this,this.show))}});u.Ub.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-loading-spinner"})};u.Va=u.q.extend(); +u.Va.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-big-play-button",innerHTML:"<span></span>","aria-label":"play video"})};u.Va.prototype.p=function(){this.b.play()}; +u.r=u.c.extend({i:function(a,c,d){u.c.call(this,a,c,d);var e,g;g=this;e=this.L();a=function(){if(e.controls()&&!e.Pb()){var a,c;g.d("mousedown",g.p);g.d("touchstart",function(a){a.preventDefault();a.stopPropagation();c=I(this.b)});a=function(a){a.stopPropagation();c&&this.b.rc()};g.d("touchmove",a);g.d("touchleave",a);g.d("touchcancel",a);g.d("touchend",a);var d,n,s;d=0;g.d("touchstart",function(){d=(new Date).getTime();s=f});a=function(){s=l};g.d("touchmove",a);g.d("touchleave",a);g.d("touchcancel", +a);g.d("touchend",function(){s===f&&(n=(new Date).getTime()-d,250>n&&this.j("tap"))});g.d("tap",g.jd)}};c=u.bind(g,g.md);this.M(a);e.d("controlsenabled",a);e.d("controlsdisabled",c)}});u.r.prototype.md=function(){this.n("tap");this.n("touchstart");this.n("touchmove");this.n("touchleave");this.n("touchcancel");this.n("touchend");this.n("click");this.n("mousedown")};u.r.prototype.p=function(a){0===a.button&&this.L().controls()&&(this.L().paused()?this.L().play():this.L().pause())}; +u.r.prototype.jd=function(){I(this.L(),!I(this.L()))};u.r.prototype.l={volumeControl:f,fullscreenResize:l,progressEvents:l,timeupdateEvents:l};u.media={};u.media.Ua="play pause paused currentTime setCurrentTime duration buffered volume setVolume muted setMuted width height supportsFullScreen enterFullScreen src load currentSrc preload setPreload autoplay setAutoplay loop setLoop error networkState readyState seeking initialTime startOffsetTime played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks defaultPlaybackRate playbackRate mediaGroup controller controls defaultMuted".split(" "); +function ea(){var a=u.media.Ua[i];return function(){throw Error('The "'+a+"\" method is not available on the playback technology's API");}}for(var i=u.media.Ua.length-1;0<=i;i--)u.r.prototype[u.media.Ua[i]]=ea(); +u.o=u.r.extend({i:function(a,c,d){this.l.volumeControl=u.o.Qc();this.l.movingMediaElementInDOM=!u.Fc;this.l.fullscreenResize=f;u.r.call(this,a,c,d);(c=c.source)&&this.a.currentSrc==c.src?a.j("loadstart"):c&&(this.a.src=c.src);if(u.Mc&&a.options().nativeControlsForTouch!==l){var e,g,h,k;e=this;g=this.L();c=g.controls();e.a.controls=!!c;h=function(){e.a.controls=f};k=function(){e.a.controls=l};g.d("controlsenabled",h);g.d("controlsdisabled",k);c=function(){g.n("controlsenabled",h);g.n("controlsdisabled", +k)};e.d("dispose",c);g.d("usingcustomcontrols",c);g.Pb(f)}a.M(function(){this.F&&(this.g.autoplay&&this.paused())&&(delete this.F.poster,this.play())});for(a=u.o.Za.length-1;0<=a;a--)u.d(this.a,u.o.Za[a],u.bind(this.b,this.Wc));this.Ta()}});t=u.o.prototype;t.D=function(){u.r.prototype.D.call(this)}; +t.e=function(){var a=this.b,c=a.F;if(!c||this.l.movingMediaElementInDOM===l)c?(c.player=j,a.F=j,a.v().removeChild(c),c=c.cloneNode(l)):c=u.e("video",{id:a.id()+"_html5_api",className:"vjs-tech"}),c.player=a,u.yb(c,a.v());for(var d=["autoplay","preload","loop","muted"],e=d.length-1;0<=e;e--){var g=d[e];a.g[g]!==j&&(c[g]=a.g[g])}return c};t.Wc=function(a){this.j(a);a.stopPropagation()};t.play=function(){this.a.play()};t.pause=function(){this.a.pause()};t.paused=function(){return this.a.paused}; +t.currentTime=function(){return this.a.currentTime};t.pd=function(a){try{this.a.currentTime=a}catch(c){u.log(c,"Video is not ready. (Video.js)")}};t.duration=function(){return this.a.duration||0};t.buffered=function(){return this.a.buffered};t.volume=function(){return this.a.volume};t.ud=function(a){this.a.volume=a};t.muted=function(){return this.a.muted};t.sd=function(a){this.a.muted=a};t.width=function(){return this.a.offsetWidth};t.height=function(){return this.a.offsetHeight}; +t.Sa=function(){return"function"==typeof this.a.webkitEnterFullScreen&&(/Android/.test(u.G)||!/Chrome|Mac OS X 10.5/.test(u.G))?f:l};t.src=function(a){this.a.src=a};t.load=function(){this.a.load()};t.currentSrc=function(){return this.a.currentSrc};t.Pa=function(){return this.a.Pa};t.td=function(a){this.a.Pa=a};t.autoplay=function(){return this.a.autoplay};t.od=function(a){this.a.autoplay=a};t.controls=function(){return this.a.controls};t.loop=function(){return this.a.loop}; +t.rd=function(a){this.a.loop=a};t.error=function(){return this.a.error};t.seeking=function(){return this.a.seeking};u.o.isSupported=function(){return!!u.ma.canPlayType};u.o.lb=function(a){try{return!!u.ma.canPlayType(a.type)}catch(c){return""}};u.o.Qc=function(){var a=u.ma.volume;u.ma.volume=a/2+0.1;return a!==u.ma.volume};u.o.Za="loadstart suspend abort error emptied stalled loadedmetadata loadeddata canplay canplaythrough playing waiting seeking seeked ended durationchange timeupdate progress play pause ratechange volumechange".split(" "); +u.Jc&&(document.createElement("video").constructor.prototype.canPlayType=function(a){return a&&-1!=a.toLowerCase().indexOf("video/mp4")?"maybe":""}); +u.f=u.r.extend({i:function(a,c,d){u.r.call(this,a,c,d);var e=c.source;d=c.parentEl;var g=this.a=u.e("div",{id:a.id()+"_temp_flash"}),h=a.id()+"_flash_api";a=a.g;var k=u.k.B({readyFunction:"videojs.Flash.onReady",eventProxyFunction:"videojs.Flash.onEvent",errorEventProxyFunction:"videojs.Flash.onError",autoplay:a.autoplay,preload:a.Pa,loop:a.loop,muted:a.muted},c.flashVars),r=u.k.B({wmode:"opaque",bgcolor:"#000000"},c.params),n=u.k.B({id:h,name:h,"class":"vjs-tech"},c.attributes);e&&(e.type&&u.f.ad(e.type)? +(a=u.f.wc(e.src),k.rtmpConnection=encodeURIComponent(a.qb),k.rtmpStream=encodeURIComponent(a.Mb)):k.src=encodeURIComponent(u.ic(e.src)));u.yb(g,d);c.startTime&&this.M(function(){this.load();this.play();this.currentTime(c.startTime)});if(c.iFrameMode===f&&!u.Ec){var s=u.e("iframe",{id:h+"_iframe",name:h+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});k.readyFunction="ready";k.eventProxyFunction="events";k.errorEventProxyFunction="errors";u.d(s,"load",u.bind(this, +function(){var a,d=s.contentWindow;a=s.contentDocument?s.contentDocument:s.contentWindow.document;a.write(u.f.jc(c.swf,k,r,n));d.player=this.b;d.ready=u.bind(this.b,function(c){var d=this.h;d.a=a.getElementById(c);u.f.ob(d)});d.events=u.bind(this.b,function(a,c){this&&"flash"===this.ia&&this.j(c)});d.errors=u.bind(this.b,function(a,c){u.log("Flash Error",c)})}));g.parentNode.replaceChild(s,g)}else u.f.Vc(c.swf,g,k,r,n)}});t=u.f.prototype;t.D=function(){u.r.prototype.D.call(this)};t.play=function(){this.a.vjs_play()}; +t.pause=function(){this.a.vjs_pause()};t.src=function(a){u.f.$c(a)?(a=u.f.wc(a),this.Nd(a.qb),this.Od(a.Mb)):(a=u.ic(a),this.a.vjs_src(a));if(this.b.autoplay()){var c=this;setTimeout(function(){c.play()},0)}};t.currentSrc=function(){var a=this.a.vjs_getProperty("currentSrc");if(a==j){var c=this.Ld(),d=this.Md();c&&d&&(a=u.f.vd(c,d))}return a};t.load=function(){this.a.vjs_load()};t.poster=function(){this.a.vjs_getProperty("poster")};t.buffered=function(){return u.sb(0,this.a.vjs_getProperty("buffered"))}; +t.Sa=q(l);var R=u.f.prototype,S="rtmpConnection rtmpStream preload currentTime defaultPlaybackRate playbackRate autoplay loop mediaGroup controller controls volume muted defaultMuted".split(" "),T="error currentSrc networkState readyState seeking initialTime duration startOffsetTime paused played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks".split(" "); +function fa(){var a=S[U],c=a.charAt(0).toUpperCase()+a.slice(1);R["set"+c]=function(c){return this.a.vjs_setProperty(a,c)}}function V(a){R[a]=function(){return this.a.vjs_getProperty(a)}}var U;for(U=0;U<S.length;U++)V(S[U]),fa();for(U=0;U<T.length;U++)V(T[U]);u.f.isSupported=function(){return 10<=u.f.version()[0]};u.f.lb=function(a){if(a.type in u.f.Yc||a.type in u.f.xc)return"maybe"};u.f.Yc={"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"};u.f.xc={"rtmp/mp4":"MP4","rtmp/flv":"FLV"}; +u.f.onReady=function(a){a=u.v(a);var c=a.player||a.parentNode.player,d=c.h;a.player=c;d.a=a;u.f.ob(d)};u.f.ob=function(a){a.v().vjs_getProperty?a.Ta():setTimeout(function(){u.f.ob(a)},50)};u.f.onEvent=function(a,c){u.v(a).player.j(c)};u.f.onError=function(a,c){u.v(a).player.j("error");u.log("Flash Error",c,a)}; +u.f.version=function(){var a="0,0,0";try{a=(new window.ActiveXObject("ShockwaveFlash.ShockwaveFlash")).GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(c){try{navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin&&(a=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1])}catch(d){}}return a.split(",")}; +u.f.Vc=function(a,c,d,e,g){a=u.f.jc(a,d,e,g);a=u.e("div",{innerHTML:a}).childNodes[0];d=c.parentNode;c.parentNode.replaceChild(a,c);var h=d.childNodes[0];setTimeout(function(){h.style.display="block"},1E3)}; +u.f.jc=function(a,c,d,e){var g="",h="",k="";c&&u.k.ta(c,function(a,c){g+=a+"="+c+"&"});d=u.k.B({movie:a,flashvars:g,allowScriptAccess:"always",allowNetworking:"all"},d);u.k.ta(d,function(a,c){h+='<param name="'+a+'" value="'+c+'" />'});e=u.k.B({data:a,width:"100%",height:"100%"},e);u.k.ta(e,function(a,c){k+=a+'="'+c+'" '});return'<object type="application/x-shockwave-flash"'+k+">"+h+"</object>"};u.f.vd=function(a,c){return a+"&"+c}; +u.f.wc=function(a){var c={qb:"",Mb:""};if(!a)return c;var d=a.indexOf("&"),e;-1!==d?e=d+1:(d=e=a.lastIndexOf("/")+1,0===d&&(d=e=a.length));c.qb=a.substring(0,d);c.Mb=a.substring(e,a.length);return c};u.f.ad=function(a){return a in u.f.xc};u.f.Lc=/^rtmp[set]?:\/\//i;u.f.$c=function(a){return u.f.Lc.test(a)}; +u.Kc=u.c.extend({i:function(a,c,d){u.c.call(this,a,c,d);if(!a.g.sources||0===a.g.sources.length){c=0;for(d=a.g.techOrder;c<d.length;c++){var e=u.$(d[c]),g=window.videojs[e];if(g&&g.isSupported()){J(a,e);break}}}else a.src(a.g.sources)}});function W(a){a.za=a.za||[];return a.za}function X(a,c,d){for(var e=a.za,g=0,h=e.length,k,r;g<h;g++)k=e[g],k.id()===c?(k.show(),r=k):d&&(k.K()==d&&0<k.mode())&&k.disable();(c=r?r.K():d?d:l)&&a.j(c+"trackchange")} +u.X=u.c.extend({i:function(a,c){u.c.call(this,a,c);this.Q=c.id||"vjs_"+c.kind+"_"+c.language+"_"+u.s++;this.tc=c.src;this.Sc=c["default"]||c.dflt;this.xd=c.title;this.Id=c.srclang;this.bd=c.label;this.fa=[];this.bc=[];this.ga=this.ha=0;this.b.d("fullscreenchange",u.bind(this,this.Nc))}});t=u.X.prototype;t.K=p("A");t.src=p("tc");t.tb=p("Sc");t.title=p("xd");t.label=p("bd");t.readyState=p("ha");t.mode=p("ga");t.Nc=function(){this.a.style.fontSize=this.b.I?140*(screen.width/this.b.width())+"%":""}; +t.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-"+this.A+" vjs-text-track"})};t.show=function(){Y(this);this.ga=2;u.c.prototype.show.call(this)};t.C=function(){Y(this);this.ga=1;u.c.prototype.C.call(this)};t.disable=function(){2==this.ga&&this.C();this.b.n("timeupdate",u.bind(this,this.update,this.Q));this.b.n("ended",u.bind(this,this.reset,this.Q));this.reset();this.b.V.textTrackDisplay.removeChild(this);this.ga=0}; +function Y(a){0===a.ha&&a.load();0===a.ga&&(a.b.d("timeupdate",u.bind(a,a.update,a.Q)),a.b.d("ended",u.bind(a,a.reset,a.Q)),("captions"===a.A||"subtitles"===a.A)&&a.b.V.textTrackDisplay.Z(a))}t.load=function(){0===this.ha&&(this.ha=1,u.get(this.tc,u.bind(this,this.kd),u.bind(this,this.Fb)))};t.Fb=function(a){this.error=a;this.ha=3;this.j("error")}; +t.kd=function(a){var c,d;a=a.split("\n");for(var e="",g=1,h=a.length;g<h;g++)if(e=u.trim(a[g])){-1==e.indexOf("--\x3e")?(c=e,e=u.trim(a[++g])):c=this.fa.length;c={id:c,index:this.fa.length};d=e.split(" --\x3e ");c.startTime=ga(d[0]);c.ua=ga(d[1]);for(d=[];a[++g]&&(e=u.trim(a[g]));)d.push(e);c.text=d.join("<br/>");this.fa.push(c)}this.ha=2;this.j("loaded")}; +function ga(a){var c=a.split(":");a=0;var d,e,g;3==c.length?(d=c[0],e=c[1],c=c[2]):(d=0,e=c[0],c=c[1]);c=c.split(/\s+/);c=c.splice(0,1)[0];c=c.split(/\.|,/);g=parseFloat(c[1]);c=c[0];a+=3600*parseFloat(d);a+=60*parseFloat(e);a+=parseFloat(c);g&&(a+=g/1E3);return a} +t.update=function(){if(0<this.fa.length){var a=this.b.currentTime();if(this.Kb===b||a<this.Kb||this.La<=a){var c=this.fa,d=this.b.duration(),e=0,g=l,h=[],k,r,n,s;a>=this.La||this.La===b?s=this.vb!==b?this.vb:0:(g=f,s=this.Cb!==b?this.Cb:c.length-1);for(;;){n=c[s];if(n.ua<=a)e=Math.max(e,n.ua),n.Ha&&(n.Ha=l);else if(a<n.startTime){if(d=Math.min(d,n.startTime),n.Ha&&(n.Ha=l),!g)break}else g?(h.splice(0,0,n),r===b&&(r=s),k=s):(h.push(n),k===b&&(k=s),r=s),d=Math.min(d,n.ua),e=Math.max(e,n.startTime), +n.Ha=f;if(g)if(0===s)break;else s--;else if(s===c.length-1)break;else s++}this.bc=h;this.La=d;this.Kb=e;this.vb=k;this.Cb=r;a=this.bc;c="";d=0;for(e=a.length;d<e;d++)c+='<span class="vjs-tt-cue">'+a[d].text+"</span>";this.a.innerHTML=c;this.j("cuechange")}}};t.reset=function(){this.La=0;this.Kb=this.b.duration();this.Cb=this.vb=0};u.Sb=u.X.extend();u.Sb.prototype.A="captions";u.Yb=u.X.extend();u.Yb.prototype.A="subtitles";u.Tb=u.X.extend();u.Tb.prototype.A="chapters"; +u.Zb=u.c.extend({i:function(a,c,d){u.c.call(this,a,c,d);if(a.g.tracks&&0<a.g.tracks.length){c=this.b;a=a.g.tracks;var e;for(d=0;d<a.length;d++){e=a[d];var g=c,h=e.kind,k=e.label,r=e.language,n=e;e=g.za=g.za||[];n=n||{};n.kind=h;n.label=k;n.language=r;h=u.$(h||"subtitles");g=new window.videojs[h+"Track"](g,n);e.push(g)}}}});u.Zb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-text-track-display"})}; +u.Y=u.N.extend({i:function(a,c){var d=this.ca=c.track;c.label=d.label();c.selected=d.tb();u.N.call(this,a,c);this.b.d(d.K()+"trackchange",u.bind(this,this.update))}});u.Y.prototype.p=function(){u.N.prototype.p.call(this);X(this.b,this.ca.Q,this.ca.K())};u.Y.prototype.update=function(){this.selected(2==this.ca.mode())};u.ab=u.Y.extend({i:function(a,c){c.track={K:function(){return c.kind},L:a,label:function(){return c.kind+" off"},tb:q(l),mode:q(l)};u.Y.call(this,a,c);this.selected(f)}}); +u.ab.prototype.p=function(){u.Y.prototype.p.call(this);X(this.b,this.ca.Q,this.ca.K())};u.ab.prototype.update=function(){for(var a=W(this.b),c=0,d=a.length,e,g=f;c<d;c++)e=a[c],e.K()==this.ca.K()&&2==e.mode()&&(g=l);this.selected(g)};u.S=u.R.extend({i:function(a,c){u.R.call(this,a,c);1>=this.J.length&&this.C()}});u.S.prototype.sa=function(){var a=[],c;a.push(new u.ab(this.b,{kind:this.A}));for(var d=0;d<W(this.b).length;d++)c=W(this.b)[d],c.K()===this.A&&a.push(new u.Y(this.b,{track:c}));return a}; +u.Ca=u.S.extend({i:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Captions Menu")}});u.Ca.prototype.A="captions";u.Ca.prototype.pa="Captions";u.Ca.prototype.className="vjs-captions-button";u.Ga=u.S.extend({i:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Subtitles Menu")}});u.Ga.prototype.A="subtitles";u.Ga.prototype.pa="Subtitles";u.Ga.prototype.className="vjs-subtitles-button"; +u.Da=u.S.extend({i:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Chapters Menu")}});t=u.Da.prototype;t.A="chapters";t.pa="Chapters";t.className="vjs-chapters-button";t.sa=function(){for(var a=[],c,d=0;d<W(this.b).length;d++)c=W(this.b)[d],c.K()===this.A&&a.push(new u.Y(this.b,{track:c}));return a}; +t.Ja=function(){for(var a=W(this.b),c=0,d=a.length,e,g,h=this.J=[];c<d;c++)if(e=a[c],e.K()==this.A&&e.tb()){if(2>e.readyState()){this.Fd=e;e.d("loaded",u.bind(this,this.Ja));return}g=e;break}a=this.va=new u.la(this.b);a.a.appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.$(this.A),wd:-1}));if(g){e=g.fa;for(var k,c=0,d=e.length;c<d;c++)k=e[c],k=new u.Wa(this.b,{track:g,cue:k}),h.push(k),a.Z(k)}0<this.J.length&&this.show();return a}; +u.Wa=u.N.extend({i:function(a,c){var d=this.ca=c.track,e=this.cue=c.cue,g=a.currentTime();c.label=e.text;c.selected=e.startTime<=g&&g<e.ua;u.N.call(this,a,c);d.d("cuechange",u.bind(this,this.update))}});u.Wa.prototype.p=function(){u.N.prototype.p.call(this);this.b.currentTime(this.cue.startTime);this.update(this.cue.startTime)};u.Wa.prototype.update=function(){var a=this.cue,c=this.b.currentTime();this.selected(a.startTime<=c&&c<a.ua)}; +u.k.B(u.Ea.prototype.g.children,{subtitlesButton:{},captionsButton:{},chaptersButton:{}}); +if("undefined"!==typeof window.JSON&&"function"===window.JSON.parse)u.JSON=window.JSON;else{u.JSON={};var Z=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;u.JSON.parse=function(a,c){function d(a,e){var k,r,n=a[e];if(n&&"object"===typeof n)for(k in n)Object.prototype.hasOwnProperty.call(n,k)&&(r=d(n,k),r!==b?n[k]=r:delete n[k]);return c.call(a,e,n)}var e;a=String(a);Z.lastIndex=0;Z.test(a)&&(a=a.replace(Z,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})); +if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return e=eval("("+a+")"),"function"===typeof c?d({"":e},""):e;throw new SyntaxError("JSON.parse(): invalid or malformed JSON data");}} +u.cc=function(){var a,c,d=document.getElementsByTagName("video");if(d&&0<d.length)for(var e=0,g=d.length;e<g;e++)if((c=d[e])&&c.getAttribute)c.player===b&&(a=c.getAttribute("data-setup"),a!==j&&(a=u.JSON.parse(a||"{}"),v(c,a)));else{u.jb();break}else u.Ac||u.jb()};u.jb=function(){setTimeout(u.cc,1)};"complete"===document.readyState?u.Ac=f:u.U(window,"load",function(){u.Ac=f});u.jb();u.ld=function(a,c){u.w.prototype[a]=c};var ha=this;ha.Bd=f;function $(a,c){var d=a.split("."),e=ha;!(d[0]in e)&&e.execScript&&e.execScript("var "+d[0]);for(var g;d.length&&(g=d.shift());)!d.length&&c!==b?e[g]=c:e=e[g]?e[g]:e[g]={}};$("videojs",u);$("_V_",u);$("videojs.options",u.options);$("videojs.players",u.wa);$("videojs.cache",u.qa);$("videojs.Component",u.c);u.c.prototype.player=u.c.prototype.L;u.c.prototype.dispose=u.c.prototype.D;u.c.prototype.createEl=u.c.prototype.e;u.c.prototype.el=u.c.prototype.v;u.c.prototype.addChild=u.c.prototype.Z;u.c.prototype.children=u.c.prototype.children;u.c.prototype.on=u.c.prototype.d;u.c.prototype.off=u.c.prototype.n;u.c.prototype.one=u.c.prototype.U;u.c.prototype.trigger=u.c.prototype.j; +u.c.prototype.triggerReady=u.c.prototype.Ta;u.c.prototype.show=u.c.prototype.show;u.c.prototype.hide=u.c.prototype.C;u.c.prototype.width=u.c.prototype.width;u.c.prototype.height=u.c.prototype.height;u.c.prototype.dimensions=u.c.prototype.Tc;u.c.prototype.ready=u.c.prototype.M;u.c.prototype.addClass=u.c.prototype.m;u.c.prototype.removeClass=u.c.prototype.t;$("videojs.Player",u.w);u.w.prototype.dispose=u.w.prototype.D;u.w.prototype.requestFullScreen=u.w.prototype.xa;u.w.prototype.cancelFullScreen=u.w.prototype.nb; +u.w.prototype.bufferedPercent=u.w.prototype.Ia;u.w.prototype.usingNativeControls=u.w.prototype.Pb;$("videojs.MediaLoader",u.Kc);$("videojs.TextTrackDisplay",u.Zb);$("videojs.ControlBar",u.Ea);$("videojs.Button",u.q);$("videojs.PlayToggle",u.Wb);$("videojs.FullscreenToggle",u.Fa);$("videojs.BigPlayButton",u.Va);$("videojs.LoadingSpinner",u.Ub);$("videojs.CurrentTimeDisplay",u.Xa);$("videojs.DurationDisplay",u.Ya);$("videojs.TimeDivider",u.$b);$("videojs.RemainingTimeDisplay",u.eb); +$("videojs.Slider",u.O);$("videojs.ProgressControl",u.cb);$("videojs.SeekBar",u.Xb);$("videojs.LoadProgressBar",u.$a);$("videojs.PlayProgressBar",u.Vb);$("videojs.SeekHandle",u.fb);$("videojs.VolumeControl",u.hb);$("videojs.VolumeBar",u.gb);$("videojs.VolumeLevel",u.ac);$("videojs.VolumeMenuButton",u.na);$("videojs.VolumeHandle",u.ib);$("videojs.MuteToggle",u.da);$("videojs.PosterImage",u.bb);$("videojs.Menu",u.la);$("videojs.MenuItem",u.N);$("videojs.MenuButton",u.R);u.R.prototype.createItems=u.R.prototype.sa; +u.S.prototype.createItems=u.S.prototype.sa;u.Da.prototype.createItems=u.Da.prototype.sa;$("videojs.SubtitlesButton",u.Ga);$("videojs.CaptionsButton",u.Ca);$("videojs.ChaptersButton",u.Da);$("videojs.MediaTechController",u.r);u.r.prototype.features=u.r.prototype.l;u.r.prototype.l.volumeControl=u.r.prototype.l.zc;u.r.prototype.l.fullscreenResize=u.r.prototype.l.Gd;u.r.prototype.l.progressEvents=u.r.prototype.l.Kd;u.r.prototype.l.timeupdateEvents=u.r.prototype.l.Pd;$("videojs.Html5",u.o); +u.o.Events=u.o.Za;u.o.isSupported=u.o.isSupported;u.o.canPlaySource=u.o.lb;u.o.prototype.setCurrentTime=u.o.prototype.pd;u.o.prototype.setVolume=u.o.prototype.ud;u.o.prototype.setMuted=u.o.prototype.sd;u.o.prototype.setPreload=u.o.prototype.td;u.o.prototype.setAutoplay=u.o.prototype.od;u.o.prototype.setLoop=u.o.prototype.rd;$("videojs.Flash",u.f);u.f.isSupported=u.f.isSupported;u.f.canPlaySource=u.f.lb;u.f.onReady=u.f.onReady;$("videojs.TextTrack",u.X);u.X.prototype.label=u.X.prototype.label; +$("videojs.CaptionsTrack",u.Sb);$("videojs.SubtitlesTrack",u.Yb);$("videojs.ChaptersTrack",u.Tb);$("videojs.autoSetup",u.cc);$("videojs.plugin",u.ld);$("videojs.createTimeRange",u.sb);})(); diff --git a/extlib/video-js/video.min.js b/extlib/video-js/video.min.js deleted file mode 100644 index 1c33af55..00000000 --- a/extlib/video-js/video.min.js +++ /dev/null @@ -1,21 +0,0 @@ -/*! -Video.js - HTML5 Video Player -Version GENERATED_AT_BUILD - -LGPL v3 LICENSE INFO -This file is part of Video.js. Copyright 2011 Zencoder, Inc. - -Video.js is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Video.js is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with Video.js. If not, see <http://www.gnu.org/licenses/>. -*/ -(function(window,undefined){var document=window.document;document.createElement("video");document.createElement("audio");var VideoJS=function(id,addOptions,ready){var tag;if(typeof id=="string"){if(id.indexOf("#")===0){id=id.slice(1)}if(_V_.players[id]){return _V_.players[id]}else{tag=_V_.el(id)}}else{tag=id}if(!tag||!tag.nodeName){throw new TypeError("The element or ID supplied is not valid. (VideoJS)")}return tag.player||new _V_.Player(tag,addOptions,ready)},_V_=VideoJS,CDN_VERSION="GENERATED_CDN_VSN";VideoJS.players={};VideoJS.options={techOrder:["html5","flash"],html5:{},flash:{swf:"http://vjs.zencdn.net/c/video-js.swf"},width:300,height:150,defaultVolume:0,components:{posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}}};if(CDN_VERSION!="GENERATED_CDN_VSN"){_V_.options.flash.swf="http://vjs.zencdn.net/"+CDN_VERSION+"/video-js.swf"}_V_.merge=function(obj1,obj2,safe){if(!obj2){obj2={}}for(var attrname in obj2){if(obj2.hasOwnProperty(attrname)&&(!safe||!obj1.hasOwnProperty(attrname))){obj1[attrname]=obj2[attrname]}}return obj1};_V_.extend=function(obj){this.merge(this,obj,true)};_V_.extend({tech:{},controlSets:{},isIE:function(){return !+"\v1"},isFF:function(){return !!_V_.ua.match("Firefox")},isIPad:function(){return navigator.userAgent.match(/iPad/i)!==null},isIPhone:function(){return navigator.userAgent.match(/iPhone/i)!==null},isIOS:function(){return VideoJS.isIPhone()||VideoJS.isIPad()},iOSVersion:function(){var match=navigator.userAgent.match(/OS (\d+)_/i);if(match&&match[1]){return match[1]}},isAndroid:function(){return navigator.userAgent.match(/Android.*AppleWebKit/i)!==null},androidVersion:function(){var match=navigator.userAgent.match(/Android (\d+)\./i);if(match&&match[1]){return match[1]}},testVid:document.createElement("video"),ua:navigator.userAgent,support:{},each:function(arr,fn){if(!arr||arr.length===0){return}for(var i=0,j=arr.length;i<j;i++){fn.call(this,arr[i],i)}},eachProp:function(obj,fn){if(!obj){return}for(var name in obj){if(obj.hasOwnProperty(name)){fn.call(this,name,obj[name])}}},el:function(id){return document.getElementById(id)},createElement:function(tagName,attributes){var el=document.createElement(tagName),attrname;for(attrname in attributes){if(attributes.hasOwnProperty(attrname)){if(attrname.indexOf("-")!==-1){el.setAttribute(attrname,attributes[attrname])}else{el[attrname]=attributes[attrname]}}}return el},insertFirst:function(node,parent){if(parent.firstChild){parent.insertBefore(node,parent.firstChild)}else{parent.appendChild(node)}},addClass:function(element,classToAdd){if((" "+element.className+" ").indexOf(" "+classToAdd+" ")==-1){element.className=element.className===""?classToAdd:element.className+" "+classToAdd}},removeClass:function(element,classToRemove){if(element.className.indexOf(classToRemove)==-1){return}var classNames=element.className.split(" ");classNames.splice(classNames.indexOf(classToRemove),1);element.className=classNames.join(" ")},remove:function(item,array){if(!array){return}var i=array.indexOf(item);if(i!=-1){return array.splice(i,1)}},blockTextSelection:function(){document.body.focus();document.onselectstart=function(){return false}},unblockTextSelection:function(){document.onselectstart=function(){return true}},formatTime:function(seconds,guide){guide=guide||seconds;var s=Math.floor(seconds%60),m=Math.floor(seconds/60%60),h=Math.floor(seconds/3600),gm=Math.floor(guide/60%60),gh=Math.floor(guide/3600);h=(h>0||gh>0)?h+":":"";m=(((h||gm>=10)&&m<10)?"0"+m:m)+":";s=(s<10)?"0"+s:s;return h+m+s},uc:function(string){return string.charAt(0).toUpperCase()+string.slice(1)},getRelativePosition:function(x,relativeElement){return Math.max(0,Math.min(1,(x-_V_.findPosX(relativeElement))/relativeElement.offsetWidth))},getComputedStyleValue:function(element,style){return window.getComputedStyle(element,null).getPropertyValue(style)},trim:function(string){return string.toString().replace(/^\s+/,"").replace(/\s+$/,"")},round:function(num,dec){if(!dec){dec=0}return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec)},isEmpty:function(object){for(var prop in object){return false}return true},createTimeRange:function(start,end){return{length:1,start:function(){return start},end:function(){return end}}},cache:{},guid:1,expando:"vdata"+(new Date).getTime(),getData:function(elem){var id=elem[_V_.expando];if(!id){id=elem[_V_.expando]=_V_.guid++;_V_.cache[id]={}}return _V_.cache[id]},removeData:function(elem){var id=elem[_V_.expando];if(!id){return}delete _V_.cache[id];try{delete elem[_V_.expando]}catch(e){if(elem.removeAttribute){elem.removeAttribute(_V_.expando)}else{elem[_V_.expando]=null}}},proxy:function(context,fn,uid){if(!fn.guid){fn.guid=_V_.guid++}var ret=function(){return fn.apply(context,arguments)};ret.guid=(uid)?uid+"_"+fn.guid:fn.guid;return ret},get:function(url,onSuccess,onError){var local=(url.indexOf("file:")==0||(window.location.href.indexOf("file:")==0&&url.indexOf("http:")==-1));if(typeof XMLHttpRequest=="undefined"){XMLHttpRequest=function(){try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(e){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(f){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(g){}throw new Error("This browser does not support XMLHttpRequest.")}}var request=new XMLHttpRequest();try{request.open("GET",url)}catch(e){_V_.log("VideoJS XMLHttpRequest (open)",e);return false}request.onreadystatechange=_V_.proxy(this,function(){if(request.readyState==4){if(request.status==200||local&&request.status==0){onSuccess(request.responseText)}else{if(onError){onError()}}}});try{request.send()}catch(e){_V_.log("VideoJS XMLHttpRequest (send)",e);if(onError){onError(e)}}},setLocalStorage:function(key,value){var localStorage=window.localStorage||false;if(!localStorage){return}try{localStorage[key]=value}catch(e){if(e.code==22||e.code==1014){_V_.log("LocalStorage Full (VideoJS)",e)}else{_V_.log("LocalStorage Error (VideoJS)",e)}}},getAbsoluteURL:function(url){if(!url.match(/^https?:\/\//)){url=_V_.createElement("div",{innerHTML:'<a href="'+url+'">x</a>'}).firstChild.href}return url}});_V_.log=function(){_V_.log.history=_V_.log.history||[];_V_.log.history.push(arguments);if(window.console){arguments.callee=arguments.callee.caller;var newarr=[].slice.call(arguments);(typeof console.log==="object"?_V_.log.apply.call(console.log,console,newarr):console.log.apply(console,newarr))}};(function(b){function c(){}for(var d="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,timeStamp,profile,profileEnd,time,timeEnd,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try{console.log();return window.console}catch(err){return window.console={}}})());if("getBoundingClientRect" in document.documentElement){_V_.findPosX=function(el){var box;try{box=el.getBoundingClientRect()}catch(e){}if(!box){return 0}var docEl=document.documentElement,body=document.body,clientLeft=docEl.clientLeft||body.clientLeft||0,scrollLeft=window.pageXOffset||body.scrollLeft,left=box.left+scrollLeft-clientLeft;return left}}else{_V_.findPosX=function(el){var curleft=el.offsetLeft;while(el=obj.offsetParent){if(el.className.indexOf("video-js")==-1){}else{}curleft+=el.offsetLeft}return curleft}}if(!Array.prototype.indexOf){Array.prototype.indexOf=function(searchElement){if(this===void 0||this===null){throw new TypeError()}var t=Object(this);var len=t.length>>>0;if(len===0){return -1}var n=0;if(arguments.length>0){n=Number(arguments[1]);if(n!==n){n=0}else{if(n!==0&&n!==(1/0)&&n!==-(1/0)){n=(n>0||-1)*Math.floor(Math.abs(n))}}}if(n>=len){return -1}var k=n>=0?n:Math.max(len-Math.abs(n),0);for(;k<len;k++){if(k in t&&t[k]===searchElement){return k}}return -1}}var JSON;if(!JSON){JSON={}}(function(){var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}}());_V_.extend({addEvent:function(elem,type,fn){var data=_V_.getData(elem),handlers;if(data&&!data.handler){data.handler=function(event){event=_V_.fixEvent(event);var handlers=_V_.getData(elem).events[event.type];if(handlers){var handlersCopy=[];_V_.each(handlers,function(handler,i){handlersCopy[i]=handler});for(var i=0,l=handlersCopy.length;i<l;i++){handlersCopy[i].call(elem,event)}}}}if(!data.events){data.events={}}handlers=data.events[type];if(!handlers){handlers=data.events[type]=[];if(document.addEventListener){elem.addEventListener(type,data.handler,false)}else{if(document.attachEvent){elem.attachEvent("on"+type,data.handler)}}}if(!fn.guid){fn.guid=_V_.guid++}handlers.push(fn)},removeEvent:function(elem,type,fn){var data=_V_.getData(elem),handlers;if(!data.events){return}if(!type){for(type in data.events){_V_.cleanUpEvents(elem,type)}return}handlers=data.events[type];if(!handlers){return}if(fn&&fn.guid){for(var i=0;i<handlers.length;i++){if(handlers[i].guid===fn.guid){handlers.splice(i--,1)}}}_V_.cleanUpEvents(elem,type)},cleanUpEvents:function(elem,type){var data=_V_.getData(elem);if(data.events[type].length===0){delete data.events[type];if(document.removeEventListener){elem.removeEventListener(type,data.handler,false)}else{if(document.detachEvent){elem.detachEvent("on"+type,data.handler)}}}if(_V_.isEmpty(data.events)){delete data.events;delete data.handler}if(_V_.isEmpty(data)){_V_.removeData(elem)}},fixEvent:function(event){if(event[_V_.expando]){return event}var originalEvent=event;event=new _V_.Event(originalEvent);for(var i=_V_.Event.props.length,prop;i;){prop=_V_.Event.props[--i];event[prop]=originalEvent[prop]}if(!event.target){event.target=event.srcElement||document}if(event.target.nodeType===3){event.target=event.target.parentNode}if(!event.relatedTarget&&event.fromElement){event.relatedTarget=event.fromElement===event.target?event.toElement:event.fromElement}if(event.pageX==null&&event.clientX!=null){var eventDocument=event.target.ownerDocument||document,doc=eventDocument.documentElement,body=eventDocument.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc&&doc.clientLeft||body&&body.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc&&doc.clientTop||body&&body.clientTop||0)}if(event.which==null&&(event.charCode!=null||event.keyCode!=null)){event.which=event.charCode!=null?event.charCode:event.keyCode}if(!event.metaKey&&event.ctrlKey){event.metaKey=event.ctrlKey}if(!event.which&&event.button!==undefined){event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)))}return event},triggerEvent:function(elem,event){var data=_V_.getData(elem),parent=elem.parentNode||elem.ownerDocument,type=event.type||event,handler;if(data){handler=data.handler}event=typeof event==="object"?event[_V_.expando]?event:new _V_.Event(type,event):new _V_.Event(type);event.type=type;if(handler){handler.call(elem,event)}event.result=undefined;event.target=elem},one:function(elem,type,fn){_V_.addEvent(elem,type,function(){_V_.removeEvent(elem,type,arguments.callee);fn.apply(this,arguments)})}});_V_.Event=function(src,props){if(src&&src.type){this.originalEvent=src;this.type=src.type;this.isDefaultPrevented=(src.defaultPrevented||src.returnValue===false||src.getPreventDefault&&src.getPreventDefault())?returnTrue:returnFalse}else{this.type=src}if(props){_V_.merge(this,props)}this.timeStamp=(new Date).getTime();this[_V_.expando]=true};_V_.Event.prototype={preventDefault:function(){this.isDefaultPrevented=returnTrue;var e=this.originalEvent;if(!e){return}if(e.preventDefault){e.preventDefault()}else{e.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=returnTrue;var e=this.originalEvent;if(!e){return}if(e.stopPropagation){e.stopPropagation()}e.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=returnTrue;this.stopPropagation()},isDefaultPrevented:returnFalse,isPropagationStopped:returnFalse,isImmediatePropagationStopped:returnFalse};_V_.Event.props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");function returnTrue(){return true}function returnFalse(){return false}(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;_V_.Class=function(){};_V_.Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret}})(name,prop[name]):prop[name]}function Class(){if(!initializing&&this.init){return this.init.apply(this,arguments)}else{if(!initializing){return arguments.callee.prototype.init()}}}Class.prototype=prototype;Class.constructor=Class;Class.extend=arguments.callee;return Class}})();_V_.Component=_V_.Class.extend({init:function(player,options){this.player=player;options=this.options=_V_.merge(this.options||{},options);if(options.el){this.el=options.el}else{this.el=this.createElement()}this.initComponents()},destroy:function(){},createElement:function(type,attrs){return _V_.createElement(type||"div",attrs)},buildCSSClass:function(){return""},initComponents:function(){var options=this.options;if(options&&options.components){this.eachProp(options.components,function(name,opts){var tempAdd=this.proxy(function(){this[name]=this.addComponent(name,opts)});if(opts.loadEvent){this.one(opts.loadEvent,tempAdd)}else{tempAdd()}})}},addComponent:function(name,options){var component,componentClass;if(typeof name=="string"){options=options||{};componentClass=options.componentClass||_V_.uc(name);component=new _V_[componentClass](this.player||this,options)}else{component=name}this.el.appendChild(component.el);return component},removeComponent:function(component){this.el.removeChild(component.el)},show:function(){this.el.style.display="block"},hide:function(){this.el.style.display="none"},fadeIn:function(){this.removeClass("vjs-fade-out");this.addClass("vjs-fade-in")},fadeOut:function(){this.removeClass("vjs-fade-in");this.addClass("vjs-fade-out")},lockShowing:function(){var style=this.el.style;style.display="block";style.opacity=1;style.visiblity="visible"},unlockShowing:function(){var style=this.el.style;style.display="";style.opacity="";style.visiblity=""},addClass:function(classToAdd){_V_.addClass(this.el,classToAdd)},removeClass:function(classToRemove){_V_.removeClass(this.el,classToRemove)},addEvent:function(type,fn,uid){return _V_.addEvent(this.el,type,_V_.proxy(this,fn))},removeEvent:function(type,fn){return _V_.removeEvent(this.el,type,fn)},triggerEvent:function(type,e){return _V_.triggerEvent(this.el,type,e)},one:function(type,fn){_V_.one(this.el,type,_V_.proxy(this,fn))},ready:function(fn){if(!fn){return this}if(this.isReady){fn.call(this)}else{if(this.readyQueue===undefined){this.readyQueue=[]}this.readyQueue.push(fn)}return this},triggerReady:function(){this.isReady=true;if(this.readyQueue&&this.readyQueue.length>0){this.each(this.readyQueue,function(fn){fn.call(this)});this.readyQueue=[];this.triggerEvent("ready")}},each:function(arr,fn){_V_.each.call(this,arr,fn)},eachProp:function(obj,fn){_V_.eachProp.call(this,obj,fn)},extend:function(obj){_V_.merge(this,obj)},proxy:function(fn,uid){return _V_.proxy(this,fn,uid)}});_V_.Player=_V_.Component.extend({init:function(tag,addOptions,ready){this.tag=tag;var el=this.el=_V_.createElement("div"),options=this.options={};_V_.merge(options,_V_.options);_V_.merge(options,this.getVideoTagSettings());_V_.merge(options,addOptions);this.ready(ready);tag.removeAttribute("controls");tag.removeAttribute("poster");tag.player=el.player=this;tag.parentNode.insertBefore(el,tag);el.appendChild(tag);this.id=el.id=tag.id;el.className=tag.className;tag.id+="_html5_api";tag.className="vjs-tech";_V_.players[el.id]=this;el.setAttribute("width",options.width);el.setAttribute("height",options.height);el.style.width=options.width+"px";el.style.height=options.height+"px";tag.removeAttribute("width");tag.removeAttribute("height");if(tag.hasChildNodes()){for(var i=0,j=tag.childNodes;i<j.length;i++){if(j[i].nodeName=="SOURCE"||j[i].nodeName=="TRACK"){tag.removeChild(j[i])}}}this.values={};this.addClass("vjs-paused");this.addEvent("ended",this.onEnded);this.addEvent("play",this.onPlay);this.addEvent("pause",this.onPause);this.addEvent("progress",this.onProgress);this.addEvent("error",this.onError);if(options.controls){this.ready(function(){this.initComponents()})}this.textTracks=[];if(options.tracks&&options.tracks.length>0){this.addTextTracks(options.tracks)}if(!options.sources||options.sources.length==0){for(var i=0,j=options.techOrder;i<j.length;i++){var techName=j[i],tech=_V_[techName];if(tech.isSupported()){this.loadTech(techName);break}}}else{this.src(options.sources)}},values:{},destroy:function(){this.stopTrackingProgress();this.stopTrackingCurrentTime();_V_.players[this.id]=null;delete _V_.players[this.id];this.tech.destroy();this.el.parentNode.removeChild(this.el)},createElement:function(type,options){},getVideoTagSettings:function(){var options={sources:[],tracks:[]},tag=this.tag,getAttribute="getAttribute";options.src=tag[getAttribute]("src");options.controls=tag[getAttribute]("controls")!==null;options.poster=tag[getAttribute]("poster");options.preload=tag[getAttribute]("preload");options.autoplay=tag[getAttribute]("autoplay")!==null;options.loop=tag[getAttribute]("loop")!==null;options.muted=tag[getAttribute]("muted")!==null;if(this.tag.hasChildNodes()){for(var c,i=0,j=this.tag.childNodes;i<j.length;i++){c=j[i];if(c.nodeName=="SOURCE"){options.sources.push({src:c[getAttribute]("src"),type:c[getAttribute]("type"),media:c[getAttribute]("media"),title:c[getAttribute]("title")})}if(c.nodeName=="TRACK"){options.tracks.push({src:c[getAttribute]("src"),kind:c[getAttribute]("kind"),srclang:c[getAttribute]("srclang"),label:c[getAttribute]("label"),"default":c[getAttribute]("default")!==null,title:c[getAttribute]("title")})}}}return options},loadTech:function(techName,source){if(this.tech){this.unloadTech()}else{if(techName!="html5"&&this.tag){this.el.removeChild(this.tag);this.tag=false}}this.techName=techName;this.isReady=false;var techReady=function(){this.player.triggerReady();if(!this.support.progressEvent){this.player.manualProgressOn()}if(!this.support.timeupdateEvent){this.player.manualTimeUpdatesOn()}};var techOptions=_V_.merge({source:source,parentEl:this.el},this.options[techName]);if(source){if(source.src==this.values.src&&this.values.currentTime>0){techOptions.startTime=this.values.currentTime}this.values.src=source.src}this.tech=new _V_[techName](this,techOptions);this.tech.ready(techReady)},unloadTech:function(){this.tech.destroy();if(this.manualProgress){this.manualProgressOff()}if(this.manualTimeUpdates){this.manualTimeUpdatesOff()}this.tech=false},manualProgressOn:function(){this.manualProgress=true;this.trackProgress();this.tech.addEvent("progress",function(){this.removeEvent("progress",arguments.callee);this.support.progressEvent=true;this.player.manualProgressOff()})},manualProgressOff:function(){this.manualProgress=false;this.stopTrackingProgress()},trackProgress:function(){this.progressInterval=setInterval(_V_.proxy(this,function(){if(this.values.bufferEnd<this.buffered().end(0)){this.triggerEvent("progress")}else{if(this.bufferedPercent()==1){this.stopTrackingProgress();this.triggerEvent("progress")}}}),500)},stopTrackingProgress:function(){clearInterval(this.progressInterval)},manualTimeUpdatesOn:function(){this.manualTimeUpdates=true;this.addEvent("play",this.trackCurrentTime);this.addEvent("pause",this.stopTrackingCurrentTime);this.tech.addEvent("timeupdate",function(){this.removeEvent("timeupdate",arguments.callee);this.support.timeupdateEvent=true;this.player.manualTimeUpdatesOff()})},manualTimeUpdatesOff:function(){this.manualTimeUpdates=false;this.stopTrackingCurrentTime();this.removeEvent("play",this.trackCurrentTime);this.removeEvent("pause",this.stopTrackingCurrentTime)},trackCurrentTime:function(){if(this.currentTimeInterval){this.stopTrackingCurrentTime()}this.currentTimeInterval=setInterval(_V_.proxy(this,function(){this.triggerEvent("timeupdate")}),250)},stopTrackingCurrentTime:function(){clearInterval(this.currentTimeInterval)},onEnded:function(){if(this.options.loop){this.currentTime(0);this.play()}else{this.pause();this.currentTime(0);this.pause()}},onPlay:function(){_V_.removeClass(this.el,"vjs-paused");_V_.addClass(this.el,"vjs-playing")},onPause:function(){_V_.removeClass(this.el,"vjs-playing");_V_.addClass(this.el,"vjs-paused")},onProgress:function(){if(this.bufferedPercent()==1){this.triggerEvent("loadedalldata")}},onError:function(e){_V_.log("Video Error",e)},techCall:function(method,arg){if(!this.tech.isReady){this.tech.ready(function(){this[method](arg)})}else{try{this.tech[method](arg)}catch(e){_V_.log(e)}}},techGet:function(method){if(this.tech.isReady){try{return this.tech[method]()}catch(e){if(this.tech[method]===undefined){_V_.log("Video.js: "+method+" method not defined for "+this.techName+" playback technology.",e)}else{if(e.name=="TypeError"){_V_.log("Video.js: "+method+" unavailable on "+this.techName+" playback technology element.",e);this.tech.isReady=false}else{_V_.log(e)}}}}return},play:function(){this.techCall("play");return this},pause:function(){this.techCall("pause");return this},paused:function(){return(this.techGet("paused")===false)?false:true},currentTime:function(seconds){if(seconds!==undefined){this.values.lastSetCurrentTime=seconds;this.techCall("setCurrentTime",seconds);if(this.manualTimeUpdates){this.triggerEvent("timeupdate")}return this}return this.values.currentTime=(this.techGet("currentTime")||0)},duration:function(){return parseFloat(this.techGet("duration"))},remainingTime:function(){return this.duration()-this.currentTime()},buffered:function(){var buffered=this.techGet("buffered"),start=0,end=this.values.bufferEnd=this.values.bufferEnd||0,timeRange;if(buffered&&buffered.length>0&&buffered.end(0)!==end){end=buffered.end(0);this.values.bufferEnd=end}return _V_.createTimeRange(start,end)},bufferedPercent:function(){return(this.duration())?this.buffered().end(0)/this.duration():0},volume:function(percentAsDecimal){var vol;if(percentAsDecimal!==undefined){vol=Math.max(0,Math.min(1,parseFloat(percentAsDecimal)));this.values.volume=vol;this.techCall("setVolume",vol);_V_.setLocalStorage("volume",vol);return this}vol=parseFloat(this.techGet("volume"));return(isNaN(vol))?1:vol},muted:function(muted){if(muted!==undefined){this.techCall("setMuted",muted);return this}return this.techGet("muted")||false},width:function(width,skipListeners){if(width!==undefined){this.el.width=width;this.el.style.width=width+"px";if(!skipListeners){this.triggerEvent("resize")}return this}return parseInt(this.el.getAttribute("width"))},height:function(height){if(height!==undefined){this.el.height=height;this.el.style.height=height+"px";this.triggerEvent("resize");return this}return parseInt(this.el.getAttribute("height"))},size:function(width,height){return this.width(width,true).height(height)},supportsFullScreen:function(){return this.techGet("supportsFullScreen")||false},requestFullScreen:function(){var requestFullScreen=_V_.support.requestFullScreen;this.isFullScreen=true;if(requestFullScreen){_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){this.isFullScreen=document[requestFullScreen.isFullScreen];if(this.isFullScreen==false){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee)}this.triggerEvent("fullscreenchange")}));if(this.tech.support.fullscreenResize===false&&this.options.flash.iFrameMode!=true){this.pause();this.unloadTech();_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee);this.loadTech(this.techName,{src:this.values.src})}));this.el[requestFullScreen.requestFn]()}else{this.el[requestFullScreen.requestFn]()}}else{if(this.tech.supportsFullScreen()){this.triggerEvent("fullscreenchange");this.techCall("enterFullScreen")}else{this.triggerEvent("fullscreenchange");this.enterFullWindow()}}return this},cancelFullScreen:function(){var requestFullScreen=_V_.support.requestFullScreen;this.isFullScreen=false;if(requestFullScreen){if(this.tech.support.fullscreenResize===false&&this.options.flash.iFrameMode!=true){this.pause();this.unloadTech();_V_.addEvent(document,requestFullScreen.eventName,this.proxy(function(){_V_.removeEvent(document,requestFullScreen.eventName,arguments.callee);this.loadTech(this.techName,{src:this.values.src})}));document[requestFullScreen.cancelFn]()}else{document[requestFullScreen.cancelFn]()}}else{if(this.tech.supportsFullScreen()){this.techCall("exitFullScreen");this.triggerEvent("fullscreenchange")}else{this.exitFullWindow();this.triggerEvent("fullscreenchange")}}return this},enterFullWindow:function(){this.isFullWindow=true;this.docOrigOverflow=document.documentElement.style.overflow;_V_.addEvent(document,"keydown",_V_.proxy(this,this.fullWindowOnEscKey));document.documentElement.style.overflow="hidden";_V_.addClass(document.body,"vjs-full-window");_V_.addClass(this.el,"vjs-fullscreen");this.triggerEvent("enterFullWindow")},fullWindowOnEscKey:function(event){if(event.keyCode==27){if(this.isFullScreen==true){this.cancelFullScreen()}else{this.exitFullWindow()}}},exitFullWindow:function(){this.isFullWindow=false;_V_.removeEvent(document,"keydown",this.fullWindowOnEscKey);document.documentElement.style.overflow=this.docOrigOverflow;_V_.removeClass(document.body,"vjs-full-window");_V_.removeClass(this.el,"vjs-fullscreen");this.triggerEvent("exitFullWindow")},selectSource:function(sources){for(var i=0,j=this.options.techOrder;i<j.length;i++){var techName=j[i],tech=_V_[techName];if(tech.isSupported()){for(var a=0,b=sources;a<b.length;a++){var source=b[a];if(tech.canPlaySource.call(this,source)){return{source:source,tech:techName}}}}}return false},src:function(source){if(source instanceof Array){var sourceTech=this.selectSource(source),source,techName;if(sourceTech){source=sourceTech.source;techName=sourceTech.tech;if(techName==this.techName){this.src(source)}else{this.loadTech(techName,source)}}else{_V_.log("No compatible source and playback technology were found.")}}else{if(source instanceof Object){if(_V_[this.techName].canPlaySource(source)){this.src(source.src)}else{this.src([source])}}else{this.values.src=source;if(!this.isReady){this.ready(function(){this.src(source)})}else{this.techCall("src",source);if(this.options.preload=="auto"){this.load()}if(this.options.autoplay){this.play()}}}}return this},load:function(){this.techCall("load");return this},currentSrc:function(){return this.techGet("currentSrc")||this.values.src||""},preload:function(value){if(value!==undefined){this.techCall("setPreload",value);this.options.preload=value;return this}return this.techGet("preload")},autoplay:function(value){if(value!==undefined){this.techCall("setAutoplay",value);this.options.autoplay=value;return this}return this.techGet("autoplay",value)},loop:function(value){if(value!==undefined){this.techCall("setLoop",value);this.options.loop=value;return this}return this.techGet("loop")},controls:function(){return this.options.controls},poster:function(){return this.techGet("poster")},error:function(){return this.techGet("error")},ended:function(){return this.techGet("ended")}});(function(){var requestFn,cancelFn,eventName,isFullScreen,playerProto=_V_.Player.prototype;if(document.cancelFullscreen!==undefined){requestFn="requestFullscreen";cancelFn="exitFullscreen";eventName="fullscreenchange";isFullScreen="fullScreen"}else{_V_.each(["moz","webkit"],function(prefix){if((prefix!="moz"||document.mozFullScreenEnabled)&&document[prefix+"CancelFullScreen"]!==undefined){requestFn=prefix+"RequestFullScreen";cancelFn=prefix+"CancelFullScreen";eventName=prefix+"fullscreenchange";if(prefix=="webkit"){isFullScreen=prefix+"IsFullScreen"}else{isFullScreen=prefix+"FullScreen"}}})}if(requestFn){_V_.support.requestFullScreen={requestFn:requestFn,cancelFn:cancelFn,eventName:eventName,isFullScreen:isFullScreen}}})();_V_.PlaybackTech=_V_.Component.extend({init:function(player,options){},onClick:function(){if(this.player.options.controls){_V_.PlayToggle.prototype.onClick.call(this)}}});_V_.apiMethods="play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted".split(",");_V_.each(_V_.apiMethods,function(methodName){_V_.PlaybackTech.prototype[methodName]=function(){throw new Error("The '"+methodName+"' method is not available on the playback technology's API")}});_V_.html5=_V_.PlaybackTech.extend({init:function(player,options,ready){this.player=player;this.el=this.createElement();this.ready(ready);this.addEvent("click",this.proxy(this.onClick));var source=options.source;if(source&&this.el.currentSrc==source.src){player.triggerEvent("loadstart")}else{if(source){this.el.src=source.src}}player.ready(function(){if(this.options.autoplay&&this.paused()){this.tag.poster=null;this.play()}});this.setupTriggers();this.triggerReady()},destroy:function(){this.player.tag=false;this.removeTriggers();this.el.parentNode.removeChild(this.el)},createElement:function(){var html5=_V_.html5,player=this.player,el=player.tag,newEl;if(!el||this.support.movingElementInDOM===false){if(el){player.el.removeChild(el)}newEl=_V_.createElement("video",{id:el.id||player.el.id+"_html5_api",className:el.className||"vjs-tech"});el=newEl;_V_.insertFirst(el,player.el)}_V_.each(["autoplay","preload","loop","muted"],function(attr){if(player.options[attr]!==null){el[attr]=player.options[attr]}},this);return el},setupTriggers:function(){_V_.each.call(this,_V_.html5.events,function(type){_V_.addEvent(this.el,type,_V_.proxy(this.player,this.eventHandler))})},removeTriggers:function(){_V_.each.call(this,_V_.html5.events,function(type){_V_.removeEvent(this.el,type,_V_.proxy(this.player,this.eventHandler))})},eventHandler:function(e){e.stopPropagation();this.triggerEvent(e)},play:function(){this.el.play()},pause:function(){this.el.pause()},paused:function(){return this.el.paused},currentTime:function(){return this.el.currentTime},setCurrentTime:function(seconds){try{this.el.currentTime=seconds}catch(e){_V_.log(e,"Video isn't ready. (VideoJS)")}},duration:function(){return this.el.duration||0},buffered:function(){return this.el.buffered},volume:function(){return this.el.volume},setVolume:function(percentAsDecimal){this.el.volume=percentAsDecimal},muted:function(){return this.el.muted},setMuted:function(muted){this.el.muted=muted},width:function(){return this.el.offsetWidth},height:function(){return this.el.offsetHeight},supportsFullScreen:function(){if(typeof this.el.webkitEnterFullScreen=="function"){if(!navigator.userAgent.match("Chrome")&&!navigator.userAgent.match("Mac OS X 10.5")){return true}}return false},enterFullScreen:function(){try{this.el.webkitEnterFullScreen()}catch(e){if(e.code==11){_V_.log("VideoJS: Video not ready.")}}},src:function(src){this.el.src=src},load:function(){this.el.load()},currentSrc:function(){return this.el.currentSrc},preload:function(){return this.el.preload},setPreload:function(val){this.el.preload=val},autoplay:function(){return this.el.autoplay},setAutoplay:function(val){this.el.autoplay=val},loop:function(){return this.el.loop},setLoop:function(val){this.el.loop=val},error:function(){return this.el.error},seeking:function(){return this.el.seeking},ended:function(){return this.el.ended},controls:function(){return this.player.options.controls},defaultMuted:function(){return this.el.defaultMuted}});_V_.html5.isSupported=function(){return !!document.createElement("video").canPlayType};_V_.html5.canPlaySource=function(srcObj){return !!document.createElement("video").canPlayType(srcObj.type)};_V_.html5.events="loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange".split(",");_V_.html5.prototype.support={fullscreen:(typeof _V_.testVid.webkitEnterFullScreen!==undefined)?(!_V_.ua.match("Chrome")&&!_V_.ua.match("Mac OS X 10.5")?true:false):false,movingElementInDOM:!_V_.isIOS()};if(_V_.isAndroid()){if(_V_.androidVersion()<3){document.createElement("video").constructor.prototype.canPlayType=function(type){return(type&&type.toLowerCase().indexOf("video/mp4")!=-1)?"maybe":""}}}_V_.flash=_V_.PlaybackTech.extend({init:function(player,options){this.player=player;var source=options.source,parentEl=options.parentEl,placeHolder=this.el=_V_.createElement("div",{id:parentEl.id+"_temp_flash"}),objId=player.el.id+"_flash_api",playerOptions=player.options,flashVars=_V_.merge({readyFunction:"_V_.flash.onReady",eventProxyFunction:"_V_.flash.onEvent",errorEventProxyFunction:"_V_.flash.onError",autoplay:playerOptions.autoplay,preload:playerOptions.preload,loop:playerOptions.loop,muted:playerOptions.muted},options.flashVars),params=_V_.merge({wmode:"opaque",bgcolor:"#000000"},options.params),attributes=_V_.merge({id:objId,name:objId,"class":"vjs-tech"},options.attributes);if(source){flashVars.src=encodeURIComponent(_V_.getAbsoluteURL(source.src))}_V_.insertFirst(placeHolder,parentEl);if(options.startTime){this.ready(function(){this.load();this.play();this.currentTime(options.startTime)})}if(options.iFrameMode==true&&!_V_.isFF){var iFrm=_V_.createElement("iframe",{id:objId+"_iframe",name:objId+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});flashVars.readyFunction="ready";flashVars.eventProxyFunction="events";flashVars.errorEventProxyFunction="errors";_V_.addEvent(iFrm,"load",_V_.proxy(this,function(){var iDoc,objTag,swfLoc,iWin=iFrm.contentWindow,varString="";iDoc=iFrm.contentDocument?iFrm.contentDocument:iFrm.contentWindow.document;iDoc.write(_V_.flash.getEmbedCode(options.swf,flashVars,params,attributes));iWin.player=this.player;iWin.ready=_V_.proxy(this.player,function(currSwf){var el=iDoc.getElementById(currSwf),player=this,tech=player.tech;tech.el=el;_V_.addEvent(el,"click",tech.proxy(tech.onClick));_V_.flash.checkReady(tech)});iWin.events=_V_.proxy(this.player,function(swfID,eventName,other){var player=this;if(player&&player.techName=="flash"){player.triggerEvent(eventName)}});iWin.errors=_V_.proxy(this.player,function(swfID,eventName){_V_.log("Flash Error",eventName)})}));placeHolder.parentNode.replaceChild(iFrm,placeHolder)}else{_V_.flash.embed(options.swf,placeHolder,flashVars,params,attributes)}},destroy:function(){this.el.parentNode.removeChild(this.el)},play:function(){this.el.vjs_play()},pause:function(){this.el.vjs_pause()},src:function(src){src=_V_.getAbsoluteURL(src);this.el.vjs_src(src);if(this.player.autoplay()){var tech=this;setTimeout(function(){tech.play()},0)}},load:function(){this.el.vjs_load()},poster:function(){this.el.vjs_getProperty("poster")},buffered:function(){return _V_.createTimeRange(0,this.el.vjs_getProperty("buffered"))},supportsFullScreen:function(){return false},enterFullScreen:function(){return false}});(function(){var api=_V_.flash.prototype,readWrite="preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted".split(","),readOnly="error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks".split(","),callOnly="load,play,pause".split(",");createSetter=function(attr){var attrUpper=attr.charAt(0).toUpperCase()+attr.slice(1);api["set"+attrUpper]=function(val){return this.el.vjs_setProperty(attr,val)}},createGetter=function(attr){api[attr]=function(){return this.el.vjs_getProperty(attr)}};_V_.each(readWrite,function(attr){createGetter(attr);createSetter(attr)});_V_.each(readOnly,function(attr){createGetter(attr)})})();_V_.flash.isSupported=function(){return _V_.flash.version()[0]>=10};_V_.flash.canPlaySource=function(srcObj){if(srcObj.type in _V_.flash.prototype.support.formats){return"maybe"}};_V_.flash.prototype.support={formats:{"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"},progressEvent:false,timeupdateEvent:false,fullscreenResize:false,parentResize:!(_V_.ua.match("Firefox"))};_V_.flash.onReady=function(currSwf){var el=_V_.el(currSwf);var player=el.player||el.parentNode.player,tech=player.tech;el.player=player;tech.el=el;tech.addEvent("click",tech.onClick);_V_.flash.checkReady(tech)};_V_.flash.checkReady=function(tech){if(tech.el.vjs_getProperty){tech.triggerReady()}else{setTimeout(function(){_V_.flash.checkReady(tech)},50)}};_V_.flash.onEvent=function(swfID,eventName){var player=_V_.el(swfID).player;player.triggerEvent(eventName)};_V_.flash.onError=function(swfID,err){var player=_V_.el(swfID).player;player.triggerEvent("error");_V_.log("Flash Error",err,swfID)};_V_.flash.version=function(){var version="0,0,0";try{version=new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(e){try{if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){version=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}}catch(e){}}return version.split(",")};_V_.flash.embed=function(swf,placeHolder,flashVars,params,attributes){var code=_V_.flash.getEmbedCode(swf,flashVars,params,attributes),obj=_V_.createElement("div",{innerHTML:code}).childNodes[0],par=placeHolder.parentNode;placeHolder.parentNode.replaceChild(obj,placeHolder);if(_V_.isIE()){var newObj=par.childNodes[0];setTimeout(function(){newObj.style.display="block"},1000)}return obj};_V_.flash.getEmbedCode=function(swf,flashVars,params,attributes){var objTag='<object type="application/x-shockwave-flash"',flashVarsString="",paramsString="";attrsString="";if(flashVars){_V_.eachProp(flashVars,function(key,val){flashVarsString+=(key+"="+val+"&")})}params=_V_.merge({movie:swf,flashvars:flashVarsString,allowScriptAccess:"always",allowNetworking:"all"},params);_V_.eachProp(params,function(key,val){paramsString+='<param name="'+key+'" value="'+val+'" />'});attributes=_V_.merge({data:swf,width:"100%",height:"100%"},attributes);_V_.eachProp(attributes,function(key,val){attrsString+=(key+'="'+val+'" ')});return objTag+attrsString+">"+paramsString+"</object>"};_V_.Control=_V_.Component.extend({buildCSSClass:function(){return"vjs-control "+this._super()}});_V_.ControlBar=_V_.Component.extend({options:{loadEvent:"play",components:{playToggle:{},fullscreenToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},volumeControl:{},muteToggle:{}}},init:function(player,options){this._super(player,options);player.one("play",this.proxy(function(){this.fadeIn();this.player.addEvent("mouseover",this.proxy(this.fadeIn));this.player.addEvent("mouseout",this.proxy(this.fadeOut))}))},createElement:function(){return _V_.createElement("div",{className:"vjs-controls"})},fadeIn:function(){this._super();this.player.triggerEvent("controlsvisible")},fadeOut:function(){this._super();this.player.triggerEvent("controlshidden")},lockShowing:function(){this.el.style.opacity="1"}});_V_.Button=_V_.Control.extend({init:function(player,options){this._super(player,options);this.addEvent("click",this.onClick);this.addEvent("focus",this.onFocus);this.addEvent("blur",this.onBlur)},createElement:function(type,attrs){attrs=_V_.merge({className:this.buildCSSClass(),innerHTML:'<div><span class="vjs-control-text">'+(this.buttonText||"Need Text")+"</span></div>",role:"button",tabIndex:0},attrs);return this._super(type,attrs)},onClick:function(){},onFocus:function(){_V_.addEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))},onKeyPress:function(event){if(event.which==32||event.which==13){event.preventDefault();this.onClick()}},onBlur:function(){_V_.removeEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))}});_V_.PlayButton=_V_.Button.extend({buttonText:"Play",buildCSSClass:function(){return"vjs-play-button "+this._super()},onClick:function(){this.player.play()}});_V_.PauseButton=_V_.Button.extend({buttonText:"Pause",buildCSSClass:function(){return"vjs-pause-button "+this._super()},onClick:function(){this.player.pause()}});_V_.PlayToggle=_V_.Button.extend({buttonText:"Play",init:function(player,options){this._super(player,options);player.addEvent("play",_V_.proxy(this,this.onPlay));player.addEvent("pause",_V_.proxy(this,this.onPause))},buildCSSClass:function(){return"vjs-play-control "+this._super()},onClick:function(){if(this.player.paused()){this.player.play()}else{this.player.pause()}},onPlay:function(){_V_.removeClass(this.el,"vjs-paused");_V_.addClass(this.el,"vjs-playing")},onPause:function(){_V_.removeClass(this.el,"vjs-playing");_V_.addClass(this.el,"vjs-paused")}});_V_.FullscreenToggle=_V_.Button.extend({buttonText:"Fullscreen",buildCSSClass:function(){return"vjs-fullscreen-control "+this._super()},onClick:function(){if(!this.player.isFullScreen){this.player.requestFullScreen()}else{this.player.cancelFullScreen()}}});_V_.BigPlayButton=_V_.Button.extend({init:function(player,options){this._super(player,options);player.addEvent("play",_V_.proxy(this,this.hide));player.addEvent("ended",_V_.proxy(this,this.show))},createElement:function(){return this._super("div",{className:"vjs-big-play-button",innerHTML:"<span></span>"})},onClick:function(){if(this.player.currentTime()){this.player.currentTime(0)}this.player.play()}});_V_.LoadingSpinner=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("canplay",_V_.proxy(this,this.hide));player.addEvent("canplaythrough",_V_.proxy(this,this.hide));player.addEvent("playing",_V_.proxy(this,this.hide));player.addEvent("seeking",_V_.proxy(this,this.show));player.addEvent("seeked",_V_.proxy(this,this.hide));player.addEvent("error",_V_.proxy(this,this.show));player.addEvent("waiting",_V_.proxy(this,this.show))},createElement:function(){var classNameSpinner,innerHtmlSpinner;if(typeof this.player.el.style.WebkitBorderRadius=="string"||typeof this.player.el.style.MozBorderRadius=="string"||typeof this.player.el.style.KhtmlBorderRadius=="string"||typeof this.player.el.style.borderRadius=="string"){classNameSpinner="vjs-loading-spinner";innerHtmlSpinner="<div class='ball1'></div><div class='ball2'></div><div class='ball3'></div><div class='ball4'></div><div class='ball5'></div><div class='ball6'></div><div class='ball7'></div><div class='ball8'></div>"}else{classNameSpinner="vjs-loading-spinner-fallback";innerHtmlSpinner=""}return this._super("div",{className:classNameSpinner,innerHTML:innerHtmlSpinner})}});_V_.CurrentTimeDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-current-time-display",innerHTML:"0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){var time=(this.player.scrubbing)?this.player.values.currentTime:this.player.currentTime();this.content.innerHTML=_V_.formatTime(time,this.player.duration())}});_V_.DurationDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-duration vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-duration-display",innerHTML:"0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){if(this.player.duration()){this.content.innerHTML=_V_.formatTime(this.player.duration())}}});_V_.TimeDivider=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})}});_V_.RemainingTimeDisplay=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("timeupdate",_V_.proxy(this,this.updateContent))},createElement:function(){var el=this._super("div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.content=_V_.createElement("div",{className:"vjs-remaining-time-display",innerHTML:"-0:00"});el.appendChild(_V_.createElement("div").appendChild(this.content));return el},updateContent:function(){if(this.player.duration()){this.content.innerHTML="-"+_V_.formatTime(this.player.remainingTime())}}});_V_.Slider=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent(this.playerEvent,_V_.proxy(this,this.update));this.addEvent("mousedown",this.onMouseDown);this.addEvent("focus",this.onFocus);this.addEvent("blur",this.onBlur);this.player.addEvent("controlsvisible",this.proxy(this.update));this.update()},createElement:function(type,attrs){attrs=_V_.merge({role:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},attrs);return this._super(type,attrs)},onMouseDown:function(event){event.preventDefault();_V_.blockTextSelection();_V_.addEvent(document,"mousemove",_V_.proxy(this,this.onMouseMove));_V_.addEvent(document,"mouseup",_V_.proxy(this,this.onMouseUp));this.onMouseMove(event)},onMouseUp:function(event){_V_.unblockTextSelection();_V_.removeEvent(document,"mousemove",this.onMouseMove,false);_V_.removeEvent(document,"mouseup",this.onMouseUp,false);this.update()},update:function(){var barProgress,progress=this.getPercent();handle=this.handle,bar=this.bar;if(isNaN(progress)){progress=0}barProgress=progress;if(handle){var box=this.el,boxWidth=box.offsetWidth,handleWidth=handle.el.offsetWidth,handlePercent=(handleWidth)?handleWidth/boxWidth:0,boxAdjustedPercent=1-handlePercent;adjustedProgress=progress*boxAdjustedPercent,barProgress=adjustedProgress+(handlePercent/2);handle.el.style.left=_V_.round(adjustedProgress*100,2)+"%"}bar.el.style.width=_V_.round(barProgress*100,2)+"%"},calculateDistance:function(event){var box=this.el,boxX=_V_.findPosX(box),boxW=box.offsetWidth,handle=this.handle;if(handle){var handleW=handle.el.offsetWidth;boxX=boxX+(handleW/2);boxW=boxW-handleW}return Math.max(0,Math.min(1,(event.pageX-boxX)/boxW))},onFocus:function(event){_V_.addEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))},onKeyPress:function(event){if(event.which==37){event.preventDefault();this.stepBack()}else{if(event.which==39){event.preventDefault();this.stepForward()}}},onBlur:function(event){_V_.removeEvent(document,"keyup",_V_.proxy(this,this.onKeyPress))}});_V_.ProgressControl=_V_.Component.extend({options:{components:{seekBar:{}}},createElement:function(){return this._super("div",{className:"vjs-progress-control vjs-control"})}});_V_.SeekBar=_V_.Slider.extend({options:{components:{loadProgressBar:{},bar:{componentClass:"PlayProgressBar"},handle:{componentClass:"SeekHandle"}}},playerEvent:"timeupdate",init:function(player,options){this._super(player,options)},createElement:function(){return this._super("div",{className:"vjs-progress-holder"})},getPercent:function(){return this.player.currentTime()/this.player.duration()},onMouseDown:function(event){this._super(event);this.player.scrubbing=true;this.videoWasPlaying=!this.player.paused();this.player.pause()},onMouseMove:function(event){var newTime=this.calculateDistance(event)*this.player.duration();if(newTime==this.player.duration()){newTime=newTime-0.1}this.player.currentTime(newTime)},onMouseUp:function(event){this._super(event);this.player.scrubbing=false;if(this.videoWasPlaying){this.player.play()}},stepForward:function(){this.player.currentTime(this.player.currentTime()+1)},stepBack:function(){this.player.currentTime(this.player.currentTime()-1)}});_V_.LoadProgressBar=_V_.Component.extend({init:function(player,options){this._super(player,options);player.addEvent("progress",_V_.proxy(this,this.update))},createElement:function(){return this._super("div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})},update:function(){if(this.el.style){this.el.style.width=_V_.round(this.player.bufferedPercent()*100,2)+"%"}}});_V_.PlayProgressBar=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})}});_V_.SeekHandle=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-seek-handle",innerHTML:'<span class="vjs-control-text">00:00</span>'})}});_V_.VolumeControl=_V_.Component.extend({options:{components:{volumeBar:{}}},createElement:function(){return this._super("div",{className:"vjs-volume-control vjs-control"})}});_V_.VolumeBar=_V_.Slider.extend({options:{components:{bar:{componentClass:"VolumeLevel"},handle:{componentClass:"VolumeHandle"}}},playerEvent:"volumechange",createElement:function(){return this._super("div",{className:"vjs-volume-bar"})},onMouseMove:function(event){this.player.volume(this.calculateDistance(event))},getPercent:function(){return this.player.volume()},stepForward:function(){this.player.volume(this.player.volume()+0.1)},stepBack:function(){this.player.volume(this.player.volume()-0.1)}});_V_.VolumeLevel=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})}});_V_.VolumeHandle=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-volume-handle",innerHTML:'<span class="vjs-control-text"></span>'})}});_V_.MuteToggle=_V_.Button.extend({init:function(player,options){this._super(player,options);player.addEvent("volumechange",_V_.proxy(this,this.update))},createElement:function(){return this._super("div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})},onClick:function(event){this.player.muted(this.player.muted()?false:true)},update:function(event){var vol=this.player.volume(),level=3;if(vol==0||this.player.muted()){level=0}else{if(vol<0.33){level=1}else{if(vol<0.67){level=2}}}_V_.each.call(this,[0,1,2,3],function(i){_V_.removeClass(this.el,"vjs-vol-"+i)});_V_.addClass(this.el,"vjs-vol-"+level)}});_V_.PosterImage=_V_.Button.extend({init:function(player,options){this._super(player,options);if(!this.player.options.poster){this.hide()}player.addEvent("play",_V_.proxy(this,this.hide))},createElement:function(){return _V_.createElement("img",{className:"vjs-poster",src:this.player.options.poster,tabIndex:-1})},onClick:function(){this.player.play()}});_V_.Menu=_V_.Component.extend({init:function(player,options){this._super(player,options)},addItem:function(component){this.addComponent(component);component.addEvent("click",this.proxy(function(){this.unlockShowing()}))},createElement:function(){return this._super("ul",{className:"vjs-menu"})}});_V_.MenuItem=_V_.Button.extend({init:function(player,options){this._super(player,options);if(options.selected){this.addClass("vjs-selected")}},createElement:function(type,attrs){return this._super("li",_V_.merge({className:"vjs-menu-item",innerHTML:this.options.label},attrs))},onClick:function(){this.selected(true)},selected:function(selected){if(selected){this.addClass("vjs-selected")}else{this.removeClass("vjs-selected")}}});_V_.merge(_V_.Player.prototype,{addTextTracks:function(trackObjects){var tracks=this.textTracks=(this.textTracks)?this.textTracks:[],i=0,j=trackObjects.length,track,Kind;for(;i<j;i++){Kind=_V_.uc(trackObjects[i].kind||"subtitles");track=new _V_[Kind+"Track"](this,trackObjects[i]);tracks.push(track);if(track["default"]){this.ready(_V_.proxy(track,track.show))}}return this},showTextTrack:function(id,disableSameKind){var tracks=this.textTracks,i=0,j=tracks.length,track,showTrack,kind;for(;i<j;i++){track=tracks[i];if(track.id===id){track.show();showTrack=track}else{if(disableSameKind&&track.kind==disableSameKind&&track.mode>0){track.disable()}}}kind=(showTrack)?showTrack.kind:((disableSameKind)?disableSameKind:false);if(kind){this.triggerEvent(kind+"trackchange")}return this}});_V_.Track=_V_.Component.extend({init:function(player,options){this._super(player,options);_V_.merge(this,{id:options.id||("vjs_"+options.kind+"_"+options.language+"_"+_V_.guid++),src:options.src,"default":options["default"],title:options.title,language:options.srclang,label:options.label,cues:[],activeCues:[],readyState:0,mode:0})},createElement:function(){return this._super("div",{className:"vjs-"+this.kind+" vjs-text-track"})},show:function(){this.activate();this.mode=2;this._super()},hide:function(){this.activate();this.mode=1;this._super()},disable:function(){if(this.mode==2){this.hide()}this.deactivate();this.mode=0},activate:function(){if(this.readyState==0){this.load()}if(this.mode==0){this.player.addEvent("timeupdate",this.proxy(this.update,this.id));this.player.addEvent("ended",this.proxy(this.reset,this.id));if(this.kind=="captions"||this.kind=="subtitles"){this.player.textTrackDisplay.addComponent(this)}}},deactivate:function(){this.player.removeEvent("timeupdate",this.proxy(this.update,this.id));this.player.removeEvent("ended",this.proxy(this.reset,this.id));this.reset();this.player.textTrackDisplay.removeComponent(this)},load:function(){if(this.readyState==0){this.readyState=1;_V_.get(this.src,this.proxy(this.parseCues),this.proxy(this.onError))}},onError:function(err){this.error=err;this.readyState=3;this.triggerEvent("error")},parseCues:function(srcContent){var cue,time,text,lines=srcContent.split("\n"),line="",id;for(var i=1,j=lines.length;i<j;i++){line=_V_.trim(lines[i]);if(line){if(line.indexOf("-->")==-1){id=line;line=_V_.trim(lines[++i])}else{id=this.cues.length}cue={id:id,index:this.cues.length};time=line.split(" --> ");cue.startTime=this.parseCueTime(time[0]);cue.endTime=this.parseCueTime(time[1]);text=[];while(lines[++i]&&(line=_V_.trim(lines[i]))){text.push(line)}cue.text=text.join("<br/>");this.cues.push(cue)}}this.readyState=2;this.triggerEvent("loaded")},parseCueTime:function(timeText){var parts=timeText.split(":"),time=0,hours,minutes,other,seconds,ms,flags;if(parts.length==3){hours=parts[0];minutes=parts[1];other=parts[2]}else{hours=0;minutes=parts[0];other=parts[1]}other=other.split(/\s+/);seconds=other.splice(0,1)[0];seconds=seconds.split(/\.|,/);ms=parseFloat(seconds[1]);seconds=seconds[0];time+=parseFloat(hours)*3600;time+=parseFloat(minutes)*60;time+=parseFloat(seconds);if(ms){time+=ms/1000}return time},update:function(){if(this.cues.length>0){var time=this.player.currentTime();if(this.prevChange===undefined||time<this.prevChange||this.nextChange<=time){var cues=this.cues,newNextChange=this.player.duration(),newPrevChange=0,reverse=false,newCues=[],firstActiveIndex,lastActiveIndex,html="",cue,i,j;if(time>=this.nextChange||this.nextChange===undefined){i=(this.firstActiveIndex!==undefined)?this.firstActiveIndex:0}else{reverse=true;i=(this.lastActiveIndex!==undefined)?this.lastActiveIndex:cues.length-1}while(true){cue=cues[i];if(cue.endTime<=time){newPrevChange=Math.max(newPrevChange,cue.endTime);if(cue.active){cue.active=false}}else{if(time<cue.startTime){newNextChange=Math.min(newNextChange,cue.startTime);if(cue.active){cue.active=false}if(!reverse){break}}else{if(reverse){newCues.splice(0,0,cue);if(lastActiveIndex===undefined){lastActiveIndex=i}firstActiveIndex=i}else{newCues.push(cue);if(firstActiveIndex===undefined){firstActiveIndex=i}lastActiveIndex=i}newNextChange=Math.min(newNextChange,cue.endTime);newPrevChange=Math.max(newPrevChange,cue.startTime);cue.active=true}}if(reverse){if(i===0){break}else{i--}}else{if(i===cues.length-1){break}else{i++}}}this.activeCues=newCues;this.nextChange=newNextChange;this.prevChange=newPrevChange;this.firstActiveIndex=firstActiveIndex;this.lastActiveIndex=lastActiveIndex;this.updateDisplay();this.triggerEvent("cuechange")}}},updateDisplay:function(){var cues=this.activeCues,html="",i=0,j=cues.length;for(;i<j;i++){html+="<span class='vjs-tt-cue'>"+cues[i].text+"</span>"}this.el.innerHTML=html},reset:function(){this.nextChange=0;this.prevChange=this.player.duration();this.firstActiveIndex=0;this.lastActiveIndex=0}});_V_.CaptionsTrack=_V_.Track.extend({kind:"captions"});_V_.SubtitlesTrack=_V_.Track.extend({kind:"subtitles"});_V_.ChaptersTrack=_V_.Track.extend({kind:"chapters"});_V_.TextTrackDisplay=_V_.Component.extend({createElement:function(){return this._super("div",{className:"vjs-text-track-display"})}});_V_.TextTrackMenuItem=_V_.MenuItem.extend({init:function(player,options){var track=this.track=options.track;options.label=track.label;options.selected=track["default"];this._super(player,options);this.player.addEvent(track.kind+"trackchange",_V_.proxy(this,this.update))},onClick:function(){this._super();this.player.showTextTrack(this.track.id,this.track.kind)},update:function(){if(this.track.mode==2){this.selected(true)}else{this.selected(false)}}});_V_.OffTextTrackMenuItem=_V_.TextTrackMenuItem.extend({init:function(player,options){options.track={kind:options.kind,player:player,label:"Off"};this._super(player,options)},onClick:function(){this._super();this.player.showTextTrack(this.track.id,this.track.kind)},update:function(){var tracks=this.player.textTracks,i=0,j=tracks.length,track,off=true;for(;i<j;i++){track=tracks[i];if(track.kind==this.track.kind&&track.mode==2){off=false}}if(off){this.selected(true)}else{this.selected(false)}}});_V_.TextTrackButton=_V_.Button.extend({init:function(player,options){this._super(player,options);this.menu=this.createMenu();if(this.items.length===0){this.hide()}},createMenu:function(){var menu=new _V_.Menu(this.player);menu.el.appendChild(_V_.createElement("li",{className:"vjs-menu-title",innerHTML:_V_.uc(this.kind)}));menu.addItem(new _V_.OffTextTrackMenuItem(this.player,{kind:this.kind}));this.items=this.createItems();this.each(this.items,function(item){menu.addItem(item)});this.addComponent(menu);return menu},createItems:function(){var items=[];this.each(this.player.textTracks,function(track){if(track.kind===this.kind){items.push(new _V_.TextTrackMenuItem(this.player,{track:track}))}});return items},buildCSSClass:function(){return this.className+" vjs-menu-button "+this._super()},onFocus:function(){this.menu.lockShowing();_V_.one(this.menu.el.childNodes[this.menu.el.childNodes.length-1],"blur",this.proxy(function(){this.menu.unlockShowing()}))},onBlur:function(){},onClick:function(){this.one("mouseout",this.proxy(function(){this.menu.unlockShowing();this.el.blur()}))}});_V_.CaptionsButton=_V_.TextTrackButton.extend({kind:"captions",buttonText:"Captions",className:"vjs-captions-button"});_V_.SubtitlesButton=_V_.TextTrackButton.extend({kind:"subtitles",buttonText:"Subtitles",className:"vjs-subtitles-button"});_V_.ChaptersButton=_V_.TextTrackButton.extend({kind:"chapters",buttonText:"Chapters",className:"vjs-chapters-button",createItems:function(chaptersTrack){var items=[];this.each(this.player.textTracks,function(track){if(track.kind===this.kind){items.push(new _V_.TextTrackMenuItem(this.player,{track:track}))}});return items},createMenu:function(){var tracks=this.player.textTracks,i=0,j=tracks.length,track,chaptersTrack,items=this.items=[];for(;i<j;i++){track=tracks[i];if(track.kind==this.kind&&track["default"]){if(track.readyState<2){this.chaptersTrack=track;track.addEvent("loaded",this.proxy(this.createMenu));return}else{chaptersTrack=track;break}}}var menu=this.menu=new _V_.Menu(this.player);menu.el.appendChild(_V_.createElement("li",{className:"vjs-menu-title",innerHTML:_V_.uc(this.kind)}));if(chaptersTrack){var cues=chaptersTrack.cues,i=0,j=cues.length,cue,mi;for(;i<j;i++){cue=cues[i];mi=new _V_.ChaptersTrackMenuItem(this.player,{track:chaptersTrack,cue:cue});items.push(mi);menu.addComponent(mi)}}this.addComponent(menu);if(this.items.length>0){this.show()}return menu}});_V_.ChaptersTrackMenuItem=_V_.MenuItem.extend({init:function(player,options){var track=this.track=options.track,cue=this.cue=options.cue,currentTime=player.currentTime();options.label=cue.text;options.selected=(cue.startTime<=currentTime&¤tTime<cue.endTime);this._super(player,options);track.addEvent("cuechange",_V_.proxy(this,this.update))},onClick:function(){this._super();this.player.currentTime(this.cue.startTime);this.update(this.cue.startTime)},update:function(time){var cue=this.cue,currentTime=this.player.currentTime();if(cue.startTime<=currentTime&¤tTime<cue.endTime){this.selected(true)}else{this.selected(false)}}});_V_.merge(_V_.ControlBar.prototype.options.components,{subtitlesButton:{},captionsButton:{},chaptersButton:{}});_V_.autoSetup=function(){var options,vid,player,vids=document.getElementsByTagName("video");if(vids&&vids.length>0){for(var i=0,j=vids.length;i<j;i++){vid=vids[i];if(vid&&vid.getAttribute){if(vid.player===undefined){options=vid.getAttribute("data-setup");if(options!==null){options=JSON.parse(options||"{}");player=_V_(vid,options)}}}else{_V_.autoSetupTimeout(1);break}}}else{if(!_V_.windowLoaded){_V_.autoSetupTimeout(1)}}};_V_.autoSetupTimeout=function(wait){setTimeout(_V_.autoSetup,wait)};_V_.addEvent(window,"load",function(){_V_.windowLoaded=true});_V_.autoSetup();window.VideoJS=window._V_=VideoJS})(window);
\ No newline at end of file diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py index 94629775..3594c909 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.5.0.dev" +__version__ = "0.6.0.dev" diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py index 2a6abb47..7a688a49 100644 --- a/mediagoblin/auth/routing.py +++ b/mediagoblin/auth/routing.py @@ -25,9 +25,4 @@ auth_routes = [ ('mediagoblin.auth.verify_email', '/verify_email/', 'mediagoblin.auth.views:verify_email'), ('mediagoblin.auth.resend_verification', '/resend_verification/', - 'mediagoblin.auth.views:resend_activation'), - ('mediagoblin.auth.forgot_password', '/forgot_password/', - 'mediagoblin.auth.views:forgot_password'), - ('mediagoblin.auth.verify_forgot_password', - '/forgot_password/verify/', - 'mediagoblin.auth.views:verify_forgot_password')] + 'mediagoblin.auth.views:resend_activation')] diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py index 579775ff..20c1f5c2 100644 --- a/mediagoblin/auth/tools.py +++ b/mediagoblin/auth/tools.py @@ -101,38 +101,6 @@ def send_verification_email(user, request, email=None, rendered_email) -EMAIL_FP_VERIFICATION_TEMPLATE = ( - u"{uri}?" - u"token={fp_verification_key}") - - -def send_fp_verification_email(user, request): - """ - Send the verification email to users to change their password. - - Args: - - user: a user object - - request: the request - """ - fp_verification_key = get_timed_signer_url('mail_verification_token') \ - .dumps(user.id) - - rendered_email = render_template( - request, 'mediagoblin/auth/fp_verification_email.txt', - {'username': user.username, - 'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format( - uri=request.urlgen('mediagoblin.auth.verify_forgot_password', - qualified=True), - fp_verification_key=fp_verification_key)}) - - # TODO: There is no error handling in place - send_email( - mg_globals.app_config['email_sender_address'], - [user.email], - 'GNU MediaGoblin - Change forgotten password!', - rendered_email) - - def basic_extra_validation(register_form, *args): users_with_username = User.query.filter_by( username=register_form.username.data).count() @@ -196,7 +164,10 @@ def check_auth_enabled(): def no_auth_logout(request): - """Log out the user if authentication_disabled, but don't delete the messages""" + """ + Log out the user if no authentication is enabled, but don't delete + the messages + """ if not mg_globals.app.auth and 'user_id' in request.session: del request.session['user_id'] request.session.save() diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index dd71d5c1..8563195f 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -24,11 +24,8 @@ from mediagoblin.tools.response import render_to_response, redirect, render_404 from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.mail import email_debug_message from mediagoblin.tools.pluginapi import hook_handle -from mediagoblin.auth import forms as auth_forms from mediagoblin.auth.tools import (send_verification_email, register_user, - send_fp_verification_email, check_login_simple) -from mediagoblin import auth @allow_registration @@ -338,7 +335,7 @@ def verify_forgot_password(request): messages.add_message( request, messages.ERROR, _('You are no longer an active user. Please contact the system' - ' admin to reactivate your accoutn.')) + ' admin to reactivate your account.')) return redirect( request, 'index') diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 43e1898c..6f318d64 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -75,6 +75,12 @@ theme = string() plugin_web_path = string(default="/plugin_static/") plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/") +# Default user upload limit (in Mb) +upload_limit = integer(default=None) + +# Max file size (in Mb) +max_file_size = integer(default=None) + [jinja2] # Jinja2 supports more directives than the minimum required by mediagoblin. # This setting allows users creating custom templates to specify a list of diff --git a/mediagoblin/db/extratypes.py b/mediagoblin/db/extratypes.py index f2304af0..8e04d58d 100644 --- a/mediagoblin/db/extratypes.py +++ b/mediagoblin/db/extratypes.py @@ -15,6 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +from sqlalchemy.ext.mutable import Mutable from sqlalchemy.types import TypeDecorator, Unicode, TEXT import json @@ -38,7 +39,7 @@ class PathTupleWithSlashes(TypeDecorator): return value -# The following class and only this one class is in very +# The following two classes and only these two classes is in very # large parts based on example code from sqlalchemy. # # The original copyright notice and license follows: @@ -61,3 +62,30 @@ class JSONEncoded(TypeDecorator): if value is not None: value = json.loads(value) return value + + +class MutationDict(Mutable, dict): + @classmethod + def coerce(cls, key, value): + "Convert plain dictionaries to MutationDict." + + if not isinstance(value, MutationDict): + if isinstance(value, dict): + return MutationDict(value) + + # this call will raise ValueError + return Mutable.coerce(key, value) + else: + return value + + def __setitem__(self, key, value): + "Detect dictionary set events and emit change events." + + dict.__setitem__(self, key, value) + self.changed() + + def __delitem__(self, key): + "Detect dictionary del events and emit change events." + + dict.__delitem__(self, key) + self.changed() diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 62fb7e8d..423508f6 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -26,7 +26,7 @@ from sqlalchemy.sql import and_ from migrate.changeset.constraint import UniqueConstraint -from mediagoblin.db.extratypes import JSONEncoded +from mediagoblin.db.extratypes import JSONEncoded, MutationDict from mediagoblin.db.migration_tools import RegisterMigration, inspect_table from mediagoblin.db.models import MediaEntry, Collection, User, MediaComment @@ -474,3 +474,35 @@ def wants_notifications(db): col.create(user_table) db.commit() + + +@RegisterMigration(16, MIGRATIONS) +def upload_limits(db): + """Add user upload limit columns""" + metadata = MetaData(bind=db.bind) + + user_table = inspect_table(metadata, 'core__users') + media_entry_table = inspect_table(metadata, 'core__media_entries') + + col = Column('uploaded', Integer, default=0) + col.create(user_table) + + col = Column('upload_limit', Integer) + col.create(user_table) + + col = Column('file_size', Integer, default=0) + col.create(media_entry_table) + + db.commit() + + +@RegisterMigration(17, MIGRATIONS) +def add_file_metadata(db): + """Add file_metadata to MediaFile""" + metadata = MetaData(bind=db.bind) + media_file_table = inspect_table(metadata, "core__mediafiles") + + col = Column('file_metadata', MutationDict.as_mutable(JSONEncoded)) + col.create(media_file_table) + + db.commit() diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 4341e086..68a2faa0 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -30,8 +30,8 @@ from sqlalchemy.sql.expression import desc from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.util import memoized_property - -from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded +from mediagoblin.db.extratypes import (PathTupleWithSlashes, JSONEncoded, + MutationDict) from mediagoblin.db.base import Base, DictReadAttrProxy from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \ MediaCommentMixin, CollectionMixin, CollectionItemMixin @@ -48,6 +48,7 @@ from migrate import changeset _log = logging.getLogger(__name__) + class User(Base, UserMixin): """ TODO: We should consider moving some rarely used fields @@ -74,6 +75,8 @@ class User(Base, UserMixin): is_admin = Column(Boolean, default=False, nullable=False) url = Column(Unicode) bio = Column(UnicodeText) # ?? + uploaded = Column(Integer, default=0) + upload_limit = Column(Integer) ## TODO # plugin data would be in a separate model @@ -190,6 +193,7 @@ class MediaEntry(Base, MediaEntryMixin): # or use sqlalchemy.types.Enum? license = Column(Unicode) collected = Column(Integer, default=0) + file_size = Column(Integer, default=0) fail_error = Column(Unicode) fail_metadata = Column(JSONEncoded) @@ -264,6 +268,35 @@ class MediaEntry(Base, MediaEntryMixin): if media is not None: return media.url_for_self(urlgen) + def get_file_metadata(self, file_key, metadata_key=None): + """ + Return the file_metadata dict of a MediaFile. If metadata_key is given, + return the value of the key. + """ + media_file = MediaFile.query.filter_by(media_entry=self.id, + name=unicode(file_key)).first() + + if media_file: + if metadata_key: + return media_file.file_metadata.get(metadata_key, None) + + return media_file.file_metadata + + def set_file_metadata(self, file_key, **kwargs): + """ + Update the file_metadata of a MediaFile. + """ + media_file = MediaFile.query.filter_by(media_entry=self.id, + name=unicode(file_key)).first() + + file_metadata = media_file.file_metadata or {} + + for key, value in kwargs.iteritems(): + file_metadata[key] = value + + media_file.file_metadata = file_metadata + media_file.save() + @property def media_data(self): return getattr(self, self.media_data_ref) @@ -360,6 +393,7 @@ class MediaFile(Base): nullable=False) name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False) file_path = Column(PathTupleWithSlashes) + file_metadata = Column(MutationDict.as_mutable(JSONEncoded)) __table_args__ = ( PrimaryKeyConstraint('media_entry', 'name_id'), diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 3f1e2386..0832f0db 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -64,7 +64,7 @@ class EditAccountForm(wtforms.Form): wants_comment_notification = wtforms.BooleanField( description=_("Email me when others comment on my media")) wants_notifications = wtforms.BooleanField( - description=_("Enable/Disable insite notifications")) + description=_("Enable insite notifications about events.")) license_preference = wtforms.SelectField( _('License preference'), [ @@ -81,6 +81,7 @@ class EditAttachmentsForm(wtforms.Form): attachment_file = wtforms.FileField( 'File') + class EditCollectionForm(wtforms.Form): title = wtforms.TextField( _('Title'), diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py index 75f5a6d8..a2d03d26 100644 --- a/mediagoblin/edit/routing.py +++ b/mediagoblin/edit/routing.py @@ -24,8 +24,6 @@ add_route('mediagoblin.edit.account', '/edit/account/', 'mediagoblin.edit.views:edit_account') add_route('mediagoblin.edit.delete_account', '/edit/account/delete/', 'mediagoblin.edit.views:delete_account') -add_route('mediagoblin.edit.pass', '/edit/password/', - 'mediagoblin.edit.views:change_pass') add_route('mediagoblin.edit.verify_email', '/edit/verify_email/', 'mediagoblin.edit.views:verify_email') add_route('mediagoblin.edit.email', '/edit/email/', diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index be19bcda..140f9eec 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -23,8 +23,8 @@ from werkzeug.utils import secure_filename from mediagoblin import messages from mediagoblin import mg_globals -from mediagoblin import auth -from mediagoblin.auth import tools as auth_tools +from mediagoblin.auth import (check_password, + tools as auth_tools) from mediagoblin.edit import forms from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import (require_active_login, active_user_from_url, @@ -338,46 +338,6 @@ def edit_collection(request, collection): 'form': form}) -@require_active_login -def change_pass(request): - # If no password authentication, no need to change your password - if 'pass_auth' not in request.template_env.globals: - return redirect(request, 'index') - - form = forms.ChangePassForm(request.form) - user = request.user - - if request.method == 'POST' and form.validate(): - - if not auth.check_password( - form.old_password.data, user.pw_hash): - form.old_password.errors.append( - _('Wrong password')) - - return render_to_response( - request, - 'mediagoblin/edit/change_pass.html', - {'form': form, - 'user': user}) - - # Password matches - user.pw_hash = auth.gen_password_hash( - form.new_password.data) - user.save() - - messages.add_message( - request, messages.SUCCESS, - _('Your password was changed successfully')) - - return redirect(request, 'mediagoblin.edit.account') - - return render_to_response( - request, - 'mediagoblin/edit/change_pass.html', - {'form': form, - 'user': user}) - - def verify_email(request): """ Email verification view for changing email address @@ -442,7 +402,7 @@ def change_email(request): _('Sorry, a user with that email address' ' already exists.')) - if form.password and user.pw_hash and not auth.check_password( + if form.password and user.pw_hash and not check_password( form.password.data, user.pw_hash): form.password.errors.append( _('Wrong password')) diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo Binary files differindex 34643fb6..e3888f1b 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po index b2e82823..efd7d170 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "عÙوًا، التسجيل غير Ù…ØªØ§Ø Ù‡Ù†Ø§." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -52,12 +52,12 @@ msgstr "هذا الØقل ÙŠØتاج ايميل." msgid "Sorry, a user with that name already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الاسم." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الايميل." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -119,7 +119,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -185,7 +185,7 @@ msgid "Email me when others comment on my media" msgstr "ارسل لي رسالة عندما يقوم الاخرون بالتعليق على الميديا خاصتي" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -263,37 +263,37 @@ msgstr "أنت تØرّر مل٠مستخدم آخر. كن Øذرًا أثناء msgid "Profile changes saved" msgstr "تم ØÙظ تغيرات Øسابك" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "تم ØÙظ خصائص Øسابك" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "يجب عليك تأكيد إلغاء Øسابك." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "أنت لديك مجموعة تدعى \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "توجد مجموعة اخرى بهذا المسار لهذا المستخدم." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "أنت تعدل مجموعة مستخدم آخر. كن Øذرًا أثناء العملية." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "كلمة سر خاطئة" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -575,26 +575,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -618,15 +618,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "المل٠المعطى لهذا النوع من الميديا غير صØÙŠØ." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo Binary files differindex 6d2eb885..9ffae8c1 100644 --- a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po index b27a4cba..e669285a 100644 --- a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Yasen Pramatarov <yasen@lindeas.com>, 2013 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mediagoblin/language/bg/)\n" "MIME-Version: 1.0\n" @@ -23,17 +24,17 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" #: mediagoblin/auth/forms.py:25 msgid "Username or email" -msgstr "" +msgstr "ПотребителÑко име или е-поща" #: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." -msgstr "" +msgstr "Ðеправилно потребителÑко име или е-поща." #: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." @@ -47,12 +48,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -105,7 +106,7 @@ msgstr "" #: mediagoblin/auth/views.py:323 msgid "You can now log in using your new password." -msgstr "" +msgstr "Вече може да влезете Ñ Ð½Ð¾Ð²Ð°Ñ‚Ð° Ñи парола." #: mediagoblin/auth/views.py:334 msgid "You need to verify your email before you can reset your password." @@ -114,14 +115,14 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 #: mediagoblin/user_pages/forms.py:45 msgid "Title" -msgstr "" +msgstr "Заглавие" #: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" @@ -134,11 +135,11 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Може да ползвате\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> за форматиране." #: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" -msgstr "" +msgstr "Етикети" #: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." @@ -161,11 +162,11 @@ msgstr "" #: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" -msgstr "" +msgstr "Лиценз" #: mediagoblin/edit/forms.py:52 msgid "Bio" -msgstr "" +msgstr "БиографиÑ" #: mediagoblin/edit/forms.py:58 msgid "Website" @@ -173,14 +174,14 @@ msgstr "" #: mediagoblin/edit/forms.py:60 msgid "This address contains errors" -msgstr "" +msgstr "ÐдреÑÑŠÑ‚ Ñъдържа грешки" #: mediagoblin/edit/forms.py:65 msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -193,12 +194,12 @@ msgstr "" #: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" -msgstr "" +msgstr "Заглавието е задължително" #: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" -msgstr "" +msgstr "ОпиÑание на колекциÑта" #: mediagoblin/edit/forms.py:96 msgid "" @@ -208,7 +209,7 @@ msgstr "" #: mediagoblin/edit/forms.py:103 msgid "Old password" -msgstr "" +msgstr "Стара парола" #: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." @@ -216,18 +217,18 @@ msgstr "" #: mediagoblin/edit/forms.py:108 msgid "New password" -msgstr "" +msgstr "Ðова парола" #: mediagoblin/edit/forms.py:116 msgid "New email address" -msgstr "" +msgstr "Ðов Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща" #: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 #: mediagoblin/tests/test_util.py:110 msgid "Password" -msgstr "" +msgstr "Парола" #: mediagoblin/edit/forms.py:122 msgid "Enter your password to prove you own this account." @@ -256,41 +257,41 @@ msgstr "" #: mediagoblin/edit/views.py:210 msgid "Profile changes saved" -msgstr "" +msgstr "Промените в профила Ñа запазени" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" -msgstr "" +msgstr "ÐаÑтройките на профила Ñа запазени" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" -msgstr "" +msgstr "Грешна парола" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" -msgstr "" +msgstr "Паролата ви е Ñменена уÑпешно" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." -msgstr "" +msgstr "ÐдреÑÑŠÑ‚ на е-пощата ви е проверен." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -365,18 +366,18 @@ msgstr "" #: mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 msgid "Username" -msgstr "" +msgstr "ПотребителÑко име" #: mediagoblin/plugins/basic_auth/forms.py:32 #: mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" -msgstr "" +msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща" #: mediagoblin/plugins/basic_auth/forms.py:39 msgid "Username or Email" -msgstr "" +msgstr "ПотребителÑко име или е-поща" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" @@ -384,32 +385,32 @@ msgstr "" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" -msgstr "" +msgstr "МеÑтоположение" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 #, python-format msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" +msgstr "Разглеждане Ñ <a href=\"%(osm_url)s\">OpenStreetMap</a>" #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" -msgstr "" +msgstr "Позволение" #: mediagoblin/plugins/oauth/forms.py:30 msgid "Deny" -msgstr "" +msgstr "Забрана" #: mediagoblin/plugins/oauth/forms.py:34 msgid "Name" -msgstr "" +msgstr "Име" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" -msgstr "" +msgstr "Име на OAuth клиента" #: mediagoblin/plugins/oauth/forms.py:36 msgid "Description" -msgstr "" +msgstr "ОпиÑание" #: mediagoblin/plugins/oauth/forms.py:38 msgid "" @@ -419,7 +420,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:40 msgid "Type" -msgstr "" +msgstr "Вид" #: mediagoblin/plugins/oauth/forms.py:45 msgid "" @@ -463,7 +464,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/submit/start.html:34 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" -msgstr "" +msgstr "ДобавÑне" #: mediagoblin/plugins/openid/__init__.py:97 #: mediagoblin/plugins/openid/views.py:268 @@ -473,7 +474,7 @@ msgstr "" #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" @@ -487,11 +488,11 @@ msgstr "" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Грешка при проверката на %s: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Проверката е отменена" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." @@ -516,20 +517,20 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "ДобавÑне на OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Изтриване на OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 #: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" -msgstr "" +msgstr "Изтриване" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" @@ -543,12 +544,12 @@ msgstr "" #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:58 msgid "Log in" -msgstr "" +msgstr "Вход" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 #: mediagoblin/templates/mediagoblin/auth/login.html:39 msgid "Logging in failed!" -msgstr "" +msgstr "Грешка при влизането" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" @@ -570,26 +571,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -613,25 +614,25 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" #: mediagoblin/submit/forms.py:26 msgid "File" -msgstr "" +msgstr "Файл" #: mediagoblin/submit/views.py:52 msgid "You must provide a file." -msgstr "" +msgstr "ТрÑбва да предоÑтавите файл" #: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" @@ -644,11 +645,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" -msgstr "" +msgstr "Проверете е-пощата Ñи!" #: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" -msgstr "" +msgstr "изход" #: mediagoblin/templates/mediagoblin/base.html:105 #, python-format @@ -657,7 +658,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" -msgstr "" +msgstr "ПромÑна наÑтройките на профила" #: mediagoblin/templates/mediagoblin/base.html:116 #: mediagoblin/templates/mediagoblin/base.html:137 @@ -670,7 +671,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" -msgstr "" +msgstr "Изход" #: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 @@ -680,7 +681,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" -msgstr "" +msgstr "Създаване на нова колекциÑ" #: mediagoblin/templates/mediagoblin/error.html:24 msgid "Image of goblin stressing out" @@ -717,7 +718,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/admin/panel.html:92 msgid "Last 10 successful uploads" -msgstr "" +msgstr "ПоÑледни 10 уÑпешни качваниÑ" #: mediagoblin/templates/mediagoblin/admin/panel.html:112 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 @@ -735,7 +736,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Влезли Ñте като" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " @@ -763,7 +764,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "ПромÑна на данните ви" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" @@ -780,20 +781,20 @@ msgstr "" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 msgid "Set your new password" -msgstr "" +msgstr "Задаване на нова парола" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 msgid "Set password" -msgstr "" +msgstr "Задаване на парола" #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 msgid "Recover password" -msgstr "" +msgstr "ВъзÑтановÑване на парола" #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 msgid "Send instructions" -msgstr "" +msgstr "Изпращане на указаниÑ" #: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 #, python-format @@ -811,24 +812,24 @@ msgstr "" #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "" +msgstr "ÐÑмате профил?" #: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" -msgstr "" +msgstr "Създайте Ñи!" #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" -msgstr "" +msgstr "Забравили Ñте паролата Ñи?" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" -msgstr "" +msgstr "Създаване на профил" #: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" -msgstr "" +msgstr "Създаване" #: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 #, python-format @@ -846,7 +847,7 @@ msgstr "" msgid "" "Powered by <a href=\"http://mediagoblin.org/\" title='Version " "%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." -msgstr "" +msgstr "Задвижвано от <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, проект на <a href=\"http://gnu.org/\">GNU</a>." #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 #, python-format @@ -854,7 +855,7 @@ msgid "" "Released under the <a " "href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a " "href=\"%(source_link)s\">Source code</a> available." -msgstr "" +msgstr "Публикувано ÑъглаÑно <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">ИзходниÑÑ‚ код</a> е наличен." #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" @@ -862,7 +863,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "" +msgstr "Здравейте и добре дошли в този Ñайт на MediaGoblin!" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24 msgid "" @@ -896,7 +897,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 msgid "MediaGoblin logo" -msgstr "" +msgstr "Лого на MediaGoblin" #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 @@ -924,7 +925,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" -msgstr "" +msgstr "Отказ" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 @@ -932,33 +933,33 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" -msgstr "" +msgstr "Запазване на промените" #: mediagoblin/templates/mediagoblin/edit/change_email.html:23 #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" +msgstr "ПромÑна е-пощата на %(username)s" #: mediagoblin/templates/mediagoblin/edit/change_email.html:40 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 msgid "Save" -msgstr "" +msgstr "ЗапиÑ" #: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 #, python-format msgid "Changing %(username)s's password" -msgstr "" +msgstr "ПромÑна паролата на %(username)s" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" -msgstr "" +msgstr "ÐаиÑтина ли да Ñе изтрие потребителÑÑ‚ '%(user_name)s' и вÑички прилежащи файлове и коментари?" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 msgid "Yes, really delete my account" -msgstr "" +msgstr "Да, наиÑтина да Ñе изтрие профилът ми" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48 @@ -970,32 +971,32 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format msgid "Editing %(media_title)s" -msgstr "" +msgstr "Редактиране на %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:28 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" -msgstr "" +msgstr "ПромÑна наÑтройките на профила на %(username)s" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" -msgstr "" +msgstr "Изтриване на профила ми" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 msgid "Email" -msgstr "" +msgstr "Е-поща" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" -msgstr "" +msgstr "Редактиране на %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" -msgstr "" +msgstr "Редактиране профила на %(username)s" #: mediagoblin/templates/mediagoblin/edit/verification.txt:19 #, python-format @@ -1013,7 +1014,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Ðови коментари" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 @@ -1025,7 +1026,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "ОтбелÑзване на вÑички като прочетени" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1040,7 +1041,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" -msgstr "" +msgstr "ИзтеглÑне" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" @@ -1072,7 +1073,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/image.html:36 msgid "Created" -msgstr "" +msgstr "Създадено" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 @@ -1087,7 +1088,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "Файл PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Perspective" @@ -1115,7 +1116,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" -msgstr "" +msgstr "Файлов формат" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" @@ -1141,7 +1142,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" -msgstr "" +msgstr "ДобавÑне на колекциÑ" #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 @@ -1151,32 +1152,32 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (ÐºÐ¾Ð»ÐµÐºÑ†Ð¸Ñ Ð½Ð° %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "" +msgstr "%(collection_title)s от <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" -msgstr "" +msgstr "Редактиране" #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format msgid "Really delete %(title)s?" -msgstr "" +msgstr "ÐаиÑтина ли да Ñе изтрие %(title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" -msgstr "" +msgstr "ÐаиÑтина ли да Ñе премахне %(media_title)s от %(collection_title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 msgid "Remove" -msgstr "" +msgstr "Премахване" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format @@ -1219,33 +1220,33 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" -msgstr "" +msgstr "ДобавÑне на коментар" #: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" -msgstr "" +msgstr "ДобавÑне на коментара" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Преглед на коментара" #: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" -msgstr "" +msgstr "Добавено" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s†to a collection" -msgstr "" +msgstr "ДобавÑне на “%(media_title)s†към колекциÑ" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" -msgstr "" +msgstr "+" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" -msgstr "" +msgstr "ДобавÑне на нова колекциÑ" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" @@ -1260,16 +1261,16 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:89 #, python-format msgid "%(username)s's profile" -msgstr "" +msgstr "Профил на %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/user.html:43 msgid "Sorry, no such user found." -msgstr "" +msgstr "Ðе е открит такъв потребител." #: mediagoblin/templates/mediagoblin/user_pages/user.html:50 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70 msgid "Email verification needed" -msgstr "" +msgstr "Ðужна е проверка на е-пощата" #: mediagoblin/templates/mediagoblin/user_pages/user.html:53 msgid "Almost done! Your account still needs to be activated." @@ -1308,7 +1309,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:100 #: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" -msgstr "" +msgstr "Редактиране на профила" #: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." @@ -1316,7 +1317,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:124 msgid "Browse collections" -msgstr "" +msgstr "Преглед на колекциите" #: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format @@ -1337,7 +1338,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(премахване)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" @@ -1345,7 +1346,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" -msgstr "" +msgstr "ДобавÑне към колекциÑ" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 @@ -1355,33 +1356,33 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" -msgstr "" +msgstr "ЕмиÑÐ¸Ñ Atom" #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" -msgstr "" +msgstr "Ð’Ñички права запазени" #: mediagoblin/templates/mediagoblin/utils/pagination.html:39 msgid "↠Newer" -msgstr "" +msgstr "↠По-ново" #: mediagoblin/templates/mediagoblin/utils/pagination.html:45 msgid "Older →" -msgstr "" +msgstr "По-Ñтаро →" #: mediagoblin/templates/mediagoblin/utils/pagination.html:48 msgid "Go to page:" -msgstr "" +msgstr "Отиване на Ñтраница:" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 msgid "newer" -msgstr "" +msgstr "по-ново" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 msgid "older" -msgstr "" +msgstr "по-Ñтаро" #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" @@ -1393,15 +1394,15 @@ msgstr "" #: mediagoblin/tools/response.py:36 msgid "Oops!" -msgstr "" +msgstr "Опа!" #: mediagoblin/tools/response.py:37 msgid "An error occured" -msgstr "" +msgstr "Възникна грешка" #: mediagoblin/tools/response.py:51 msgid "Bad Request" -msgstr "" +msgstr "Ðеправилна заÑвка" #: mediagoblin/tools/response.py:53 msgid "The request sent to the server is invalid, please double check it" @@ -1409,7 +1410,7 @@ msgstr "" #: mediagoblin/tools/response.py:60 msgid "Operation not allowed" -msgstr "" +msgstr "ДейÑтвието не е позволено" #: mediagoblin/tools/response.py:61 msgid "" @@ -1427,37 +1428,37 @@ msgstr "" #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "година" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "меÑец" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "Ñедмица" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "ден" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "чаÑ" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "минута" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "" +msgstr "Коментар" #: mediagoblin/user_pages/forms.py:25 msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Може да ползвате <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> за форматиране." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1465,11 +1466,11 @@ msgstr "" #: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" -msgstr "" +msgstr "ÐаиÑтина иÑкам да премахна този Ð·Ð°Ð¿Ð¸Ñ Ð¾Ñ‚ колекциÑта" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "КолекциÑ" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" @@ -1477,14 +1478,14 @@ msgstr "" #: mediagoblin/user_pages/forms.py:42 msgid "Include a note" -msgstr "" +msgstr "ДобавÑне на бележка" #: mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Може да ползвате\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> за форматиране." #: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." @@ -1496,7 +1497,7 @@ msgstr "" #: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" -msgstr "" +msgstr "Коментарът ви е публикуван." #: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." @@ -1504,17 +1505,17 @@ msgstr "" #: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" -msgstr "" +msgstr "ТрÑбва да изберете или добавите колекциÑ" #: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" -msgstr "" +msgstr "\"%s\" вече е в колекциÑта \"%s\"" #: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "" +msgstr "\"%s\" е добавено към колекциÑта \"%s\"" #: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." @@ -1530,7 +1531,7 @@ msgstr "" #: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." -msgstr "" +msgstr "Изтрихте Ð·Ð°Ð¿Ð¸Ñ Ð¾Ñ‚ колекциÑта." #: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." @@ -1545,7 +1546,7 @@ msgstr "" #: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "" +msgstr "Изтрихте колекциÑта \"%s\"" #: mediagoblin/user_pages/views.py:447 msgid "" diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo Binary files differindex a751e370..3611ec56 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po index 6736e94b..b061407a 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/mediagoblin/language/ca/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Ho sentim, el registre està desactivat en aquest cas." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -50,12 +50,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "Lamentablement aquest usuari ja existeix." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Perdó, ja existeix un usuari amb aquesta adreça de correu." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -117,7 +117,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -183,7 +183,7 @@ msgid "Email me when others comment on my media" msgstr "Envia'm correu quan d'altres comentin al meu mitjà " #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -261,37 +261,37 @@ msgstr "Esteu editant el perfil d'un usuari. Aneu amb compte" msgid "Profile changes saved" msgstr "Els canvis al perfil s'han guardat" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Els detalls del compte s'han guardat" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ja tens una col.lecció anomenada \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Estas editant la col.lecció d'un altre usuari. Prossegueix amb cautela." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Contrasenya errònia" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -573,26 +573,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -616,15 +616,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Aquest tipus de fitxer no és và lid." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo Binary files differindex 4decf20d..b524a104 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po index 46be70eb..b5b546fd 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/mediagoblin/language/da/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Desværre, registrering er ikke muligt pÃ¥ denne instans" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -50,12 +50,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "Desværre, det brugernavn er allerede brugt" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Desværre, en bruger er allerede oprettet for den email" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -117,7 +117,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -183,7 +183,7 @@ msgid "Email me when others comment on my media" msgstr "Email mig nÃ¥r andre kommenterer pÃ¥ mine medier" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -261,37 +261,37 @@ msgstr "Du er ved at ændre en bruger's profil. Pas pÃ¥." msgid "Profile changes saved" msgstr "Profilændringer gemt" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Kontoindstillinger gemt" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allerede en samling ved navn \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du er ved at ændre en anden bruger's samling. Pas pÃ¥." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -573,26 +573,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -616,15 +616,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo Binary files differindex 735eb782..f9036b92 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po index 55e879b9..7ca48ab7 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -61,12 +61,12 @@ msgstr "Dieses Feld benötigt eine E-Mail-Adresse." msgid "Sorry, a user with that name already exists." msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -128,7 +128,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -194,7 +194,7 @@ msgid "Email me when others comment on my media" msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -272,37 +272,37 @@ msgstr "Du bearbeitest das Profil eines anderen Nutzers. Sei bitte vorsichtig." msgid "Profile changes saved" msgstr "Das Profil wurde aktualisiert" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Kontoeinstellungen gespeichert" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Du musst die Löschung deines Kontos bestätigen." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du hast bereits eine Sammlung mit Namen »%s«!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Eine Sammlung mit diesem Kurztitel existiert bereits für diesen Benutzer." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Falsches Passwort" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -584,26 +584,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -627,15 +627,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po index 6eff8296..bc5baccb 100644 --- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" +"POT-Creation-Date: 2013-09-04 16:07-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,7 +22,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -46,12 +46,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -112,7 +112,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -179,7 +179,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -257,37 +257,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -573,25 +573,25 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a " "password set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo Binary files differindex 2efd8419..067d4f4f 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index 2f136500..4510069d 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/mediagoblin/language/eo/)\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "BedaÅrinde, registrado estas malaktivigita en tiu ĉi instalaĵo." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -51,12 +51,12 @@ msgstr "Ĉi tiu kampo postulas retpoÅtadreson." msgid "Sorry, a user with that name already exists." msgstr "BedaÅrinde, uzanto kun tiu nomo jam ekzistas." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Ni bedaÅras, sed konto kun tiu retpoÅtadreso jam ekzistas." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -118,7 +118,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -184,7 +184,7 @@ msgid "Email me when others comment on my media" msgstr "RetpoÅtu min kiam aliaj komentas pri miaj alÅutaĵoj." #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -262,37 +262,37 @@ msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme." msgid "Profile changes saved" msgstr "ProfilÅanÄoj estis konservitaj" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Kontagordoj estis konservitaj" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Vi bezonas konfirmi la forigon de via konto." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vi jam havas kolekton kun la nomo «%s»!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Ĉi tiu uzanto jam havas kolekton kun tiu distingiga adresparto." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "MalÄusta pasvorto" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Via pasvorto estas sukcese ÅanÄita" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -574,26 +574,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -617,15 +617,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "La provizita dosiero ne konformas al la informtipo." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo Binary files differindex bcb46cb2..c9965ccf 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po index 1fa0cfce..934fdad6 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Lo sentimos, el registro está deshabilitado en este momento." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "Lo siento, la autenticación está deshabilitada en esta instancia." @@ -59,12 +59,12 @@ msgstr "Este campo requiere una dirección de correo." msgid "Sorry, a user with that name already exists." msgstr "Lo sentimos, ya existe un usuario con ese nombre." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Lo sentimos, ya existe un usuario con esa dirección de email." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "La clave de verificación o el identificador de usuario son incorrectos." @@ -126,8 +126,8 @@ msgstr "Necesitas verificar tu correo electrónico antes de restablecer tu contr #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." -msgstr "Ya no eres un usuario activo. Por favor contacta con el administrador del sistema para reactivar tu cuenta." +"reactivate your account." +msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 @@ -192,8 +192,8 @@ msgid "Email me when others comment on my media" msgstr "EnvÃame un correo cuando otros escriban comentarios sobre mi contenido" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" -msgstr "Habilitar/Deshabilitar notificaciones del propio sitio" +msgid "Enable insite notifications about events." +msgstr "" #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -270,37 +270,37 @@ msgstr "Estás editando un perfil de usuario. Procede con precaución." msgid "Profile changes saved" msgstr "Los cambios de perfil fueron salvados" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "las configuraciones de cuenta fueron salvadas" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Necesitas confirmar el borrado de tu cuenta." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "¡Ya tienes una colección llamada \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Una colección con esa ficha ya existe para este usuario/a." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Estás editando la colección de otro usuario/a. Ten cuidado." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Contraseña incorrecta" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Se ha cambiado la contraseña correctamente" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "Tu dirección de correo electrónico ha sido verificada." @@ -582,28 +582,28 @@ msgstr "¡O regÃstrate con OpenID!" msgid "Sorry, an account is already registered to that Persona email." msgstr "Lo siento, ya hay una cuenta registrada para ese correo electrónico de Persona." -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "La dirección de correo electrónico de Persona se ha eliminado correctamente." -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "No puedes borrar tu única dirección de correo electrónico de Persona a menos que tengas establecida una contraseña." -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "Esa dirección de correo electrónico de Persona no está registrada para esta cuenta." -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "Lo siento, ya hay una cuenta registrada con esa dirección de correo electrónico de Persona." -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Se ha guardado correctamente tu dirección de correo electrónico de Persona." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" @@ -625,15 +625,15 @@ msgstr "¡O inicia sesión con Persona!" msgid "Or register with Persona!" msgstr "¡O regÃstrate con Persona!" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Archivo inválido para el formato seleccionado." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "La copia al almacenamiento público ha fallado." -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "No se ha encontrado un fichero de procesamiento aceptable" @@ -771,7 +771,7 @@ msgstr "Publicar nuevos contenidos por tÃ" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Ver tu información (p.ej. perfil, contenidos, etc...)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" @@ -1469,7 +1469,7 @@ msgstr "Comentario" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Puedes usar <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> para dar formato." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo Binary files differindex 316bcd88..533a29bb 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po index a03680cb..c1a16616 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/mediagoblin/language/fa/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "متاسÙانه،ثبتنام به طور موقت غیر Ùعال است." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -48,12 +48,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "متاسÙانه کاربری با این نام کاربری وجود دارد." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -115,7 +115,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -181,7 +181,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -259,37 +259,37 @@ msgstr "شما در Øال ویرایش نمایه کاربر دیگری Ù‡Ø³ØªÛ msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -571,26 +571,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -614,15 +614,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ùایلی نا معتبر برای نوع رسانه داده شده." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo Binary files differindex e4c0517c..9eb5dc65 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index 3f0f86c8..9d596861 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -7,6 +7,7 @@ # alcazar <alexispay@gmail.com>, 2012 # chesuidayeur <chesuidayeur@yahoo.fr>, 2011 # Bibit <crash_bibit@hotmail.com>, 2013 +# Fubik, 2013 # joehillen <joehillen@gmail.com>, 2011 # hellpe <hell_pe@no-log.org>, 2013 # MarkTraceur <marktraceur@gmail.com>, 2011 @@ -17,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -33,9 +34,9 @@ msgid "Sorry, registration is disabled on this instance." msgstr "L'inscription n'est pas activée sur ce serveur, désolé." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" +msgstr "Désolé, l'authentification est désactivée sur ce serveur." #: mediagoblin/auth/forms.py:25 msgid "Username or email" @@ -47,24 +48,24 @@ msgstr "Nom d'utilisateur ou adresse de courriel invalide." #: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." -msgstr "" +msgstr "Ce champ n'accepte pas les adresses email." #: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." -msgstr "" +msgstr "Ce champ nécessite une adresse email." #: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Un utilisateur existe déjà avec ce nom, désolé." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Désolé, il existe déjà un utilisateur ayant cette adresse e-mail." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "La clé de vérification ou l'identifiant de l'utilisateur est incorrect." #: mediagoblin/auth/views.py:161 msgid "" @@ -92,7 +93,7 @@ msgstr "E-mail de vérification renvoyé." msgid "" "If that email address (case sensitive!) is registered an email has been sent" " with instructions on how to change your password." -msgstr "" +msgstr "Si cette adresse email (sensible à la casse !) est enregistrée, un email a été envoyé avec les instructions pour changer votre mot de passe." #: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." @@ -111,7 +112,7 @@ msgstr "Impossible d'envoyer un email de récupération de mot de passe : votre #: mediagoblin/auth/views.py:306 msgid "The user id is incorrect." -msgstr "" +msgstr "L'identifiant de l'utilisateur est incorrect." #: mediagoblin/auth/views.py:323 msgid "You can now log in using your new password." @@ -119,12 +120,12 @@ msgstr "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe." #: mediagoblin/auth/views.py:334 msgid "You need to verify your email before you can reset your password." -msgstr "" +msgstr "Vous devez vérifier votre email avant de pouvoir réinitialiser votre mot de passe." #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -190,16 +191,16 @@ msgid "Email me when others comment on my media" msgstr "Me prévenir par email lorsque d'autres commentent mes médias" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 msgid "License preference" -msgstr "" +msgstr "Préférence de licence" #: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." -msgstr "" +msgstr "Cette licence sera appliquée par défaut à vos contributions." #: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" @@ -230,7 +231,7 @@ msgstr "Nouveau mot de passe" #: mediagoblin/edit/forms.py:116 msgid "New email address" -msgstr "" +msgstr "Nouvelle adresse email" #: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 @@ -241,11 +242,11 @@ msgstr "Mot de passe" #: mediagoblin/edit/forms.py:122 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Entrez votre mot de passe pour prouver que vous possédez ce compte." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." -msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende." +msgstr "Une entrée avec la même légende existe déjà pour cet utilisateur." #: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." @@ -268,39 +269,39 @@ msgstr "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez pre msgid "Profile changes saved" msgstr "Les changements apportés au profile ont étés sauvegardés" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Les changements des préférences du compte ont étés sauvegardés" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Vous devez confirmer la suppression de votre compte." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vous avez déjà une collection appelée \"%s\" !" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." -msgstr "" +msgstr "Une collection avec la même légende existe déjà pour cet utilisateur." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Mauvais mot de passe" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" -msgstr "" +msgstr "Votre mot de passe a correctement été changé" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." -msgstr "" +msgstr "Votre adresse email a bien été validée." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -317,24 +318,24 @@ msgstr "" #: mediagoblin/gmg_commands/assetlink.py:112 #, python-format msgid "Could not link \"%s\": %s exists and is not a symlink\n" -msgstr "" +msgstr "Ne peut pas lier \"%s\" : %s existe et n'est pas un lien symbolique\n" #: mediagoblin/gmg_commands/assetlink.py:119 #, python-format msgid "Skipping \"%s\"; already set up.\n" -msgstr "" +msgstr "Saute \"%s\"; déjà défini.\n" #: mediagoblin/gmg_commands/assetlink.py:124 #, python-format msgid "Old link found for \"%s\"; removing.\n" -msgstr "" +msgstr "Vieux lien trouvé pour \"%s\"; suppression.\n" #: mediagoblin/meddleware/csrf.py:134 msgid "" "CSRF cookie not present. This is most likely the result of a cookie blocker " "or somesuch.<br/>Make sure to permit the settings of cookies for this " "domain." -msgstr "" +msgstr "Cookie CSRF non présent. Cela est vraisemblablement l’œuvre d'un bloqueur de cookies ou autres.<br/>Veuillez vous assurer d'autoriser les cookies pour ce domaine." #: mediagoblin/media_types/__init__.py:78 #: mediagoblin/media_types/__init__.py:100 @@ -343,7 +344,7 @@ msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :(" #: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" -msgstr "" +msgstr "unoconv n'arrive pas à s'exécuter, vérifiez le fichier log" #: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" @@ -356,16 +357,16 @@ msgstr "a commenté votre post" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "Inscrit aux commentaires sur %s !" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "Vous ne recevrez pas de notifications pour les commentaires sur %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Doit fournir un oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." @@ -386,11 +387,11 @@ msgstr "Adresse e-mail" #: mediagoblin/plugins/basic_auth/forms.py:39 msgid "Username or Email" -msgstr "" +msgstr "Nom d'utilisateur ou email" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "Rester connecter" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -415,7 +416,7 @@ msgstr "Nom" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" -msgstr "" +msgstr "Le nom du client OAuth" #: mediagoblin/plugins/oauth/forms.py:36 msgid "Description" @@ -439,7 +440,7 @@ msgid "" " <strong>Public</strong> - The client can't make confidential\n" " requests to the GNU MediaGoblin instance (e.g. client-side\n" " JavaScript client)." -msgstr "" +msgstr "<strong>Confidentiel</strong> - Le client peut envoyer des requêtes à l'instance de GNU MediaGoblin qui ne peuvent pas être interceptées par le user agent (un client côté serveur par exemple).<br />\n<strong>Public</strong> - Le client ne peut pas envoyer des requêtes confidentielles à l'instance de GNU MediaGoblin (un client JavaScript côté client par exemple)." #: mediagoblin/plugins/oauth/forms.py:52 msgid "Redirect URI" @@ -465,7 +466,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 msgid "Your OAuth clients" -msgstr "" +msgstr "Vos clients OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 @@ -479,60 +480,60 @@ msgstr "Ajouter" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Désolé, un compte est déjà enregistré avec cet OpenID." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Désolé, le serveur OpenID n'a pas pu être trouvé." #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Aucun service OpenID n'a été trouvé pour %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "La vérification de %s a échoué : %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Vérification annulée" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Votre url OpenID a été correctement enregistrée." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "Vous ne pouvez pas supprimer votre seul URL OpenID sauf si vous avez défini un mot de passe" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Cet OpenID n'est pas relié à ce compte." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "OpenID a été correctement supprimé." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Ajouter un OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Supprimer un OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -566,72 +567,72 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "Ou se connecter avec un mot de passe !" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "Ou se connecter avec OpenID !" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "Ou s'enregistrer avec OpenID !" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "Désolé, un compte est déjà enregistré avec cet email Persona." -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "L'adresse email Persona a correctement été supprimée." -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "Vous ne pouvez pas supprimer votre seul email Persona sauf si vous avez défini un mot de passe." -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Cette adresse email Persona n'est pas liée à ce compte." -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Désolé, un compte est déjà enregistré avec cette adresse email Persona." -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Votre adresse email Persona a bien été enregistrée." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "Supprimer une adresse email Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Ajouter une adresse email Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 msgid "Edit your Persona email addresses" -msgstr "" +msgstr "Éditer vos adresses email Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "Ou se connecter avec Persona !" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "Ou s'enregistrer avec Persona !" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Le fichier envoyé ne correspond pas au type de média." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." -msgstr "" +msgstr "La copie vers le stockage public a échoué." -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" @@ -663,7 +664,7 @@ msgstr "Déconnexion" #: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "" +msgstr "Compte de <a href=\"%(user_url)s\">%(user_name)s</a>" #: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" @@ -680,7 +681,7 @@ msgstr "Panneau pour le traitement des médias" #: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" -msgstr "" +msgstr "Se déconnecter" #: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 @@ -736,44 +737,44 @@ msgstr "Aucune entrée traitée jusqu'à présent !" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Autorisation" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Autoriser" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Vous êtes connecté en tant que" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Voulez-vous autoriser" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "une application inconnue" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "pour accéder à votre compte ?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Les applications ayant accès à votre compte peuvent :" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Poster un nouveau média sous votre nom" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Voir vos informations (profile, médias, etc...)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "Modifier vos informations" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" @@ -785,7 +786,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" +msgstr "Copier-coller ceci dans votre client :" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 @@ -856,7 +857,7 @@ msgstr "Bonjour %(username)s,\n\npour activer votre compte sur GNU MediaGoblin, msgid "" "Powered by <a href=\"http://mediagoblin.org/\" title='Version " "%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." -msgstr "" +msgstr "Propulsé par <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, un projet <a href=\"http://gnu.org/\">GNU</a>." #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 #, python-format @@ -895,13 +896,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n>Créer un compte sur ce site</a>\nou" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n<a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Installer MediaGoblin sur votre propre serveur</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -948,27 +949,27 @@ msgstr "Enregistrer les modifications" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" +msgstr "Changement de l'email de %(username)s" #: mediagoblin/templates/mediagoblin/edit/change_email.html:40 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 msgid "Save" -msgstr "" +msgstr "Sauvegarder" #: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 #, python-format msgid "Changing %(username)s's password" -msgstr "" +msgstr "Changement du mot de passe de %(username)s" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" -msgstr "" +msgstr "Réellement supprimer l'utilisateur \"%(user_name)s\" et tous les médias/commentaires liés ?" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 msgid "Yes, really delete my account" -msgstr "" +msgstr "Oui, supprimer réellement mon compte" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48 @@ -990,11 +991,11 @@ msgstr "Changement des préférences du compte de %(username)s" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" -msgstr "" +msgstr "Supprimer mon compte" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 msgid "Email" -msgstr "" +msgstr "Email" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1019,11 +1020,11 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Bonjour,\n\nNous voulons vérifier que vous êtes %(username)s. Si cela est bien le cas, veuillez suivre le lien ci-dessous pour vérifier votre nouvelle adresse email.\n\n%(verification_url)s\n\nSi vous n'êtes pas %(username)s ou n'avez pas demandé un changement d'adresse email, vous pouvez ignorer cet email." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nouveaux commentaires" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 @@ -1031,11 +1032,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media.html:159 #, python-format msgid "%(formatted_time)s ago" -msgstr "" +msgstr "Il y a %(formatted_time)s" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Marquer tous lus" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1082,7 +1083,7 @@ msgstr "fichier WebM (codec Vorbis)" #: mediagoblin/templates/mediagoblin/media_displays/image.html:36 msgid "Created" -msgstr "" +msgstr "Créé" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 @@ -1097,7 +1098,7 @@ msgstr "Image de %(media_title)s" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "Fichier PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Perspective" @@ -1109,45 +1110,45 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" -msgstr "" +msgstr "Haut" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" -msgstr "" +msgstr "Côté" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" -msgstr "" +msgstr "WebGL" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" -msgstr "" +msgstr "Télécharger le modèle" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" -msgstr "" +msgstr "Format de fichier" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" -msgstr "" +msgstr "Hauteur de l'objet" #: mediagoblin/templates/mediagoblin/media_displays/video.html:44 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "" +msgstr "Désolé, cette vidéo ne marchera pas parce que votre navigateur web ne supporte pas les vidéos HTML5." #: mediagoblin/templates/mediagoblin/media_displays/video.html:47 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" -msgstr "" +msgstr "Vous pouvez télécharger un navigateur web moderne qui peut lire cette vidéo à <a href=\"http://getfirefox.com\">http://getfirefox.com</a> !" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "Fichier WebM (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -1161,7 +1162,7 @@ msgstr "Ajoutez votre média" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (collection de %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format @@ -1191,12 +1192,12 @@ msgstr "Retirer" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "Collections de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "Collections de <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -1215,7 +1216,7 @@ msgstr "Medias de %(username)s" msgid "" "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " "href=\"%(tag_url)s\">%(tag)s</a>" -msgstr "" +msgstr "Media de <a href=\"%(user_url)s\">%(username)s</a> avec le tag <a href=\"%(tag_url)s\">%(tag)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format @@ -1237,17 +1238,17 @@ msgstr "Ajouter ce commentaire" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Prévisualisation du commentaire" #: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" -msgstr "" +msgstr "Ajouté" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s†to a collection" -msgstr "" +msgstr "Ajouter “%(media_title)s†à une collection" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" @@ -1326,7 +1327,7 @@ msgstr "Cet utilisateur n'a pas (encore) rempli son profil." #: mediagoblin/templates/mediagoblin/user_pages/user.html:124 msgid "Browse collections" -msgstr "" +msgstr "Parcourir les collections" #: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format @@ -1347,7 +1348,7 @@ msgstr "Il ne semble pas y avoir de média là , pour l'instant ..." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(supprimer)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" @@ -1355,7 +1356,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" -msgstr "" +msgstr "Ajouter à une collection" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 @@ -1411,11 +1412,11 @@ msgstr "Une erreur est survenue" #: mediagoblin/tools/response.py:51 msgid "Bad Request" -msgstr "" +msgstr "Mauvaise requête" #: mediagoblin/tools/response.py:53 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "La requête envoyée au serveur est non valide, veuillez la vérifier" #: mediagoblin/tools/response.py:60 msgid "Operation not allowed" @@ -1437,37 +1438,37 @@ msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé ! </p><p>Si #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "année" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "mois" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "semaine" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "jour" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "heure" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "minute" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "" +msgstr "Commenter" #: mediagoblin/user_pages/forms.py:25 msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Vous pouvez utiliser <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> pour le formatage." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1479,7 +1480,7 @@ msgstr "Je suis certain de vouloir retirer cet élément de la collection" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "Collection" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" @@ -1494,11 +1495,11 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Vous pouvez utiliser\n<a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\nMarkdown</a> pour le formatage." #: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." -msgstr "" +msgstr "Désolé, les commentaires sont désactivés." #: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo Binary files differindex d5daada9..487668e1 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index 1c9afa26..251b528d 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/mediagoblin/language/he/)\n" "MIME-Version: 1.0\n" @@ -23,12 +23,12 @@ msgstr "" #: mediagoblin/decorators.py:252 msgid "Sorry, registration is disabled on this instance." -msgstr "צר לי, ×¨×™×©×•× ×”×™× ×• ×ž× ×•×˜×¨×œ על שרת ×–×”." +msgstr "×œ×¦×¢×¨× ×•, ×¨×™×©×•× ×”×™× ×• ×ž× ×•×˜×¨×œ על שרת ×–×”." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" +msgstr "×œ×¦×¢×¨× ×•, ×ימות ×”×™× ×• ×ž× ×•×˜×¨×œ על שרת ×–×”." #: mediagoblin/auth/forms.py:25 msgid "Username or email" @@ -48,16 +48,16 @@ msgstr "שדה ×–×” מצריך כתובת דו×״ל." #: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." -msgstr "צר לי, משתמש ×¢× ×©× ×–×” כבר קיי×." +msgstr "×œ×¦×¢×¨× ×•, משתמש ×¢× ×©× ×–×” כבר קיי×." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." -msgstr "צר לי, משתמש ×¢× ×“×•×״ל ×–×” כבר קיי×." +msgstr "×œ×¦×¢×¨× ×•, משתמש ×¢× ×“×•×״ל ×–×” כבר קיי×." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "מפתח ×”×ימות ×ו מזהה המשתמש ××™× ×• מדויק." #: mediagoblin/auth/views.py:161 msgid "" @@ -104,7 +104,7 @@ msgstr "×œ× ×”×™×” × ×™×ª×Ÿ לשלוח דו×״ל לשחזור סיסמה מ×× #: mediagoblin/auth/views.py:306 msgid "The user id is incorrect." -msgstr "" +msgstr "מזהה המשתמש ××™× ×• מדויק." #: mediagoblin/auth/views.py:323 msgid "You can now log in using your new password." @@ -112,12 +112,12 @@ msgstr "כעת ביכולתך להתחבר ב×מצעות סיסמתך ×”×—×“×©× #: mediagoblin/auth/views.py:334 msgid "You need to verify your email before you can reset your password." -msgstr "" +msgstr "עליך ל×מת ×ת הדו×ל שלך ×˜×¨× ×יפוס סיסמתך." #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -183,7 +183,7 @@ msgid "Email me when others comment on my media" msgstr "שלח לי דו×״ל ×›×שר ××—×¨×™× ×ž×’×™×‘×™× ×¢×œ המדיה שלי" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -223,7 +223,7 @@ msgstr "סיסמה חדשה" #: mediagoblin/edit/forms.py:116 msgid "New email address" -msgstr "" +msgstr "כתובת דו×״ל חדשה" #: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 @@ -261,39 +261,39 @@ msgstr "×תה עורך דיוקן של משתמש. המשך בזהירות." msgid "Profile changes saved" msgstr "×©×™× ×•×™×™ דיוקן × ×©×ž×¨×•" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "הגדרות חשבון × ×©×ž×¨×•" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "עליך ל×מת ×ת המחיקה של ×—×©×‘×•× ×š." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "כבר יש לך ×וסף שקרוי ×‘×©× \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "×וסף ×¢× ×—×©×•×¤×™×ª זו כבר ×§×™×™× ×¢×‘×•×¨ משתמש ×–×”." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "×תה עורך ×וסף של משתמש ×חר. המשך בזהירות." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "סיסמה שגויה" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "סיסמתך ×©×•× ×ª×” בהצלחה" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." -msgstr "" +msgstr "כתובת הדו×״ל שלך ×ומתה." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -332,7 +332,7 @@ msgstr "עוגיית CSRF ×œ× × ×•×›×—×ª. ×–×” קרוב לווד××™ × ×•×‘×¢ × #: mediagoblin/media_types/__init__.py:78 #: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" -msgstr "צר לי, ××™× × ×™ תומך בטיפוס קובץ ×–×” :(" +msgstr "×œ×¦×¢×¨× ×•, ××™× × ×™ תומך בטיפוס קובץ ×–×” :(" #: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" @@ -349,7 +349,7 @@ msgstr "הגיב/×” על פרסומך" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "×”×™×¨×©× ×ל תגובות בתוך %s!" #: mediagoblin/notifications/views.py:48 #, python-format @@ -383,7 +383,7 @@ msgstr "×©× ×ž×©×ª×ž×© ×ו דו×״ל" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "היש×ר מחובר" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -472,7 +472,7 @@ msgstr "הוסף" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "×œ×¦×¢×¨× ×•, ×§×™×™× ×›×‘×¨ חשבון ×שר ×¨×©×•× ×¢× OpenID." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" @@ -480,12 +480,12 @@ msgstr "" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "×œ×¦×¢×¨× ×•, שרת OpenID ×œ× ×”×™×” יכול להימצ×" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "×œ× × ×ž×¦× ×©×™×¨×•×ª OpenID עבור %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format @@ -519,13 +519,13 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "הוסף OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "מחק OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -555,44 +555,44 @@ msgstr "התחברות × ×›×©×œ×”!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "התחבר כדי ליצור חשבון!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "×ו התחבר בעזרת סיסמה!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "×ו התחבר ×¢× OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "×ו ×”×™×¨×©× ×‘×¢×–×¨×ª OpenID!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "×œ×¦×¢×¨× ×•, ×§×™×™× ×›×‘×¨ חשבון ×שר ×¨×©×•× ×œ×ישיות דו×״ל זו." -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "×œ×¦×¢×¨× ×•, ×§×™×™× ×›×‘×¨ חשבון ×שר ×¨×©×•× ×¢× ×ישיות כתובת דו×״ל זו." -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -616,15 +616,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "× ×™×ª×Ÿ קובץ שגוי עבור טיפוס מדיה." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" @@ -1054,7 +1054,7 @@ msgid "" "Sorry, this audio will not work because \n" "\tyour web browser does not support HTML5 \n" "\taudio." -msgstr "צר לי, ×ודיו ×–×” ×œ× ×™×¢×‘×•×“ מכיוון \n\tשדפדפן הרשת שלך ×œ× ×ª×•×ž×š \n\t×ודיו של HTML5." +msgstr "×œ×¦×¢×¨× ×•, ×ודיו ×–×” ×œ× ×™×¢×‘×•×“ מכיוון \n\tשדפדפן הרשת שלך ×œ× ×ª×•×ž×š \n\t×ודיו של HTML5." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47 msgid "" @@ -1129,7 +1129,7 @@ msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "צר לי, ויד×ו ×–×” ×œ× ×™×¢×‘×•×“ מכיוון \n שדפדפן הרשת שלך ×œ× ×ª×•×ž×š \n ויד×ו של HTML5." +msgstr "×œ×¦×¢×¨× ×•, ויד×ו ×–×” ×œ× ×™×¢×‘×•×“ מכיוון \n שדפדפן הרשת שלך ×œ× ×ª×•×ž×š \n ויד×ו של HTML5." #: mediagoblin/templates/mediagoblin/media_displays/video.html:47 msgid "" @@ -1267,7 +1267,7 @@ msgstr "הדיוקן של %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/user.html:43 msgid "Sorry, no such user found." -msgstr "צר לי, משתמש × ×ª×•×Ÿ ×œ× × ×ž×¦×." +msgstr "×œ×¦×¢×¨× ×•, משתמש × ×ª×•×Ÿ ×œ× × ×ž×¦×." #: mediagoblin/templates/mediagoblin/user_pages/user.html:50 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70 @@ -1419,14 +1419,14 @@ msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "צר לי דוד, ×× ×™ ×œ× ×™×›×•×œ להתיר לך לעשות ×–×ת!</p><p>× ×™×¡×™×ª לבצע פעולה ש××™× ×š מורשה לעשות. ×”×× × ×™×¡×™×ª למחוק ×ת כל ×”×—×©×‘×•× ×•×ª של ×”×ž×©×ª×ž×©×™× ×©×•×‘?" +msgstr "צר לי דייב, ×× ×™ ×œ× ×™×›×•×œ להתיר לך לעשות ×–×ת!</p><p>× ×™×¡×™×ª לבצע פעולה ש××™× ×š מורשה לעשות. ×”×× × ×™×¡×™×ª למחוק ×ת כל ×”×—×©×‘×•× ×•×ª של ×”×ž×©×ª×ž×©×™× ×©×•×‘?" #: mediagoblin/tools/response.py:69 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." -msgstr "×œ× × ×¨××” ×©×§×™×™× ×¢×ž×•×“ בכתובת זו. צר לי!</p><p>×× ×תה בטוח שהכתובת ×”×™× ×” מדויקת, ייתכן שהעמוד ש×תה מחפש כעת הועבר ×ו × ×ž×—×§." +msgstr "×œ× × ×¨××” ×›×™ ×§×™×™× ×¢×ž×•×“ בכתובת זו. צר לי!</p><p>×× ×תה בטוח שהכתובת ×”×™× ×” מדויקת, ייתכן שהעמוד ש×תה מחפש כעת הועבר ×ו × ×ž×—×§." #: mediagoblin/tools/timesince.py:62 msgid "year" diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo Binary files differindex 8a5ffcf4..53444ef4 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po index e04d741a..84801f32 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/mediagoblin/language/ia/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,12 +49,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -116,7 +116,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,37 +260,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo Binary files differindex 7dc7108d..fb1674f0 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po index 0cba797c..83322047 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" -"Last-Translator: cwebber <cwebber@dustycloud.org>\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:05+0000\n" +"Last-Translator: tryggvib <tryggvib@fsfi.is>\n" "Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/mediagoblin/language/is_IS/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,9 +27,9 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Þvà miður er nýskráning ekki leyfð á þessu svæði." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" +msgstr "Þvà miður er auðkenning ekki möguleg á þessu vefsvæði." #: mediagoblin/auth/forms.py:25 msgid "Username or email" @@ -51,14 +51,14 @@ msgstr "à þennan reit verður að slá inn tölvupóstfang." msgid "Sorry, a user with that name already exists." msgstr "Þvà miður er nú þegar til notandi með þetta nafn." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Þvà miður þá er annar notandi à kerfinu með þetta netfang skráð." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt." #: mediagoblin/auth/views.py:161 msgid "" @@ -105,7 +105,7 @@ msgstr "Gat ekki sent tölvupóst um endurstillingu lykilorðs þvà notandanafn #: mediagoblin/auth/views.py:306 msgid "The user id is incorrect." -msgstr "" +msgstr "Notendaauðkennið er rangt." #: mediagoblin/auth/views.py:323 msgid "You can now log in using your new password." @@ -113,13 +113,13 @@ msgstr "Þú getur núna innskráð þig með nýja lykilorðinu þÃnu." #: mediagoblin/auth/views.py:334 msgid "You need to verify your email before you can reset your password." -msgstr "" +msgstr "Þú verður að staðfesta netfangið þitt áður en þú getur endurstillt lykilorðið þitt." #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." -msgstr "" +"reactivate your account." +msgstr "Þú ert ekki lengur virkur notandi. Vinsamlegast hafðu samband við kerfisstjóra til að endurvirkja aðganginn þinn." #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 @@ -184,8 +184,8 @@ msgid "Email me when others comment on my media" msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" -msgstr "" +msgid "Enable insite notifications about events." +msgstr "Virkja innri tilkynningar um viðburði." #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -224,7 +224,7 @@ msgstr "Nýtt lykilorð" #: mediagoblin/edit/forms.py:116 msgid "New email address" -msgstr "" +msgstr "Nýtt netfang" #: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 @@ -235,7 +235,7 @@ msgstr "Lykilorð" #: mediagoblin/edit/forms.py:122 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Sláðu inn lykilorðið þitt til að sanna að þú eigir þennan aðgang." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -262,39 +262,39 @@ msgstr "Þú ert að breyta kenniskrá notanda. Farðu mjög varlega." msgid "Profile changes saved" msgstr "Breytingar á kenniskrá vistaðar" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Aðgangsstillingar vistaðar" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Þú verður að samþykkja eyðingu á notandaaðganginum þÃnum." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Þú hefur nú þegar albúm sem kallast \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Albúm með þessu vefslóðarormi er nú þegar til fyrir þennan notanda." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Þú ert að breyta albúmi annars notanda. Farðu mjög varlega." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Rangt lykilorð" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Það tókst að breyta lykilorðinu þÃnu" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." -msgstr "" +msgstr "Netfangið þitt hefur verið staðfest." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -350,20 +350,20 @@ msgstr "skrifaði athugasemd við færsluna þÃna" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "Þú ert nú áskrifandi að athugasemdum „%s“!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "Þú færð tilkynningar þegar einhver skrifar athugasemd við „%s“." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Þú verður að gefa upp OAuth tóka (oauth_token)." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." -msgstr "" +msgstr "Engin beiðni fannst." #: mediagoblin/plugins/basic_auth/forms.py:24 #: mediagoblin/plugins/openid/forms.py:27 @@ -384,7 +384,7 @@ msgstr "Notandanafn eða tölvupóstur" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "Muna eftir mér" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -473,60 +473,60 @@ msgstr "Bæta við" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Þvà miður er annar aðgangur nú þegar skráður fyrir þetta OpenID auðkenni." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID auðkenni" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Þvà miður fannst OpenID netþjónninn ekki" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Engin OpenID þjónusta fannst fyrir „%s“" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Staðfesting á „%s“ mistóksts: „%s“" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Hætt við staðfestingu" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Það tókst að vista OpenID vefslóðina þÃna." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "Þú getur ekki eytt einu OpenID vefslóðinni nema þú hafir skráð lykilorð" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Þetta OpenID auðkenni er ekki skráð á þennan aðgang." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "Það tókst að fjarlægja OpenID auðkennið." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Bæta við OpenID auðkenni" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Eyða OpenID auðkenni" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -537,7 +537,7 @@ msgstr "Eyða" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "OpenID auðkenni" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 @@ -556,78 +556,78 @@ msgstr "Mistókst að skrá þig inn." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Skráðu þig inn til að búa til nýjan aðgang!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "...eða skráðu þig inn með lykilorði!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "...eða skráðu þig inn með OpenID auðkenni!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "...eða nýskráðu þig með OpenID auðkenni!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "Þvà miður er annar aðgangur nú þegar skráður fyrir þetta „Persona“ netfang." -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "Það tókst að fjarlægja „Persona“ netfangið." -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "Þú getur ekki eytt eina „Persona“ netfanginu þÃnu nema þú hafir skráð lykilorð." -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Þetta „Persona“ netfang er ekki skráð fyrir þennan aðgang." -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Þvà miður er annar aðgangur nú þegar skráður fyrir þetta „Persona“ netfang." -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Það tókst að vista „Persona“ netfangið þitt." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "Eyða „Persona“ netfangi" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Bæta við „Persona“ netfangi" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 msgid "Edit your Persona email addresses" -msgstr "" +msgstr "Breyta „Persona“ netföngunum þÃnum" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "...eða skráðu þig inn með „Persona“!" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "...eða nýskráðu þig með „Persona“!" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." -msgstr "" +msgstr "Það tókst ekki að afrita yfir à almennu geymsluna." -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" -msgstr "" +msgstr "Nothæf keyrsluskrá fannst ekki" #: mediagoblin/submit/forms.py:26 msgid "File" @@ -730,56 +730,56 @@ msgstr "Ekkert fullunnið efni enn!" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Heimilun" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Heimila" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Þú ert" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Viltu heimila" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "óþekktu forriti" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "að fá aðgang að aðganginum þÃnum?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Forrit með aðgang að notendaaðganginum þÃnum geta:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Sent inn nýtt margmiðlunarefni sem þú" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Skoða upplýsingarnar þÃnar (t.d. kenniskrá, margmiðlunarefni o.s.frv.)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "Breytt upplýsingunum þÃnum" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Heimilun lokið" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Heimild klár" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" +msgstr "Afritaðu og lÃmdu þetta à forritið þitt:" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 @@ -889,13 +889,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n>Búa til aðgang á þessari sÃðu</a>\neða" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">settu upp þinn eigin margmiðlunarþjón</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -942,7 +942,7 @@ msgstr "Vista breytingar" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" +msgstr "Breyti netfangi fyrir notandann: %(username)s" #: mediagoblin/templates/mediagoblin/edit/change_email.html:40 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 @@ -988,7 +988,7 @@ msgstr "Eyða aðganginum mÃnum" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 msgid "Email" -msgstr "" +msgstr "Netfang" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1013,11 +1013,11 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Hi,\n\nVið vildum staðfesta að þú værir notandinn „%(username)s“. Ef það er rétt,\nvinsamlegast smelltu á tengilinn hér fyrir neðan til að staðfesta nýja netfangið þitt.\n\n%(verification_url)s\n\nEf þú ert ekki „%(username)s“ or baðst ekki um að breytan netfanginu getur þú hunsað\nþennan tölvupóst." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nýjar athugasemdir" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 @@ -1029,7 +1029,7 @@ msgstr "Fyrir %(formatted_time)s" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Merkja allt lesið" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1141,7 +1141,7 @@ msgstr "Þú getur náð à nýlegan vafra sem \n sem getur spilað myndske #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "WebM skrá (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -1231,7 +1231,7 @@ msgstr "Senda inn þessa athugasemd" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Útlit athugasemdar" #: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" @@ -1405,11 +1405,11 @@ msgstr "Villa kom upp" #: mediagoblin/tools/response.py:51 msgid "Bad Request" -msgstr "" +msgstr "Ekki nógu góð beiðni" #: mediagoblin/tools/response.py:53 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "Beiðnin sem var send til netþjónsins er ógild, vinsamlegast athugaðu hana aftur" #: mediagoblin/tools/response.py:60 msgid "Operation not allowed" @@ -1461,7 +1461,7 @@ msgstr "Athugasemd" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Þú getur notað <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> til að stÃlgera textann." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1488,7 +1488,7 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Þú getur notað\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> til að stÃlgera textann." #: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo Binary files differindex f62ebb93..74176ccf 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po index da22297e..2e73b622 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/mediagoblin/language/it/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Spiacente, la registrazione è disabilitata su questa istanza." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -52,12 +52,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "Spiacente, esiste già un utente con quel nome." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Siamo spiacenti, un utente con quell'indirizzo email esiste già ." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -119,7 +119,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -185,7 +185,7 @@ msgid "Email me when others comment on my media" msgstr "Inviami messaggi email quando altre persone commentano i miei files multimediali" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -263,37 +263,37 @@ msgstr "Stai modificando il profilo di un utente. Procedi con attenzione." msgid "Profile changes saved" msgstr "Cambiamenti del profilo salvati" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Impostazioni del profilo salvate" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Password errata" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -575,26 +575,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -618,15 +618,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "File non valido per il tipo di file multimediale indicato." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo Binary files differindex 7a5af710..841f0219 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index 315b64c8..88a8ddc8 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/mediagoblin/language/ja/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§ç™»éŒ²ã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,12 +49,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ãã®åå‰ã‚’æŒã¤ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -116,7 +116,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,37 +260,37 @@ msgstr "ã‚ãªãŸã¯ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’編集ã—ã¦ã„ msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo Binary files differindex a9e4b7c9..dec0d936 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po index 10d7d354..b192f7ab 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/mediagoblin/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "죄송합니다. ì§€ê¸ˆì€ ê°€ìž… 하실 수 없습니다." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -48,12 +48,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "죄송합니다. 해당 ì‚¬ìš©ìž ì´ë¦„ì´ ì´ë¯¸ 존재 합니다." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "죄송합니다. 사용ìžì™€ 해당 ì´ë©”ì¼ì€ ì´ë¯¸ 등ë¡ë˜ì–´ 있습니다." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -115,7 +115,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -181,7 +181,7 @@ msgid "Email me when others comment on my media" msgstr "ì œ ë¯¸ë””ì–´ì— ëŒ€í•œ 컨í…ì„ ì›í•œë‹¤ë©´, ë©”ì¼ì„ 보내주세요." #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -259,37 +259,37 @@ msgstr "사용ìžì˜ ê³„ì • ì •ë³´ë¥¼ ìˆ˜ì •í•˜ê³ ìžˆìŠµë‹ˆë‹¤. 조심해서 ìˆ msgid "Profile changes saved" msgstr "ê³„ì • ì •ë³´ê°€ ì €ìž¥ ë˜ì—ˆìŠµë‹ˆë‹¤." -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "ê³„ì • ì„¤ì •ì´ ì €ìž¥ ë˜ì—ˆìŠµë‹ˆë‹¤." -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "\"%s\" 모ìŒì§‘ì„ ì´ë¯¸ ê°€ì§€ê³ ìžˆìŠµë‹ˆë‹¤!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 ìœ ì €ì˜ ëª¨ìŒì§‘ì„ ìˆ˜ì • 중 입니다. 주ì˜í•˜ì„¸ìš”." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "ìž˜ëª»ëœ ë¹„ë°€ë²ˆí˜¸" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -571,26 +571,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -614,15 +614,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "알수없는 미디어 íŒŒì¼ ìž…ë‹ˆë‹¤." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo Binary files differindex e417a066..2b6c247d 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po index 1c6745c3..7853ec7c 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Sorry, registratie is uitgeschakeld op deze instantie." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,12 +49,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "Sorry, er bestaat al een gebruiker met die naam." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -116,7 +116,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,37 +260,37 @@ msgstr "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk." msgid "Profile changes saved" msgstr "Profielaanpassingen opgeslagen" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Accountinstellingen opgeslagen" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Verkeerd wachtwoord" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo Binary files differindex 92104e30..4b2e7815 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po index 21a7433c..261713fb 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -25,9 +25,9 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Registrering er slege av. Orsak." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" +msgstr "Autentisering er slege av. Orsak." #: mediagoblin/auth/forms.py:25 msgid "Username or email" @@ -49,14 +49,14 @@ msgstr "Dette feltet krev ei epostadresse." msgid "Sorry, a user with that name already exists." msgstr "Ein konto med dette brukarnamnet finst allereide." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Ein brukar med den epostadressa finst allereie." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil." #: mediagoblin/auth/views.py:161 msgid "" @@ -78,7 +78,7 @@ msgstr "Du har allereie verifisiert epostadressa." #: mediagoblin/auth/views.py:203 msgid "Resent your verification email." -msgstr "Send ein ny stadfestingsepost." +msgstr "Stadfestingsepost sendt." #: mediagoblin/auth/views.py:237 msgid "" @@ -99,11 +99,11 @@ msgstr "Sender epost med instruksjonar for Ã¥ endra passordet ditt." msgid "" "Could not send password recovery email as your username is inactive or your " "account's email address has not been verified." -msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller uverifisert." +msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller ikkje stadfesta." #: mediagoblin/auth/views.py:306 msgid "The user id is incorrect." -msgstr "" +msgstr "Brukar-ID-en er feil." #: mediagoblin/auth/views.py:323 msgid "You can now log in using your new password." @@ -111,12 +111,12 @@ msgstr "Du kan no logga inn med det nye passordet ditt." #: mediagoblin/auth/views.py:334 msgid "You need to verify your email before you can reset your password." -msgstr "" +msgstr "Du mÃ¥ bekrefta eposten din før du kan tilbakestilla passordet ditt." #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "Send meg epost nÃ¥r andre kjem med innspel pÃ¥ verka mine." #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -222,7 +222,7 @@ msgstr "Nytt passord" #: mediagoblin/edit/forms.py:116 msgid "New email address" -msgstr "" +msgstr "Ny epostadresse" #: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 @@ -233,7 +233,7 @@ msgstr "Passord" #: mediagoblin/edit/forms.py:122 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Skriv inn passordet som prov pÃ¥ at dette er din konto." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -260,39 +260,39 @@ msgstr "TrÃ¥ varsamt, du endrar nokon andre sin profil." msgid "Profile changes saved" msgstr "Lagra endring av profilen" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Lagra kontoinstellingar" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Du mÃ¥ stadfesta slettinga av kontoen din." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allereie ei samling med namn «%s»." -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Ei samling med den nettadressa finst allereie for denne brukaren." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du endrar ein annan brukar si samling. TrÃ¥ varsamt." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Feil passord" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Endra passord" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." -msgstr "" +msgstr "Epostadressa di er bekrefta." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -348,20 +348,20 @@ msgstr "kom med innspel pÃ¥ innlegget ditt" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "Tingar innspel frÃ¥ %s." #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "Du vil ikkje fÃ¥ notifikasjonar for innspel pÃ¥ %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Treng oauth_token (must provide oath_token)." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." -msgstr "" +msgstr "Noko gjekk gale :( (no request token found)." #: mediagoblin/plugins/basic_auth/forms.py:24 #: mediagoblin/plugins/openid/forms.py:27 @@ -382,7 +382,7 @@ msgstr "Brukarnamn eller epost" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "Hald meg innlogga" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -471,60 +471,60 @@ msgstr "Legg til" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Ein konto er allereie registrert til den OpenID-en." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Fann ikkje OpenID-tenaren." #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Ingen OpenID funne for %s." #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Stadfesting av %s feila: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Stadfesting avbrutt" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Lagra OpenID-url." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "Kan ikkje sletta den einaste OpenID-urlen utan at du har eit passord satt." #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Den OpenID-en er ikkje registrert til denne kontoen." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "Fjerna OpenID-en." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Legg til OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Slett ein OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -535,7 +535,7 @@ msgstr "Slett" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "OpenID-ar" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 @@ -554,78 +554,78 @@ msgstr "Innlogging feila" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Logg inn for Ã¥ oppretta ein konto" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "Eller logg inn med passord." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "Eller logg inn med OpenID." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "Eller registrer med OpenID." #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "Ein konto er allereie registrert til den Persona-eposten." -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "Persone-eposten fjerna." -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "Du kan ikkje sletta din einaste Persona-epostadresse utan eit passord satt." -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Den Persona-epostadressa er ikkje registrert til denne kontoen." -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Ein konto med den Persona-epostadressa finst allereie." -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Persone-epostadressa lagra." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "Fjern ei Persona-epostadresse" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Ny Persona-epostadresse" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 msgid "Edit your Persona email addresses" -msgstr "" +msgstr "Endra Persona-epostadressa di" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "Eller logg inn med Persona." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "Eller registrer med Persona." -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ugyldig fil for medietypen." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." -msgstr "" +msgstr "Klarte ikkje kopiera til «public storage»." -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" -msgstr "" +msgstr "Fann ingen akseptable filar for prosessering." #: mediagoblin/submit/forms.py:26 msgid "File" @@ -646,7 +646,7 @@ msgstr "La til samlinga «%s»." #: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" -msgstr "Verifiser epostadressa di." +msgstr "Stadfest epostadressa di." #: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" @@ -728,56 +728,56 @@ msgstr "Ingenting prossesert, enno." #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Godkjenning" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Godkjenn" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Du er innlogga som" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Vil du godkjenna" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "som ukjend applikasjon" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "Ã¥ fÃ¥ tilgang til kontoen din?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Applikasjonar med tilgang til kontoen din kan:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Leggja til media som deg" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "SjÃ¥ informasjonen din (t.d. profil, bilete, osb...)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "Endra informasjonen din" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Godkjenning ferdig" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Godkjenning ferdig" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" +msgstr "Kopier og lim inn dette i klienten din:" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 @@ -813,11 +813,11 @@ msgstr "Hei %(username)s,\n\nfor Ã¥ endra MediaGoblin-passordet ditt, opna fylgj #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "Har du ingen konto?" +msgstr "Manglar du konto?" #: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" -msgstr "Lag ein!" +msgstr "Opprett ein!" #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" @@ -826,7 +826,7 @@ msgstr "Gløymd passordet?" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" -msgstr "Lag ein konto." +msgstr "Opprett ein konto." #: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" @@ -887,13 +887,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n>Opprett ein konto pÃ¥ denne sida</a>\neller" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set opp din eigen MediaGoblin-server</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -940,7 +940,7 @@ msgstr "Lagra" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" +msgstr "Endrar eposten til %(username)s" #: mediagoblin/templates/mediagoblin/edit/change_email.html:40 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 @@ -986,7 +986,7 @@ msgstr "Slett kontoen min" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 msgid "Email" -msgstr "" +msgstr "Epost" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1011,11 +1011,11 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Hei!\n\nMe ynskjer Ã¥ stadfesta at du er %(username)s. Dersom du er\nfylg denne lenkja for Ã¥ stadfesta epostadressa di:\n\n%(verification_url)s\n\nDersom du ikkje er %(username)s eller ikkje ynskjer ei epost-endring kan du\nberre ignorera denne eposten." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nye innspel" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 @@ -1027,7 +1027,7 @@ msgstr "%(formatted_time)s sidan" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Marker alt lese" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1139,7 +1139,7 @@ msgstr "Du kan skaffa deg ein moderne netlesar som kan spela denne videoen hjÃ¥ #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "WebM-fil (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -1229,7 +1229,7 @@ msgstr "Legg til dette innspelet" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Førehandsvisning av innspel" #: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" @@ -1271,7 +1271,7 @@ msgstr "Fann ingen slik brukar" #: mediagoblin/templates/mediagoblin/user_pages/user.html:50 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70 msgid "Email verification needed" -msgstr "Epostverifisering trengst." +msgstr "Treng stadfesting av epostadressa" #: mediagoblin/templates/mediagoblin/user_pages/user.html:53 msgid "Almost done! Your account still needs to be activated." @@ -1288,7 +1288,7 @@ msgstr "I tilfelle det ikkje skjer:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:65 msgid "Resend verification email" -msgstr "Send ein ny epost" +msgstr "Send ein ny stadfestingsepost" #: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "" @@ -1403,11 +1403,11 @@ msgstr "Noko gjekk gale" #: mediagoblin/tools/response.py:51 msgid "Bad Request" -msgstr "" +msgstr "Bad Request (noko gjekk gale)" #: mediagoblin/tools/response.py:53 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "The request sent to the server is invalid, please double check it" #: mediagoblin/tools/response.py:60 msgid "Operation not allowed" @@ -1459,7 +1459,7 @@ msgstr "Innspel" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formatterring." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1486,7 +1486,7 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formattering." #: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo Binary files differindex f355de82..238b025c 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po index a5e08b73..cf82c6b5 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/mediagoblin/language/pl/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Niestety rejestracja w tym serwisie jest wyÅ‚Ä…czona." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,14 +49,14 @@ msgstr "Niniejsze pole wymaga podania adresu poczty elektronicznej." msgid "Sorry, a user with that name already exists." msgstr "Niestety użytkownik o takiej nazwie już istnieje." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Niestety użytkownik z tym adresem e-mail już istnieje." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "Klucz kontrolny albo identyfikator użytkownika jest nieprawidÅ‚owy." #: mediagoblin/auth/views.py:161 msgid "" @@ -111,12 +111,12 @@ msgstr "Teraz możesz siÄ™ zalogować używajÄ…c nowego hasÅ‚a." #: mediagoblin/auth/views.py:334 msgid "You need to verify your email before you can reset your password." -msgstr "" +msgstr "Zanim bÄ™dziesz mógÅ‚ ponownie ustawić hasÅ‚o, musisz potwierdzić swój adres poczty elektronicznej." #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,39 +260,39 @@ msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożność." msgid "Profile changes saved" msgstr "Zapisano zmiany profilu" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Zapisano ustawienia konta" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Musisz potwierdzić, że chcesz skasować swoje konto." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Kolekcja \"%s\" już istnieje!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Kolekcja tego użytkownika z takim slugiem już istnieje." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Edytujesz kolekcjÄ™ innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "NieprawidÅ‚owe hasÅ‚o" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Twoje hasÅ‚o zostaÅ‚o zmienione" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." -msgstr "" +msgstr "Twój adres poczty elektronicznej zostaÅ‚ potwierdzony." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -357,7 +357,7 @@ msgstr "" #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Musisz podać oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." @@ -382,7 +382,7 @@ msgstr "Nazwa konta lub adres poczty elektronicznej" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "PozostaÅ„ zalogowany" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -475,11 +475,11 @@ msgstr "" #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Przepraszamy, serwer OpenID nie zostaÅ‚ znaleziony" #: mediagoblin/plugins/openid/views.py:61 #, python-format @@ -493,7 +493,7 @@ msgstr "" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Potwierdzenie anulowane" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." @@ -511,20 +511,20 @@ msgstr "" #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "Konto OpenID zostaÅ‚o pomyÅ›lnie usuniÄ™te." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Dodaj konto OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "UsuÅ„ konto OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -554,15 +554,15 @@ msgstr "Logowanie nie powiodÅ‚o siÄ™!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Zaloguj siÄ™, aby utworzyć konto!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "Albo zaloguj siÄ™ hasÅ‚em!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "Albo zaloguj siÄ™ kontem OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "NiewÅ‚aÅ›ciwy plik dla tego rodzaju mediów." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" @@ -737,7 +737,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "JesteÅ› zalogowany jako" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " @@ -761,7 +761,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Zobacz swoje dane (np. profil, media, itp.)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" @@ -777,7 +777,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" +msgstr "Skopiuj i wklej to do swojego klienta:" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 @@ -940,7 +940,7 @@ msgstr "Zapisz zmiany" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" +msgstr "Zmieniam konto poczty elektronicznej dla %(username)s" #: mediagoblin/templates/mediagoblin/edit/change_email.html:40 #: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 @@ -986,7 +986,7 @@ msgstr "UsuÅ„ moje konto" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 msgid "Email" -msgstr "" +msgstr "Adres poczty elektronicznej" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1015,7 +1015,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nowe komentarze" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 @@ -1027,7 +1027,7 @@ msgstr "%(formatted_time)s temu" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Oznacz wszystkie jako przeczytane" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1139,7 +1139,7 @@ msgstr "Możesz pobrać porzÄ…dnÄ… przeglÄ…darkÄ™, która jest w stanie odtworzy #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "Plik WebM (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -1229,7 +1229,7 @@ msgstr "Dodaj komentarz" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "PodglÄ…d komentarza" #: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" @@ -1403,7 +1403,7 @@ msgstr "WystÄ…piÅ‚ bÅ‚Ä…d" #: mediagoblin/tools/response.py:51 msgid "Bad Request" -msgstr "" +msgstr "NiewÅ‚aÅ›ciwe żądanie" #: mediagoblin/tools/response.py:53 msgid "The request sent to the server is invalid, please double check it" diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo Binary files differindex b4b98c5f..72cae0d0 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po index ab86c0a3..ca18fd9f 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Desculpa, o registro está desativado neste momento." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -53,12 +53,12 @@ msgstr "Este campo requer um endereço de email." msgid "Sorry, a user with that name already exists." msgstr "Desculpe, um usuário com este nome já existe." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Desculpe, um usuário com esse email já está cadastrado" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -120,8 +120,8 @@ msgstr "Você precisa verificar seu email antes de trocar sua senha." #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." -msgstr "Você não é mais um usuário ativo. Por favor entre em contato com o administrador do sistema para reativar sua conta." +"reactivate your account." +msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 @@ -186,7 +186,7 @@ msgid "Email me when others comment on my media" msgstr "Me enviar um email quando outras pessoas comentarem em minhas mÃdias" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -264,37 +264,37 @@ msgstr "Você está editando um perfil de usuário. Tenha cuidado." msgid "Profile changes saved" msgstr "As mudanças no perfil foram salvas" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "As mudanças na conta foram salvas" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Você precisa confirmar a exclusão da sua conta." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Você já tem uma coleção chamada \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Já existe uma coleção com este arquivo para este usuário." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Você está editando a coleção de um outro usuário. Prossiga com cuidado." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Senha errada" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Sua senha foi alterada com sucesso." -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "Seu endereço de email foi verificado." @@ -576,26 +576,26 @@ msgstr "Ou registre com OpenID!" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -619,15 +619,15 @@ msgstr "Ou entre com Persona!" msgid "Or register with Persona!" msgstr "Ou registre com Persona!" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Arquivo inválido para esse tipo de mÃdia" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "Falha ao copiar para armazenamento público." -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo Binary files differindex 1dceeb28..32504b9a 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index fea1e215..00edc228 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe acest server." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,12 +49,12 @@ msgstr "Această rubrică trebuie completată cu o adresă de e-mail." msgid "Sorry, a user with that name already exists." msgstr "Ne pare rău, există deja un utilizator cu acelaÈ™i nume." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Există deja un utilizator înregistrat cu această adresă de e-mail." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -116,7 +116,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "Trimite-mi un e-mail când alÈ›ii comentează fiÈ™ierele mele" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,37 +260,37 @@ msgstr "Editezi profilul unui utilizator. Se recomandă prudență." msgid "Profile changes saved" msgstr "Modificările profilului au fost salvate" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Setările pentru acest cont au fost salvate" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Trebuie să confirmi È™tergerea contului tău." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ai deja o colecÈ›ie numită \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "O colecÈ›ie cu acelaÈ™i slug există deja pentru acest utilizator." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Lucrezi pe colecÈ›ia unui alt utilizator. Se recomandă prudență." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Parolă incorectă" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Parola a fost schimbată cu succes" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Formatul fiÈ™ierului nu corespunde cu tipul de media selectat." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo Binary files differindex 67260588..8c537cc3 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index fe2eaf40..a1c0e1d8 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -5,12 +5,13 @@ # Translators: # aleksejrs <deletesoftware@yandex.ru>, 2013 # aleksejrs <deletesoftware@yandex.ru>, 2011-2012 +# Yury Sakarinen, 2013 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/mediagoblin/language/ru/)\n" "MIME-Version: 1.0\n" @@ -25,7 +26,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Извините, на Ñтом Ñайте региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð°." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -35,7 +36,7 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ Ñлектронной #: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." -msgstr "" +msgstr "Ðеправильное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ Ñлектронной почты." #: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." @@ -49,12 +50,12 @@ msgstr "Ðто поле — Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑа Ñлектронной Ð¿Ð¾Ñ‡Ñ‚Ñ msgid "Sorry, a user with that name already exists." msgstr "Извините, пользователь Ñ Ñтим именем уже зарегиÑтрирован." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Сожалеем, но на Ñтот Ð°Ð´Ñ€ÐµÑ Ñлектронной почты уже зарегиÑтрирована Ð´Ñ€ÑƒÐ³Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -78,7 +79,7 @@ msgstr "Ð’Ñ‹ уже потвердили Ñвой Ð°Ð´Ñ€ÐµÑ ÑлектроннР#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." -msgstr "ПереÑлать Ñообщение Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸ÐµÐ¼ аккаунта." +msgstr "Отправить заново Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подтверждение по е-мÑйл." #: mediagoblin/auth/views.py:237 msgid "" @@ -103,7 +104,7 @@ msgstr "Мы не можем отправить Ñообщение Ð´Ð»Ñ Ð²Ð¾Ñ #: mediagoblin/auth/views.py:306 msgid "The user id is incorrect." -msgstr "" +msgstr "ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ неверно." #: mediagoblin/auth/views.py:323 msgid "You can now log in using your new password." @@ -116,7 +117,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +183,7 @@ msgid "Email me when others comment on my media" msgstr "УведомлÑÑ‚ÑŒ Ð¼ÐµÐ½Ñ Ð¿Ð¾ e-mail о комментариÑÑ… к моим файлам" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -222,7 +223,7 @@ msgstr "Ðовый пароль" #: mediagoblin/edit/forms.py:116 msgid "New email address" -msgstr "" +msgstr "Ðовый Ð°Ð´Ñ€ÐµÑ Ñлектронной почты" #: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 @@ -233,7 +234,7 @@ msgstr "Пароль" #: mediagoblin/edit/forms.py:122 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Введите Ñвой пароль в качеÑтве доказательÑтва, что Ñто ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -260,37 +261,37 @@ msgstr "Ð’Ñ‹ редактируете профиль пользователÑ. Ð msgid "Profile changes saved" msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñохранены" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "ÐаÑтройки учётной запиÑи запиÑаны" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Вам нужно подтвердить, что вы хотите удалить Ñвою учётную запиÑÑŒ." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "У Ð²Ð°Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ ÐºÐ¾Ð»Ð»ÐµÐºÑ†Ð¸Ñ Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ «%s»!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "У Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ ÐºÐ¾Ð»Ð»ÐµÐºÑ†Ð¸Ñ Ñ Ñ‚Ð°ÐºÐ¾Ð¹ отличительной чаÑтью адреÑа." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Ð’Ñ‹ редактируете коллекцию другого пользователÑ. Будьте оÑторожны." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Ðеправильный пароль" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Ваш пароль Ñменён уÑпешно" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -367,7 +368,7 @@ msgstr "" #: mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 msgid "Username" -msgstr "Логин" +msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" #: mediagoblin/plugins/basic_auth/forms.py:32 #: mediagoblin/plugins/openid/forms.py:31 @@ -395,15 +396,15 @@ msgstr "ПоÑмотреть на <a href=\"%(osm_url)s\">OpenStreetMap</a>" #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" -msgstr "" +msgstr "Разрешить" #: mediagoblin/plugins/oauth/forms.py:30 msgid "Deny" -msgstr "" +msgstr "Запретить" #: mediagoblin/plugins/oauth/forms.py:34 msgid "Name" -msgstr "" +msgstr "ИмÑ" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" @@ -475,7 +476,7 @@ msgstr "" #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" @@ -518,13 +519,13 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Добавить OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Удалить OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -572,26 +573,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +616,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ðеправильный формат файла." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" @@ -761,7 +762,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "ПоÑмотреть личную информацию (напр. профиль, файлы и Ñ‚.д.)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" @@ -813,7 +814,7 @@ msgstr "Привет, %(username)s,\n\nчтобы Ñменить Ñвой пар #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "Ещё нету аккаунта?" +msgstr "Ðет аккаунта?" #: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" @@ -826,7 +827,7 @@ msgstr "Забыли Ñвой пароль?" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" -msgstr "Создать аккаунт!" +msgstr "Создайте аккаунт!" #: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" @@ -986,7 +987,7 @@ msgstr "Удалить мою учётную запиÑÑŒ" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 msgid "Email" -msgstr "" +msgstr "Е-майл " #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1015,7 +1016,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Ðовые комментарии" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 @@ -1027,7 +1028,7 @@ msgstr "%(formatted_time)s назад" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Отметить вÑе, как прочтенные" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1139,7 +1140,7 @@ msgstr "Ð’Ñ‹ можете Ñкачать Ñовременный браузер, #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "WebM файл (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -1229,7 +1230,7 @@ msgstr "Добавить Ñтот комментарий" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Предварительный проÑмотр комментариÑ" #: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" @@ -1243,7 +1244,7 @@ msgstr "Добавление «%(media_title)s» в коллекцию" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" -msgstr "" +msgstr "+" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" @@ -1403,7 +1404,7 @@ msgstr "Произошла ошибка" #: mediagoblin/tools/response.py:51 msgid "Bad Request" -msgstr "" +msgstr "Ðеверный запроÑ" #: mediagoblin/tools/response.py:53 msgid "The request sent to the server is invalid, please double check it" @@ -1429,23 +1430,23 @@ msgstr "" #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "год" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "меÑÑц" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "неделÑ" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "день" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "чаÑ" #: mediagoblin/tools/timesince.py:67 msgid "minute" diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo Binary files differindex b9cddbc9..de023128 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index fade34cb..fb5088c8 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/mediagoblin/language/sk/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "PrepáÄ, registrácia na danej inÅ¡tancii nie je povolená." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -53,12 +53,12 @@ msgstr "Toto pole vyžaduje e-mailovú adresu." msgid "Sorry, a user with that name already exists." msgstr "PrepáÄ, rovnaké použÃvateľské meno už existuje." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "PrepáÄ, rovnaká e-mailová adresa už bola použitá na vytvorenie úÄtu." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -120,7 +120,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -186,7 +186,7 @@ msgid "Email me when others comment on my media" msgstr "ZaÅ¡li mi e-mail keÄ ostatnà okomentujú môj výtvor" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -264,37 +264,37 @@ msgstr "UpravujeÅ¡ profil iného použÃvateľa. Pristupuj zodpovedne. " msgid "Profile changes saved" msgstr "Zmeny v profile uložené" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Nastavenia úÄtu uložené" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "PotrebujeÅ¡ potvrdiÅ¥ odstránenie svojho úÄtu." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Už máš kolekciu nazvanú ako \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Kolekcia s týmto Å¡tÃtkom už máš." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "UpravujeÅ¡ kolekciu iného použÃvateľa. Pristupuj zodpovedne. " -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Nesprávne heslo" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Tvoje heslo bolo úspeÅ¡ne zmenené" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -576,26 +576,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -619,15 +619,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Nesprávny typ súboru pre dané médium." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo Binary files differindex cccf7f95..113553fb 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po index e0be0b94..1ad70dc0 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/mediagoblin/language/sl/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Oprostite, prijava za ta izvod ni omogoÄena." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -48,12 +48,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "Oprostite, uporabnik s tem imenom že obstaja." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -115,7 +115,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -181,7 +181,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -259,37 +259,37 @@ msgstr "Urejate uporabniÅ¡ki profil. Nadaljujte pazljivo." msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -571,26 +571,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -614,15 +614,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Za vrsto vsebine je bila podana napaÄna datoteka." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo Binary files differindex f89a2d41..d7fc5203 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index 112b3255..f20af6cf 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Na njdeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,12 +49,12 @@ msgstr "Kjo fushë lyp një adresë email." msgid "Sorry, a user with that name already exists." msgstr "Na ndjeni, ka tashmë një përdorues me këtë emër." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Na ndjeni, ka tashmë një përdorues me këtë adresë email." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -116,7 +116,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "Dërgomë email kur të tjerët komentojnë te media ime" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,37 +260,37 @@ msgstr "Po përpunoni profilin e një përdoruesi. Hapni sytë." msgid "Profile changes saved" msgstr "Ndryshimet e profilit u ruajtën" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Rregullimet e llogarisë u ruajtën" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Lypset të ripohoni fshirjen e llogarisë suaj." -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Keni tashmë një koleksion të quajtur \"%s\"!" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Ka tashmë një koleksion me atë identifikues për këtë përdorues." -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Po përpunoni koleksionin e një tjetër përdoruesi. Hapni sytë." -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Fjalëkalim i gabuar" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Kartelë e gabuar e dhënë për llojin e medias." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo Binary files differindex 7def7506..b7cd984e 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po index 78491b09..1cb6b7ae 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -47,12 +47,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -114,7 +114,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -180,7 +180,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -258,37 +258,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -570,26 +570,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -613,15 +613,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo Binary files differindex 98e3d10c..3fec1005 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index a14257ec..ac9302be 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Vi beklagar, registreringen är avtängd pÃ¥ den här instansen." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -49,12 +49,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "En användare med det användarnamnet finns redan." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Det finns redan en användare med den e-postadressen." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -116,7 +116,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -182,7 +182,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -260,37 +260,37 @@ msgstr "Var försiktig, du redigerar en annan användares profil." msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Fel lösenord" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -572,26 +572,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -615,15 +615,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ogiltig fil för mediatypen." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo Binary files differindex 0f6a6db2..791028e4 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po index ffeda0ad..682d12f9 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/mediagoblin/language/te/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -48,12 +48,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -115,7 +115,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -181,7 +181,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -259,37 +259,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -571,26 +571,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -614,15 +614,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo Binary files differindex 6bf6670a..589333e7 100644 --- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po index e0199183..0084cf03 100644 --- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mediagoblin/language/tr_TR/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "Ãœzgünüz, bu durumda kayıt devre dışıdır." #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -48,12 +48,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "Maalesef, bu isimde bir kullanıcı mevcut." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Ãœzgünüz, bu e-posta adresine sahip bir kullanıcı zaten var." #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -115,7 +115,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -181,7 +181,7 @@ msgid "Email me when others comment on my media" msgstr "Medyama birisi yorum yazdığında bana e-posta at" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -259,37 +259,37 @@ msgstr "BaÅŸka bir kullanıcının profilini düzenlerken dikkatli davranın." msgid "Profile changes saved" msgstr "Profil deÄŸiÅŸiklikleri kaydedildi" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Hesap ayarları kaydedildi" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Yanlış parola" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Parolanız baÅŸarılı bir ÅŸekilde deÄŸiÅŸtirildi" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -571,26 +571,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -614,15 +614,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Bu medya türü için geçersiz dosya türü." -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo Binary files differindex ebbc7a24..282a8095 100644 --- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po index 1f781555..bfbdcd64 100644 --- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/mediagoblin/language/vi/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -47,12 +47,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -114,7 +114,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -180,7 +180,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -258,37 +258,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -570,26 +570,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -613,15 +613,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo Binary files differindex 827628b3..dfd0a5af 100644 --- a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po index 12019713..3c94d3f5 100644 --- a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mediagoblin/language/vi_VN/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -47,12 +47,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -114,7 +114,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -180,7 +180,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -258,37 +258,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -570,26 +570,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -613,15 +613,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo Binary files differindex fd9721a8..7c1bcda8 100644 --- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po index 4aba553e..b5122636 100644 --- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mediagoblin/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "抱æ‰ï¼Œæœ¬ç«™å·²æš‚åœæ³¨å†Œã€‚" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -52,12 +52,12 @@ msgstr "æ¤å—段需填写电å邮件地å€ã€‚" msgid "Sorry, a user with that name already exists." msgstr "抱æ‰ï¼Œè¯¥ç”¨æˆ·åå·²å˜åœ¨ã€‚" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "抱æ‰ï¼Œå·²æœ‰ç”¨æˆ·ç”¨è¯¥ç”µå邮件注册。" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -119,7 +119,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -185,7 +185,7 @@ msgid "Email me when others comment on my media" msgstr "当有人对我的媒体评论时给我电å邮件" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -263,37 +263,37 @@ msgstr "您æ£åœ¨ä¿®æ”¹åˆ«äººçš„个人资料，请å°å¿ƒæ“作。" msgid "Profile changes saved" msgstr "个人资料已修改" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "账户设置已ä¿å˜" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "您需è¦ç¡®è®¤åˆ 除您的账户。" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "您已ç»æœ‰ä¸€ä¸ªç§°åšâ€œ%sâ€çš„åˆé›†äº†ï¼" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "该用户已ç»æœ‰ä½¿ç”¨è¯¥ç®€ç§°çš„åˆé›†äº†ã€‚" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "您æ£åœ¨ä¿®æ”¹åˆ«äººçš„åˆé›†ï¼Œè¯·å°å¿ƒæ“作。" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "密ç 错误" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "您的密ç å·²æˆåŠŸä¿®æ”¹" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -575,26 +575,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -618,15 +618,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "æ供文件的媒体类型错误。" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo Binary files differindex 0a29257d..888052fb 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po index 31a46b6d..51759424 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -47,12 +47,12 @@ msgstr "" msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -114,7 +114,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -180,7 +180,7 @@ msgid "Email me when others comment on my media" msgstr "" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -258,37 +258,37 @@ msgstr "" msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -570,26 +570,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -613,15 +613,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo Binary files differindex 29abaf65..5e8ec911 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index cbde817c..586f3766 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-08-26 17:38-0500\n" -"PO-Revision-Date: 2013-08-26 22:39+0000\n" +"POT-Creation-Date: 2013-09-04 16:02-0500\n" +"PO-Revision-Date: 2013-09-04 21:03+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "Sorry, registration is disabled on this instance." msgstr "抱æ‰ï¼Œæœ¬ç«™å·²ç¶“æš«åœè¨»å†Šã€‚" #: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:76 +#: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" @@ -52,12 +52,12 @@ msgstr "本欄ä½éœ€è¦ email ä½ç½®ã€‚" msgid "Sorry, a user with that name already exists." msgstr "抱æ‰ï¼Œé€™å€‹ä½¿ç”¨è€…å稱已經å˜åœ¨ã€‚" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:446 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "抱æ‰ï¼Œæ¤ email ä½ç½®å·²ç¶“被註冊了。" #: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:402 mediagoblin/edit/views.py:423 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 msgid "The verification key or user id is incorrect." msgstr "" @@ -119,7 +119,7 @@ msgstr "" #: mediagoblin/auth/views.py:340 msgid "" "You are no longer an active user. Please contact the system admin to " -"reactivate your accoutn." +"reactivate your account." msgstr "" #: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 @@ -185,7 +185,7 @@ msgid "Email me when others comment on my media" msgstr "當有人å°æˆ‘的媒體留言時寄信給我" #: mediagoblin/edit/forms.py:67 -msgid "Enable/Disable insite notifications" +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 @@ -263,37 +263,37 @@ msgstr "您æ£åœ¨ä¿®æ”¹åˆ¥äººçš„個人檔案，請å°å¿ƒæ“作。" msgid "Profile changes saved" msgstr "個人檔案修改已儲å˜" -#: mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "帳號è¨å®šå·²å„²å˜" -#: mediagoblin/edit/views.py:281 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "æ‚¨å¿…é ˆè¦ç¢ºèªæ˜¯å¦åˆªé™¤æ‚¨çš„帳號。" -#: mediagoblin/edit/views.py:317 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "您已經有一個稱åšã€Œ%sã€çš„è’è—了ï¼" -#: mediagoblin/edit/views.py:321 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "這個使用者已經有使用該簡稱的è’è—了。" -#: mediagoblin/edit/views.py:336 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "您æ£åœ¨ä¿®æ”¹åˆ¥äººçš„è’è—，請å°å¿ƒæ“作。" -#: mediagoblin/edit/views.py:359 mediagoblin/edit/views.py:452 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "密碼錯誤" -#: mediagoblin/edit/views.py:374 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "您的密碼已經æˆåŠŸä¿®æ”¹" -#: mediagoblin/edit/views.py:417 +#: mediagoblin/edit/views.py:413 msgid "Your email address has been verified." msgstr "" @@ -575,26 +575,26 @@ msgstr "" msgid "Sorry, an account is already registered to that Persona email." msgstr "" -#: mediagoblin/plugins/persona/views.py:137 +#: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." msgstr "" -#: mediagoblin/plugins/persona/views.py:143 +#: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." msgstr "" -#: mediagoblin/plugins/persona/views.py:148 +#: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." msgstr "" -#: mediagoblin/plugins/persona/views.py:175 +#: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." msgstr "" -#: mediagoblin/plugins/persona/views.py:189 +#: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." msgstr "" @@ -618,15 +618,15 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:414 +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "指定錯誤的媒體類別ï¼" -#: mediagoblin/processing/__init__.py:421 +#: mediagoblin/processing/__init__.py:420 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:429 +#: mediagoblin/processing/__init__.py:428 msgid "An acceptable processing file was not found" msgstr "" diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index f42edfdd..b3c2a298 100644 --- a/mediagoblin/media_types/ascii/processing.py +++ b/mediagoblin/media_types/ascii/processing.py @@ -60,7 +60,7 @@ class CommonAsciiProcessor(MediaProcessor): # Conversions subdirectory to avoid collisions self.conversions_subdir = os.path.join( - self.workbench.dir, 'convirsions') + self.workbench.dir, 'conversions') os.mkdir(self.conversions_subdir) # Pull down and set up the processing file @@ -120,6 +120,9 @@ class CommonAsciiProcessor(MediaProcessor): thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_resizing(font, thumb_size): + return + tmp_thumb = os.path.join( self.conversions_subdir, self.name_builder.fill('{basename}.thumbnail.png')) @@ -144,10 +147,33 @@ class CommonAsciiProcessor(MediaProcessor): Image.ANTIALIAS) thumb.save(thumb_file) + thumb_info = {'font': font, + 'width': thumb_size[0], + 'height': thumb_size[1]} + + self.entry.set_file_metadata('thumb', **thumb_info) + _log.debug('Copying local file to public storage') store_public(self.entry, 'thumb', tmp_thumb, self.name_builder.fill('{basename}.thumbnail.jpg')) + def _skip_resizing(self, font, thumb_size): + thumb_info = self.entry.get_file_metadata('thumb') + + if not thumb_info: + return False + + skip = True + + if thumb_info.get('font') != font: + skip = False + elif thumb_info.get('width') != thumb_size[0]: + skip = False + elif thumb_info.get('height') != thumb_size[1]: + skip = False + + return skip + class InitialProcessor(CommonAsciiProcessor): """ diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py index d0716448..883d3ffc 100644 --- a/mediagoblin/media_types/audio/processing.py +++ b/mediagoblin/media_types/audio/processing.py @@ -87,10 +87,34 @@ class CommonAudioProcessor(MediaProcessor): self.entry.media_files['best_quality'] = self.entry \ .media_files['webm_audio'] + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + skip = True + + if not file_metadata: + return False + + if keyname == 'webm_audio': + if kwargs.get('quality') != file_metadata.get('quality'): + skip = False + elif keyname == 'spectrogram': + if kwargs.get('max_width') != file_metadata.get('max_width'): + skip = False + elif kwargs.get('fft_size') != file_metadata.get('fft_size'): + skip = False + elif keyname == 'thumb': + if kwargs.get('size') != file_metadata.get('size'): + skip = False + + return skip + def transcode(self, quality=None): if not quality: quality = self.audio_config['quality'] + if self._skip_processing('webm_audio', quality=quality): + return + progress_callback = ProgressCallback(self.entry) webm_audio_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( @@ -110,12 +134,18 @@ class CommonAudioProcessor(MediaProcessor): store_public(self.entry, 'webm_audio', webm_audio_tmp, self.name_builder.fill('{basename}.medium.webm')) + self.entry.set_file_metadata('webm_audio', **{'quality': quality}) + def create_spectrogram(self, max_width=None, fft_size=None): if not max_width: max_width = mgg.global_config['media:medium']['max_width'] if not fft_size: fft_size = self.audio_config['spectrogram_fft_size'] + if self._skip_processing('spectrogram', max_width=max_width, + fft_size=fft_size): + return + wav_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( '{basename}.ogg')) @@ -140,12 +170,19 @@ class CommonAudioProcessor(MediaProcessor): store_public(self.entry, 'spectrogram', spectrogram_tmp, self.name_builder.fill('{basename}.spectrogram.jpg')) + file_metadata = {'max_width': max_width, + 'fft_size': fft_size} + self.entry.set_file_metadata('spectrogram', **file_metadata) + def generate_thumb(self, size=None): if not size: max_width = mgg.global_config['media:thumb']['max_width'] max_height = mgg.global_config['media:thumb']['max_height'] size = (max_width, max_height) + if self._skip_processing('thumb', size=size): + return + thumb_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( '{basename}-thumbnail.jpg')) @@ -166,6 +203,8 @@ class CommonAudioProcessor(MediaProcessor): store_public(self.entry, 'thumb', thumb_tmp, self.name_builder.fill('{basename}.thumbnail.jpg')) + self.entry.set_file_metadata('thumb', **{'size': size}) + class InitialProcessor(CommonAudioProcessor): """ diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index 555a0e0a..a0ad2ce8 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -76,6 +76,14 @@ def resize_image(entry, resized, keyname, target_name, new_size, resized.save(resized_file, quality=quality) store_public(entry, keyname, tmp_resized_filename, target_name) + # store the thumb/medium info + image_info = {'width': new_size[0], + 'height': new_size[1], + 'quality': quality, + 'filter': filter} + + entry.set_file_metadata(keyname, **image_info) + def resize_tool(entry, force, keyname, orig_file, target_name, @@ -86,6 +94,13 @@ def resize_tool(entry, max_height = mgg.global_config['media:' + keyname]['max_height'] new_size = (max_width, max_height) + # If thumb or medium is already the same quality and size, then don't + # reprocess + if _skip_resizing(entry, keyname, new_size, quality, filter): + _log.info('{0} of same size and quality already in use, skipping ' + 'resizing of media {1}.'.format(keyname, entry.id)) + return + # If the size of the original file exceeds the specified size for the desized # file, a target_name file is created and later associated with the media # entry. @@ -105,6 +120,32 @@ def resize_tool(entry, quality, filter) +def _skip_resizing(entry, keyname, size, quality, filter): + """ + Determines wither the saved thumb or medium is of the same quality and size + """ + image_info = entry.get_file_metadata(keyname) + + if not image_info: + return False + + skip = True + + if image_info.get('width') != size[0]: + skip = False + + elif image_info.get('height') != size[1]: + skip = False + + elif image_info.get('filter') != filter: + skip = False + + elif image_info.get('quality') != quality: + skip = False + + return skip + + SUPPORTED_FILETYPES = ['png', 'gif', 'jpg', 'jpeg', 'tiff'] @@ -144,7 +185,7 @@ class CommonImageProcessor(MediaProcessor): ## @@: Should this be two functions? # Conversions subdirectory to avoid collisions self.conversions_subdir = os.path.join( - self.workbench.dir, 'convirsions') + self.workbench.dir, 'conversions') os.mkdir(self.conversions_subdir) # Pull down and set up the processing file diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py index 549def69..b60495eb 100644 --- a/mediagoblin/media_types/pdf/processing.py +++ b/mediagoblin/media_types/pdf/processing.py @@ -261,6 +261,22 @@ class CommonPdfProcessor(MediaProcessor): else: self.pdf_filename = self._generate_pdf() + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + skip = True + + if not file_metadata: + return False + + if keyname == 'thumb': + if kwargs.get('thumb_size') != file_metadata.get('thumb_size'): + skip = False + elif keyname == 'medium': + if kwargs.get('size') != file_metadata.get('size'): + skip = False + + return skip + def copy_original(self): copy_original( self.entry, self.process_filename, @@ -271,6 +287,9 @@ class CommonPdfProcessor(MediaProcessor): thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_processing('thumb', thumb_size=thumb_size): + return + # Note: pdftocairo adds '.png', so don't include an ext thumb_filename = os.path.join(self.workbench.dir, self.name_builder.fill( @@ -288,6 +307,8 @@ class CommonPdfProcessor(MediaProcessor): store_public(self.entry, 'thumb', thumb_filename + '.png', self.name_builder.fill('{basename}.thumbnail.png')) + self.entry.set_file_metadata('thumb', thumb_size=thumb_size) + def _generate_pdf(self): """ Store the pdf. If the file is not a pdf, make it a pdf @@ -317,6 +338,9 @@ class CommonPdfProcessor(MediaProcessor): size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('medium', size=size): + return + # Note: pdftocairo adds '.png', so don't include an ext filename = os.path.join(self.workbench.dir, self.name_builder.fill('{basename}.medium')) @@ -333,6 +357,8 @@ class CommonPdfProcessor(MediaProcessor): store_public(self.entry, 'medium', filename + '.png', self.name_builder.fill('{basename}.medium.png')) + self.entry.set_file_metadata('medium', size=size) + class InitialProcessor(CommonPdfProcessor): """ diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index 77d3d86e..39949b59 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -144,11 +144,30 @@ class CommonStlProcessor(MediaProcessor): # copy it up! store_public(self.entry, keyname, workbench_path, filename) + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + + if not file_metadata: + return False + skip = True + + if keyname == 'thumb': + if kwargs.get('thumb_size') != file_metadata.get('thumb_size'): + skip = False + else: + if kwargs.get('size') != file_metadata.get('size'): + skip = False + + return skip + def generate_thumb(self, thumb_size=None): if not thumb_size: thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_processing('thumb', thumb_size=thumb_size): + return + self._snap( "thumb", "{basename}.thumb.jpg", @@ -156,11 +175,16 @@ class CommonStlProcessor(MediaProcessor): thumb_size, project="PERSP") + self.entry.set_file_metadata('thumb', thumb_size=thumb_size) + def generate_perspective(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('perspective', size=size): + return + self._snap( "perspective", "{basename}.perspective.jpg", @@ -168,11 +192,16 @@ class CommonStlProcessor(MediaProcessor): size, project="PERSP") + self.entry.set_file_metadata('perspective', size=size) + def generate_topview(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('top', size=size): + return + self._snap( "top", "{basename}.top.jpg", @@ -180,11 +209,16 @@ class CommonStlProcessor(MediaProcessor): self.greatest*2], size) + self.entry.set_file_metadata('top', size=size) + def generate_frontview(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('front', size=size): + return + self._snap( "front", "{basename}.front.jpg", @@ -192,11 +226,16 @@ class CommonStlProcessor(MediaProcessor): self.model.average[2]], size) + self.entry.set_file_metadata('front', size=size) + def generate_sideview(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('side', size=size): + return + self._snap( "side", "{basename}.side.jpg", @@ -204,6 +243,8 @@ class CommonStlProcessor(MediaProcessor): self.model.average[2]], size) + self.entry.set_file_metadata('side', size=size) + def store_dimensions(self): """ Put model dimensions into the database diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index 4d1d5ea2..5ef9b854 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -155,6 +155,29 @@ class CommonVideoProcessor(MediaProcessor): self.entry.media_files['best_quality'] = self.entry \ .media_files['webm_video'] + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + + if not file_metadata: + return False + skip = True + + if keyname == 'webm_video': + if kwargs.get('medium_size') != file_metadata.get('medium_size'): + skip = False + elif kwargs.get('vp8_quality') != file_metadata.get('vp8_quality'): + skip = False + elif kwargs.get('vp8_threads') != file_metadata.get('vp8_threads'): + skip = False + elif kwargs.get('vorbis_quality') != \ + file_metadata.get('vorbis_quality'): + skip = False + elif keyname == 'thumb': + if kwargs.get('thumb_size') != file_metadata.get('thumb_size'): + skip = False + + return skip + def transcode(self, medium_size=None, vp8_quality=None, vp8_threads=None, vorbis_quality=None): @@ -173,6 +196,14 @@ class CommonVideoProcessor(MediaProcessor): if not vorbis_quality: vorbis_quality = self.video_config['vorbis_quality'] + file_metadata = {'medium_size': medium_size, + 'vp8_threads': vp8_threads, + 'vp8_quality': vp8_quality, + 'vorbis_quality': vorbis_quality} + + if self._skip_processing('webm_video', **file_metadata): + return + # Extract metadata and keep a record of it metadata = self.transcoder.discover(self.process_filename) store_metadata(self.entry, metadata) @@ -209,6 +240,8 @@ class CommonVideoProcessor(MediaProcessor): self.name_builder.fill('{basename}.medium.webm')) _log.debug('Saved medium') + self.entry.set_file_metadata('webm_video', **file_metadata) + self.did_transcode = True # Save the width and height of the transcoded video @@ -225,6 +258,9 @@ class CommonVideoProcessor(MediaProcessor): if not thumb_size: thumb_size = (mgg.global_config['media:thumb']['max_width'],) + if self._skip_processing('thumb', thumb_size=thumb_size): + return + # We will only use the width so that the correct scale is kept transcoders.VideoThumbnailerMarkII( self.process_filename, @@ -236,6 +272,7 @@ class CommonVideoProcessor(MediaProcessor): store_public(self.entry, 'thumb', tmp_thumb, self.name_builder.fill('{basename}.thumbnail.jpg')) + self.entry.set_file_metadata('thumb', thumb_size=thumb_size) class InitialProcessor(CommonVideoProcessor): """ diff --git a/mediagoblin/oauth/views.py b/mediagoblin/oauth/views.py index 116eb023..14c8ab14 100644 --- a/mediagoblin/oauth/views.py +++ b/mediagoblin/oauth/views.py @@ -18,12 +18,12 @@ import datetime from oauthlib.oauth1 import (RequestTokenEndpoint, AuthorizationEndpoint, AccessTokenEndpoint) - + from mediagoblin.decorators import require_active_login from mediagoblin.tools.translate import pass_to_ugettext from mediagoblin.meddleware.csrf import csrf_exempt from mediagoblin.tools.request import decode_request -from mediagoblin.tools.response import (render_to_response, redirect, +from mediagoblin.tools.response import (render_to_response, redirect, json_response, render_400, form_response) from mediagoblin.tools.crypto import random_string @@ -41,7 +41,7 @@ client_types = ["web", "native"] # currently what pump supports def client_register(request): """ Endpoint for client registration """ try: - data = decode_request(request) + data = decode_request(request) except ValueError: error = "Could not decode data." return json_response({"error": error}, status=400) @@ -56,7 +56,7 @@ def client_register(request): if data.get("application_type", None) not in client_types: error = "Unknown application_type." return json_response({"error": error}, status=400) - + client_type = data["type"] if client_type == "client_update": @@ -69,7 +69,7 @@ def client_register(request): return json_response({"error": error}, status=400) client = Client.query.filter_by( - id=data["client_id"], + id=data["client_id"], secret=data["client_secret"] ).first() @@ -78,7 +78,7 @@ def client_register(request): return json_response({"error": error}, status=403) client.application_name = data.get( - "application_name", + "application_name", client.application_name ) @@ -108,12 +108,12 @@ def client_register(request): client_secret = random_string(43) # again, seems to be what pump uses expirey = 0 # for now, lets not have it expire expirey_db = None if expirey == 0 else expirey - application_type = data["application_type"] - + application_type = data["application_type"] + # save it client = Client( - id=client_id, - secret=client_secret, + id=client_id, + secret=client_secret, expirey=expirey_db, application_type=application_type, ) @@ -126,12 +126,12 @@ def client_register(request): if logo_url is not None and not validate_url(logo_url): error = "Logo URL {0} is not a valid URL.".format(logo_url) return json_response( - {"error": error}, + {"error": error}, status=400 ) else: client.logo_url = logo_url - + client.application_name = data.get("application_name", None) contacts = data.get("contacts", None) @@ -146,8 +146,8 @@ def client_register(request): # not a valid email error = "Email {0} is not a valid email.".format(contact) return json_response({"error": error}, status=400) - - + + client.contacts = contacts redirect_uris = data.get("redirect_uris", None) @@ -166,7 +166,7 @@ def client_register(request): client.redirect_uri = redirect_uris - + client.save() expirey = 0 if client.expirey is None else client.expirey @@ -182,7 +182,7 @@ def client_register(request): def request_token(request): """ Returns request token """ try: - data = decode_request(request) + data = decode_request(request) except ValueError: error = "Could not decode data." return json_response({"error": error}, status=400) @@ -193,7 +193,7 @@ def request_token(request): if not data and request.headers: data = request.headers - + data = dict(data) # mutableifying authorization = decode_authorization_header(data) @@ -226,12 +226,12 @@ def request_token(request): return form_response(tokens) -@require_active_login +@require_active_login def authorize(request): """ Displays a page for user to authorize """ if request.method == "POST": return authorize_finish(request) - + _ = pass_to_ugettext token = request.args.get("oauth_token", None) if token is None: @@ -243,10 +243,10 @@ def authorize(request): if oauth_request is None: err_msg = _("No request token found.") return render_400(request, err_msg) - + if oauth_request.used: return authorize_finish(request) - + if oauth_request.verifier is None: orequest = GMGRequest(request) request_validator = GMGRequestValidator() @@ -279,7 +279,7 @@ def authorize(request): "mediagoblin/api/authorize.html", context ) - + def authorize_finish(request): """ Finishes the authorize """ @@ -288,7 +288,7 @@ def authorize_finish(request): verifier = request.form["oauth_verifier"] oauth_request = RequestToken.query.filter_by(token=token, verifier=verifier) oauth_request = oauth_request.first() - + if oauth_request is None: # invalid token or verifier err_msg = _("No request token found.") @@ -321,10 +321,10 @@ def authorize_finish(request): @csrf_exempt def access_token(request): - """ Provides an access token based on a valid verifier and request token """ + """ Provides an access token based on a valid verifier and request token """ data = request.headers - parsed_tokens = decode_authorization_header(data) + parsed_tokens = decode_authorization_header(data) if parsed_tokens == dict() or "oauth_token" not in parsed_tokens: error = "Missing required parameter." diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index 33a554b0..64564c7f 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -13,17 +13,45 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from pkg_resources import resource_filename +import os + from mediagoblin.plugins.basic_auth import forms as auth_forms from mediagoblin.plugins.basic_auth import tools as auth_tools from mediagoblin.auth.tools import create_basic_user from mediagoblin.db.models import User from mediagoblin.tools import pluginapi from sqlalchemy import or_ +from mediagoblin.tools.staticdirect import PluginStatic + + +PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): config = pluginapi.get_config('mediagoblin.plugins.basic_auth') + routes = [ + ('mediagoblin.plugins.basic_auth.edit.pass', + '/edit/password/', + 'mediagoblin.plugins.basic_auth.views:change_pass'), + ('mediagoblin.plugins.basic_auth.forgot_password', + '/auth/forgot_password/', + 'mediagoblin.plugins.basic_auth.views:forgot_password'), + ('mediagoblin.plugins.basic_auth.verify_forgot_password', + '/auth/forgot_password/verify/', + 'mediagoblin.plugins.basic_auth.views:verify_forgot_password')] + + pluginapi.register_routes(routes) + pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) + + pluginapi.register_template_hooks( + {'edit_link': 'mediagoblin/plugins/basic_auth/edit_link.html', + 'fp_link': 'mediagoblin/plugins/basic_auth/fp_link.html', + 'fp_head': 'mediagoblin/plugins/basic_auth/fp_head.html', + 'create_account': + 'mediagoblin/plugins/basic_auth/create_account_link.html'}) + def get_user(**kwargs): username = kwargs.pop('username', None) @@ -85,4 +113,7 @@ hooks = { 'auth_check_password': check_password, 'auth_fake_login_attempt': auth_tools.fake_login_attempt, 'template_global_context': append_to_global_context, + 'static_setup': lambda: PluginStatic( + 'coreplugin_basic_auth', + resource_filename('mediagoblin.plugins.basic_auth', 'static')) } diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py index 6cf01b38..c10496f8 100644 --- a/mediagoblin/plugins/basic_auth/forms.py +++ b/mediagoblin/plugins/basic_auth/forms.py @@ -44,3 +44,33 @@ class LoginForm(wtforms.Form): stay_logged_in = wtforms.BooleanField( label='', description=_('Stay logged in')) + + +class ForgotPassForm(wtforms.Form): + username = wtforms.TextField( + _('Username or email'), + [wtforms.validators.Required(), + normalize_user_or_email_field()]) + + +class ChangeForgotPassForm(wtforms.Form): + password = wtforms.PasswordField( + 'Password', + [wtforms.validators.Required(), + wtforms.validators.Length(min=5, max=1024)]) + token = wtforms.HiddenField( + '', + [wtforms.validators.Required()]) + + +class ChangePassForm(wtforms.Form): + old_password = wtforms.PasswordField( + _('Old password'), + [wtforms.validators.Required()], + description=_( + "Enter your old password to prove you own this account.")) + new_password = wtforms.PasswordField( + _('New password'), + [wtforms.validators.Required(), + wtforms.validators.Length(min=6, max=30)], + id="password") diff --git a/mediagoblin/static/js/autofilledin_password.js b/mediagoblin/plugins/basic_auth/static/js/autofilledin_password.js index 45e867fe..45e867fe 100644 --- a/mediagoblin/static/js/autofilledin_password.js +++ b/mediagoblin/plugins/basic_auth/static/js/autofilledin_password.js diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html index a3cf9cb9..47cd591e 100644 --- a/mediagoblin/templates/mediagoblin/auth/change_fp.html +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html @@ -29,7 +29,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}" + <form action="{{ request.urlgen('mediagoblin.plugins.basic_auth.verify_forgot_password') }}" method="POST" enctype="multipart/form-data"> {{ csrf_token }} <div class="form_box"> diff --git a/mediagoblin/templates/mediagoblin/edit/change_pass.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html index 2a1ffee0..596a4def 100644 --- a/mediagoblin/templates/mediagoblin/edit/change_pass.html +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html @@ -31,7 +31,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.edit.pass') }}" + <form action="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}" method="POST" enctype="multipart/form-data"> <div class="form_box edit_box"> <h1> diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html new file mode 100644 index 00000000..7425630b --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html @@ -0,0 +1,27 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block create_account %} + {% if allow_registration %} + <p> + {% trans %}Don't have an account yet?{% endtrans %} + <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> + {%- trans %}Create one here!{% endtrans %}</a> + </p> + {% endif %} +{% endblock %} diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html new file mode 100644 index 00000000..9fd09ab1 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block change_pass_link %} + <p> + <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}"> + {% trans %}Change your password.{% endtrans %} + </a> + </p> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html index 6cfd2c85..b0028ab6 100644 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html @@ -24,7 +24,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" + <form action="{{ request.urlgen('mediagoblin.plugins.basic_auth.forgot_password') }}" method="POST" enctype="multipart/form-data"> {{ csrf_token }} <div class="form_box"> diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_head.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_head.html new file mode 100644 index 00000000..292dce28 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_head.html @@ -0,0 +1,20 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# + You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +<script type="text/javascript" + src="{{ request.staticdirect('/js/autofilledin_password.js', 'coreplugin_basic_auth') }}"></script> diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html new file mode 100644 index 00000000..404358d8 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block fp_link %} + <p> + <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.forgot_password') }}" id="forgot_password"> + {% trans %}Forgot your password?{% endtrans %}</a> + </p> +{% endblock %} + diff --git a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_verification_email.txt index fb5e1674..fb5e1674 100644 --- a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_verification_email.txt diff --git a/mediagoblin/plugins/basic_auth/tools.py b/mediagoblin/plugins/basic_auth/tools.py index 1300bb9a..f943bf39 100644 --- a/mediagoblin/plugins/basic_auth/tools.py +++ b/mediagoblin/plugins/basic_auth/tools.py @@ -16,6 +16,11 @@ import bcrypt import random +from mediagoblin import mg_globals +from mediagoblin.tools.crypto import get_timed_signer_url +from mediagoblin.tools.mail import send_email +from mediagoblin.tools.template import render_template + def bcrypt_check_password(raw_pass, stored_hash, extra_salt=None): """ @@ -82,3 +87,35 @@ def fake_login_attempt(): randplus_hashed_pass = bcrypt.hashpw(hashed_pass, rand_salt) randplus_stored_hash == randplus_hashed_pass + + +EMAIL_FP_VERIFICATION_TEMPLATE = ( + u"{uri}?" + u"token={fp_verification_key}") + + +def send_fp_verification_email(user, request): + """ + Send the verification email to users to change their password. + + Args: + - user: a user object + - request: the request + """ + fp_verification_key = get_timed_signer_url('mail_verification_token') \ + .dumps(user.id) + + rendered_email = render_template( + request, 'mediagoblin/plugins/basic_auth/fp_verification_email.txt', + {'username': user.username, + 'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format( + uri=request.urlgen('mediagoblin.plugins.basic_auth.verify_forgot_password', + qualified=True), + fp_verification_key=fp_verification_key)}) + + # TODO: There is no error handling in place + send_email( + mg_globals.app_config['email_sender_address'], + [user.email], + 'GNU MediaGoblin - Change forgotten password!', + rendered_email) diff --git a/mediagoblin/plugins/basic_auth/views.py b/mediagoblin/plugins/basic_auth/views.py new file mode 100644 index 00000000..d0941ae5 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/views.py @@ -0,0 +1,217 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +from itsdangerous import BadSignature + +from mediagoblin import messages +from mediagoblin.db.models import User +from mediagoblin.decorators import require_active_login +from mediagoblin.plugins.basic_auth import forms, tools +from mediagoblin.tools.crypto import get_timed_signer_url +from mediagoblin.tools.mail import email_debug_message +from mediagoblin.tools.response import redirect, render_to_response, render_404 +from mediagoblin.tools.translate import pass_to_ugettext as _ + + +def forgot_password(request): + """ + Forgot password view + + Sends an email with an url to renew forgotten password. + Use GET querystring parameter 'username' to pre-populate the input field + """ + fp_form = forms.ForgotPassForm(request.form, + username=request.args.get('username')) + + if not (request.method == 'POST' and fp_form.validate()): + # Either GET request, or invalid form submitted. Display the template + return render_to_response(request, + 'mediagoblin/plugins/basic_auth/forgot_password.html', + {'fp_form': fp_form}) + + # If we are here: method == POST and form is valid. username casing + # has been sanitized. Store if a user was found by email. We should + # not reveal if the operation was successful then as we don't want to + # leak if an email address exists in the system. + found_by_email = '@' in fp_form.username.data + + if found_by_email: + user = User.query.filter_by( + email=fp_form.username.data).first() + # Don't reveal success in case the lookup happened by email address. + success_message = _("If that email address (case sensitive!) is " + "registered an email has been sent with " + "instructions on how to change your password.") + + else: # found by username + user = User.query.filter_by( + username=fp_form.username.data).first() + + if user is None: + messages.add_message(request, + messages.WARNING, + _("Couldn't find someone with that username.")) + return redirect(request, 'mediagoblin.auth.forgot_password') + + success_message = _("An email has been sent with instructions " + "on how to change your password.") + + if user and not(user.email_verified and user.status == 'active'): + # Don't send reminder because user is inactive or has no verified email + messages.add_message(request, + messages.WARNING, + _("Could not send password recovery email as your username is in" + "active or your account's email address has not been verified.")) + + return redirect(request, 'mediagoblin.user_pages.user_home', + user=user.username) + + # SUCCESS. Send reminder and return to login page + if user: + email_debug_message(request) + tools.send_fp_verification_email(user, request) + + messages.add_message(request, messages.INFO, success_message) + return redirect(request, 'mediagoblin.auth.login') + + +def verify_forgot_password(request): + """ + Check the forgot-password verification and possibly let the user + change their password because of it. + """ + # get form data variables, and specifically check for presence of token + formdata = _process_for_token(request) + if not formdata['has_token']: + return render_404(request) + + formdata_vars = formdata['vars'] + + # Catch error if token is faked or expired + try: + token = get_timed_signer_url("mail_verification_token") \ + .loads(formdata_vars['token'], max_age=10*24*3600) + except BadSignature: + messages.add_message( + request, + messages.ERROR, + _('The verification key or user id is incorrect.')) + + return redirect( + request, + 'index') + + # check if it's a valid user id + user = User.query.filter_by(id=int(token)).first() + + # no user in db + if not user: + messages.add_message( + request, messages.ERROR, + _('The user id is incorrect.')) + return redirect( + request, 'index') + + # check if user active and has email verified + if user.email_verified and user.status == 'active': + + cp_form = forms.ChangeForgotPassForm(formdata_vars) + + if request.method == 'POST' and cp_form.validate(): + user.pw_hash = tools.bcrypt_gen_password_hash( + cp_form.password.data) + user.save() + + messages.add_message( + request, + messages.INFO, + _("You can now log in using your new password.")) + return redirect(request, 'mediagoblin.auth.login') + else: + return render_to_response( + request, + 'mediagoblin/plugins/basic_auth/change_fp.html', + {'cp_form': cp_form}) + + if not user.email_verified: + messages.add_message( + request, messages.ERROR, + _('You need to verify your email before you can reset your' + ' password.')) + + if not user.status == 'active': + messages.add_message( + request, messages.ERROR, + _('You are no longer an active user. Please contact the system' + ' admin to reactivate your accoutn.')) + + return redirect( + request, 'index') + + +def _process_for_token(request): + """ + Checks for tokens in formdata without prior knowledge of request method + + For now, returns whether the userid and token formdata variables exist, and + the formdata variables in a hash. Perhaps an object is warranted? + """ + # retrieve the formdata variables + if request.method == 'GET': + formdata_vars = request.GET + else: + formdata_vars = request.form + + formdata = { + 'vars': formdata_vars, + 'has_token': 'token' in formdata_vars} + + return formdata + + +@require_active_login +def change_pass(request): + form = forms.ChangePassForm(request.form) + user = request.user + + if request.method == 'POST' and form.validate(): + + if not tools.bcrypt_check_password( + form.old_password.data, user.pw_hash): + form.old_password.errors.append( + _('Wrong password')) + + return render_to_response( + request, + 'mediagoblin/plugins/basic_auth/change_pass.html', + {'form': form, + 'user': user}) + + # Password matches + user.pw_hash = tools.bcrypt_gen_password_hash( + form.new_password.data) + user.save() + + messages.add_message( + request, messages.SUCCESS, + _('Your password was changed successfully')) + + return redirect(request, 'mediagoblin.edit.account') + + return render_to_response( + request, + 'mediagoblin/plugins/basic_auth/change_pass.html', + {'form': form, + 'user': user}) diff --git a/mediagoblin/plugins/ldap/README.rst b/mediagoblin/plugins/ldap/README.rst new file mode 100644 index 00000000..ae03b31e --- /dev/null +++ b/mediagoblin/plugins/ldap/README.rst @@ -0,0 +1,49 @@ +============= + ldap plugin +============= + +.. Warning:: + This plugin is not compatible with the other authentication plugins. + +This plugin allow your GNU Mediagoblin instance to authenticate against an +LDAP server. + +Set up the ldap plugin +====================== + +1. Install the ``python-ldap`` package. + +2. Add the following to your MediaGoblin .ini file in the ``[plugins]`` section:: + + [[mediagoblin.plugins.ldap]] + +Configuring the ldap plugin +=========================== + +This plugin allows you to use multiple ldap servers for authentication. + +In order to configure a server, add the following to you MediaGoblin .ini file +under the ldap plugin:: + + [[mediagoblin.plugins.ldap]] + [[[server1]]] + LDAP_SERVER_URI = 'ldap://ldap.testathon.net:389' + LDAP_USER_DN_TEMPLATE = 'cn={username},ou=users,dc=testathon,dc=net' + [[[server2]]] + ... + +Make any necessary changes to the above to work with your sever. Make sure +``{username}`` is where the username should be in LDAP_USER_DN_TEMPLATE. + +If you would like to fetch the users email from the ldap server upon account +registration, add ``LDAP_SEARCH_BASE = 'ou=users,dc=testathon,dc=net'`` and +``EMAIL_SEARCH_FIELD = 'mail'`` under you server configuration in your +MediaGoblin .ini file. + +.. Warning:: + By default, this plugin provides no encryption when communicating with the + ldap servers. If you would like to use an SSL connection, change + LDAP_SERVER_URI to use ``ldaps://`` and whichever port you use. Default ldap + port for SSL connections is 636. If you would like to use a TLS connection, + add ``LDAP_START_TLS = 'true'`` under your server configuration in your + MediaGoblin .ini file. diff --git a/mediagoblin/plugins/ldap/__init__.py b/mediagoblin/plugins/ldap/__init__.py new file mode 100644 index 00000000..4673acee --- /dev/null +++ b/mediagoblin/plugins/ldap/__init__.py @@ -0,0 +1,59 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import os + +from mediagoblin.auth.tools import create_basic_user +from mediagoblin.tools import pluginapi + +PLUGIN_DIR = os.path.dirname(__file__) + + +def setup_plugin(): + config = pluginapi.get_config('mediagoblin.plugins.ldap') + + routes = [ + ('mediagoblin.plugins.ldap.register', + '/auth/ldap/register/', + 'mediagoblin.plugins.ldap.views:register'), + ('mediagoblin.plugins.ldap.login', + '/auth/ldap/login/', + 'mediagoblin.plugins.ldap.views:login')] + + pluginapi.register_routes(routes) + pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) + + pluginapi.register_template_hooks( + {'create_account': 'mediagoblin/plugins/ldap/create_account_link.html'}) + + +def create_user(register_form): + if 'username' in register_form and 'password' not in register_form: + return create_basic_user(register_form) + + +def no_pass_redirect(): + return 'ldap' + + +def auth(): + return True + +hooks = { + 'setup': setup_plugin, + 'authentication': auth, + 'auth_no_pass_redirect': no_pass_redirect, + 'auth_create_user': create_user, +} diff --git a/mediagoblin/auth/forms.py b/mediagoblin/plugins/ldap/forms.py index 865502e9..7ec1479e 100644 --- a/mediagoblin/auth/forms.py +++ b/mediagoblin/plugins/ldap/forms.py @@ -13,25 +13,28 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - import wtforms from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.auth.tools import normalize_user_or_email_field -class ForgotPassForm(wtforms.Form): - username = wtforms.TextField( - _('Username or email'), +class RegisterForm(wtforms.Form): + username = wtforms.HiddenField( + '', [wtforms.validators.Required(), - normalize_user_or_email_field()]) + normalize_user_or_email_field(allow_email=False)]) + email = wtforms.TextField( + _('Email address'), + [wtforms.validators.Required(), + normalize_user_or_email_field(allow_user=False)]) -class ChangePassForm(wtforms.Form): - password = wtforms.PasswordField( - 'Password', +class LoginForm(wtforms.Form): + username = wtforms.TextField( + _('Username'), [wtforms.validators.Required(), - wtforms.validators.Length(min=5, max=1024)]) - token = wtforms.HiddenField( - '', + normalize_user_or_email_field()]) + password = wtforms.PasswordField( + _('Password'), [wtforms.validators.Required()]) diff --git a/mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html b/mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html new file mode 100644 index 00000000..947e4ae2 --- /dev/null +++ b/mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block create_account %} + {% if allow_registration %} + <p> + {% trans %}Sign in to create an account!{% endtrans %} + </p> + {% endif %} +{% endblock %} diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py new file mode 100644 index 00000000..1c436792 --- /dev/null +++ b/mediagoblin/plugins/ldap/tools.py @@ -0,0 +1,65 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import ldap +import logging + +from mediagoblin.tools import pluginapi + +_log = logging.getLogger(__name__) + + +class LDAP(object): + def __init__(self): + self.ldap_settings = pluginapi.get_config('mediagoblin.plugins.ldap') + + def _connect(self, server): + _log.info('Connecting to {0}.'.format(server['LDAP_SERVER_URI'])) + self.conn = ldap.initialize(server['LDAP_SERVER_URI']) + + if server['LDAP_START_TLS'] == 'true': + _log.info('Initiating TLS') + self.conn.start_tls_s() + + def _get_email(self, server, username): + try: + results = self.conn.search_s(server['LDAP_SEARCH_BASE'], + ldap.SCOPE_SUBTREE, 'uid={0}' + .format(username), + [server['EMAIL_SEARCH_FIELD']]) + + email = results[0][1][server['EMAIL_SEARCH_FIELD']][0] + except KeyError: + email = None + + return email + + def login(self, username, password): + for k, v in self.ldap_settings.iteritems(): + try: + self._connect(v) + user_dn = v['LDAP_USER_DN_TEMPLATE'].format(username=username) + self.conn.simple_bind_s(user_dn, password.encode('utf8')) + email = self._get_email(v, username) + return username, email + + except ldap.LDAPError, e: + _log.info(e) + + finally: + _log.info('Unbinding {0}.'.format(v['LDAP_SERVER_URI'])) + self.conn.unbind() + + return False, None diff --git a/mediagoblin/plugins/ldap/views.py b/mediagoblin/plugins/ldap/views.py new file mode 100644 index 00000000..aef1bf56 --- /dev/null +++ b/mediagoblin/plugins/ldap/views.py @@ -0,0 +1,104 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +from mediagoblin import mg_globals, messages +from mediagoblin.auth.tools import register_user +from mediagoblin.db.models import User +from mediagoblin.decorators import allow_registration, auth_enabled +from mediagoblin.plugins.ldap import forms +from mediagoblin.plugins.ldap.tools import LDAP +from mediagoblin.tools.translate import pass_to_ugettext as _ +from mediagoblin.tools.response import redirect, render_to_response + + +@auth_enabled +def login(request): + login_form = forms.LoginForm(request.form) + + login_failed = False + + if request.method == 'POST' and login_form.validate(): + l = LDAP() + username, email = l.login(login_form.username.data, + login_form.password.data) + + if username: + user = User.query.filter_by( + username=username).first() + + if user: + # set up login in session + request.session['user_id'] = unicode(user.id) + request.session.save() + + if request.form.get('next'): + return redirect(request, location=request.form['next']) + else: + return redirect(request, "index") + else: + if not mg_globals.app.auth: + messages.add_message( + request, + messages.WARNING, + _('Sorry, authentication is disabled on this ' + 'instance.')) + return redirect(request, 'index') + + register_form = forms.RegisterForm(username=username, + email=email) + + return render_to_response( + request, + 'mediagoblin/auth/register.html', + {'register_form': register_form, + 'post_url': request.urlgen('mediagoblin.plugins.ldap.register')}) + + login_failed = True + + return render_to_response( + request, + 'mediagoblin/auth/login.html', + {'login_form': login_form, + 'next': request.GET.get('next') or request.form.get('next'), + 'login_failed': login_failed, + 'post_url': request.urlgen('mediagoblin.plugins.ldap.login'), + 'allow_registration': mg_globals.app_config["allow_registration"]}) + + +@allow_registration +@auth_enabled +def register(request): + if request.method == 'GET': + return redirect( + request, + 'mediagoblin.plugins.ldap.login') + + register_form = forms.RegisterForm(request.form) + + if register_form.validate(): + user = register_user(request, register_form) + + if user: + # redirect the user to their homepage... there will be a + # message waiting for them to verify their email + return redirect( + request, 'mediagoblin.user_pages.user_home', + user=user.username) + + return render_to_response( + request, + 'mediagoblin/auth/register.html', + {'register_form': register_form, + 'post_url': request.urlgen('mediagoblin.plugins.ldap.register')}) diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html index 8d74c2b9..193a3b2d 100644 --- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html +++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html @@ -20,8 +20,8 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script> + {{ super() }} + {% template_hook("fp_head") %} {% endblock %} {% block title -%} diff --git a/mediagoblin/plugins/openid/views.py b/mediagoblin/plugins/openid/views.py index b639a4cb..bb2de7ab 100644 --- a/mediagoblin/plugins/openid/views.py +++ b/mediagoblin/plugins/openid/views.py @@ -195,11 +195,11 @@ def finish_login(request): return redirect(request, "index") else: # No user, need to register - if not mg_globals.app.auth: + if not mg_globals.app_config['allow_registration']: messages.add_message( request, messages.WARNING, - _('Sorry, authentication is disabled on this instance.')) + _('Sorry, registration is disabled on this instance.')) return redirect(request, 'index') # Get email and nickname from response diff --git a/mediagoblin/plugins/persona/static/js/persona.js b/mediagoblin/plugins/persona/static/js/persona.js index a6def398..76a7757a 100644 --- a/mediagoblin/plugins/persona/static/js/persona.js +++ b/mediagoblin/plugins/persona/static/js/persona.js @@ -17,14 +17,20 @@ */ $(document).ready(function () { + var requestParams = { + backgroundColor: "#171717", + siteName: "GNU MediaGoblin", + siteLogo: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAA0IklEQVR4XuSYS2gUSRyHq6ofk8kDZXycRTwEcfGgboIgBOMTFoxZ8LYXwcWDd/HoRUFPHvbg47gXQeMugqC7iiIeoht0IeDFg+ID8RBNYpKZ6e4qPyYVu5meBhkmSU9S8PHvamro6v76V93TUuSkHdz3q7z7701Tt6+b0gnr4SfYBptgM6yDEvSADwIq8BUmLK/gDbyE/2AKZjjOdNaxl5tlFXJgcFhJKR1EBAkJ/ZRdlu2wFdwWedcwDi9gDEYRMZoQ41Ei9ulVJWT/3qNSKeUuiEDCDspJOAxroQuSzTQ/5+zfJtL0yBhz4d79kXF7o/iUgL5ZNQlBQokyBOdhIwgIQFmWYm4aInBBwns4i5wbyPi8YhNCAhzSENntnym/we/gJy6KAyp1e5t4olJZaqqMrbYfj7fI+b62iHhsRopC8Gy/DFfhT+b9NHkObS8EAT4yqtRNdK9BH3QnLoTMkuC4BrDkGKEYJUCmZp0Skt6matChBK68lkI2OnJ6TmV4DMeR8W7hXNpdSA/lHJwCDaJBEiCW4PrzFV2tb1ZgGEJVCR0lxGUvaR78YYw5w1I23VZCeGCrfx7c0lbGCcpFWANV8EAmk6AUIMG1aZAyTsjiEh8rIjlhIJBDgnTDZa0KPnyB06Tkik2/YlvnVghvJy53UIiUDUqpO+za2XBpoicVEgqiJkLKHLz8m1hOtSLnsyEzl7JRGEbGB85ZkRqd24Qg5ZiU8no6EfFd6fpGeJDnFlatmGRLyxkKw/D2/Yd/t0yIaoEAZePrwGUrIwAf5PeHqxVR7NbCLxiR9+Yyx84eHd846SlX4C/HcS4N7PnFy1VCBgeOlFzXfWD/WZv654TrGeF3GKFUrd9eTeIiEqRFiShIXTENCv6H3RDat7DlE0IqeilPYG2jxCGiJmQltDBgGSvLrLexMvQi5O2SL1lIcBLfncagBLEMQ4cRxS7dlAxjDORNol1yOSelUnOT4MJr+xlIUOWSJgQZhygjUEwuUwY8u0St5FYhKVGQmZY+eG6M0fZ72KInpN/K6KgXWyjEMppNxtTHCTH1acLu+2GxqfHlclmEYVhL7NzcXK1fqVTE7MysmJycrNVGTWtdP6dUajuKRngFkyXkGWyxMhYnIQvv2/aZMQad9WMKiHD85v9hfyvvPaAsu8o7398+6cbKqburOudWd0tqqZUjSEjI5GD7EUQQPMRgj70MzJhZToPtsZ+xgWcPb8AYPBhsEGDikCwJkBDKoZU6q3N1pa548wl7v7O+dc7qW0F0Xut53qe119Gte+rW7f3f/y/tb39HRxplKUae2IsfBfRtW4vruliWxWmITGR6786dO9FRRMP3qZQrVGtVlFLp+wJUNpulra2Ngf5+FAptDJlMBs/zsG2LTDb7coDLZykFQaDwa/OYUgOyxphNMSi7L5jKuuXmN3Tatr0P6JzrTWVyBts9ezDSCfV9n6Gn99GXb+dEp2HZsmXCEnWK6DG956WXXmL3bpkDAj/AYGjPFrm0bw2hjujMteKHAZP1EuWwzlhlmhm/Qi1s4Cgbx3awlMIPfTJuBqPAdh06OzvZsGED+Xx+1t9DIaqrMR8UgFFgPVCLjX3jvAJyw7V32Llc7ilgy1xVJ2A4hnORdOWVSiWOPbOXX1tzJV8/9gjbr7wiXfkpMAsCUS6XefqppxmfGGegrYe8k+Gqgc2U/Spb+1YT6UgAj4zBoJHJdx0828NzXXkviALGylMxWGUMEKGZrsww6VfYOXKQkl9j0eJFbNu2DcdxaJYoUjSqC4KyIwbj0lizuPE1OEdAxF44MbphfP2cpMzPs5pqZkfKkF2PPMPbNt/CsyMvsd+aYPPmzQuqjBSo44PHefyJx+W9V6zcxhX9Gyh4OfwoxEKJ+kMBSmEri5jluJaL7QojUJaFsuOhbJQBO1FrlrLxwwZ1v8GxiSGOxmOoPMGJqMKmy7aKemtmbxTOY0oE2Eka/52ns1WsTtNu/DpwzxxvSgy4kzk3MJonGGBycpKjz+/j9auv4cj0CI+P7GHxosW0DHQTBgH5QmHWRAwPD/PoI4+yqKWL12+4lvZMUSbUUpYwQWGJXXK9DMoI8AJIPMRWeG4Wy1IYDADaICrLsgU4gkZA3a8ThgGVWoVypcRweZKD1VE6NgwIKCmDURA0lIwmCQEHeF8MxhfOkSGSve21LGsECACXBA3HOzdvKgUg9nbE8zlw4AC61GBL70r6iz30FNswGvLZrKzKqaDKiClRLpUIXUX/0gEGR4coTGmWtPVwy9rtjJenAcQRsC0bjSEMQ3nt2BbGgO24WJaNAmGX6zlYtkMUhvK+BgHTccWWiGNQq1Ypl0s0/DqNoIEC7j3wJLumjnHrrbfOciaUgnrVIgqZKzPApcChX5UhdjiFxGD8oCn9LGI5nDUY6Zc/evQow0NDHBscZH3nUrbE47pNWzAGGqGP2EsUjuOyqmsAY7QAmRvIcixmTmm6Sl53ceXmi7CVzVStgus4Mtme66HRGB3heS6u7aIsW4DxMhmMTDoox8HNeigUfqVGFISoKBTGWNrgeC6hEYDJZXMoECYFYQAGsVsx4MKk5lRRNqepVSy0pllagf8Rg3Hbr7InzilU1vuTFLqZbTf0WTMjBkNc0r1798rrt2y4kZWd/RSyObQBgyHjegJcJpNFoUR1KGWBglBreoqd9BW7BCw34wkIdhRgIo3lOKAjud9zLMRrslxRQY7j4HoeYks8YREK8OsNIj+Sifb9hjBHFoMnLjdhFBGGvjBb7I1S1HxhCuPj4/T19c1ivajzvKZWtuaqrlfFYHwgBuNzL2dPnJfbdgUywF8DNGVtxaNSFmclSilGRkbYv38/fYUObli6lXW9y3FcTybHRuHlMkRRRBD4uI6LI+rHkdUuwZkD2nbQRpMvtKCMASVZS0IdogDluCgMtiX3YdDoyKAyGUJhgI0VRoTCIk2tUqE8PUUo7JV4SGKSqBTJJBtj5DuJp2aEIWRdV0CPf85CopQ4PBLRN821D3w6BuPrMRiTp8MQyVMle+CfTGhmAJVkbWWcLTvENX36aZYWe2Jm3CCrWYyr4+I6joDieBkUELkZwOB5OTHSMUDpVyHQPo7tye8oZaGFWmKsZQVHURgPTRT6oMBxxE4QNurx1SYyAZHtoHVEpTQjrnakQwwy8cIOo8BoQ2QibKXEXdYJ88r1GiYC17JZsmSJgCJqa7ZIXGYlO5GJeADJQr/rtACJwYhiMFYBH2q2Hco6d7vxwAMP0Om18Ipll4BSopoyXkaYICsR8XAEmHjIKlCORRhEhFGAQoGyhAkZ1yWMNMaEoBQqGTqJN3QkqxkbC+VaCMhhRK1SFVUUBGWq1QqlSilRS6GsfEs8NIWoKR0B4DmugOAkjsJ0tcxUvUT/wEDKfBYW0SjUyvPevzNmySeAvWLgT8OG/D2gAZdEHDfdzzg7u3HkyBHQhuuXbqHgZUX/Z92MGGBQANiJfm7UaxgFnpdFN3xhR71RE+NqAL/RAMuiVJ5GGSUgFoqt4poGQQAK8ZoEVNcRdvlG4/vynoBQrZepB0H6DxLwFAhD6lEojNbJd6rUa/LZNV0n0oZao8ZUo8zqvqWnzCIoheS8/Lqi6TYH+HAMxvvT8qJfpbKuAK5sth1KIbt855ARF7d2oKWXZS09YFt4joPt2KIWhBtK4Qe+qJxSZUbcU1BUamUCvyHpjkI2T4SR1xGaWq0q+r6YLxJMTwhzLKPEbji2C7aRla+UEqAaYUOAqge+2INUMKQMlZ8bsUeRTH7DaGFP3feJJIZRlP0aTlue/v7+00rruJ4h9FXz/EXA+2IwPgZMLcQQKe+Mq0VMUsRWJBWDBH+CLuqMs68pnSuVCm/acBWB0WQtN9H1Gq2D1DSIujFoqo06WUDXykzNTKKwsBQ0Al+iZmMMjSCg4fvCjpnytLAQFGBwHU8ms9oIEIfAaGqNBkHoi71BzVIzqdEWEDDI9/KjQIDVWkAlMhoLi+PlSZ4bP8CGSzY3qatTSsqSuVn2f4jZ8YZmlqg5hcYtwFBzzKGUIVc0nIsEvs+/3Xsvv33p68U45jM50ctiCBNXUhsxoNQbdbTRYlfK1Qok+tx1bBRKmKKwZCVb0KTq4oEYcLmKR4QSO6SNMGWeKtWp92QiAh0J8EZA0MKUFIwYbGFHKajx+NheFi1fwuYtW06HHU2gS8CI0aTiJ8Asj8E43syQtL4oiK9vBLxmz8rNcq4iq8+1ZKKSmII0BY5MvutJYs8PGmhtRHVNl8soASMgEM8HsTtGa3ntWJYAYQmYGgwIsFqDTGAISVxjjAyZ1PiaEkmAF9UUGbQR70qYgAEgNeySCT5cGuLAzBArVq8WMFLP6nTFssB2RHWRiIsIHwD+eK7KsgEN/EVytdIPcRzDuYofBLS6OWEHWiO+fBQmkx2SMZGwoOE35CpBV+L/CxOUQoPcr7VMMWFytcX4ChhYGnwTESXxRZQwwDSpT0sJgPK+H4pnha0siU1c28bGoqp9xmqTjDVKDJXHmQ4qLO5ZxXXX3E5nX05AFTBOMz+XMsTLzAIkffO1MRH+IiZEPQWE+EUQ25DLgB4gIAXkPBWx+aLrbVEHQRjJpFhK1I+wQSbZGKarldQIQ2JYMYjIJBqTXCHjuBjLioctyUO/4QtrjAHQGATQVK0k6kkMuvzdE/UZWfmBiQBDQ4fUooAxv0zW9ggiH8/N09LSxU1b3sXqZRfz9N4f4DoZgrBxSru58M+FJZIVbpJLgS0xKE/GOBgnDeFj6t/dxBbg3NmRTsihQ4eYqE2hULIi05Wa6vVqvYqfBHMYw0S1xIxfZrw+TUfbAKXGDNp2GZ0apOjlCXWAY2wKbh4VNsgArdkinuXhODZZO4OdbDZV/JrkxvygxlhtmmPVcerKUIt8CoVOCTB72gfoa1tEX8dSFnWuYMfen1Otl1jatxXHtjk6spu2GBiDolavJGpXzWODbD/PzFAt1+nt6sfOSsKSFB9jEo8rUMzB7JUxBk/EqSrLacqnvHpWRhewHc5J0mCttdiCnQ/wQ1Em4i3ZkptC2NEIQ7TWojIOTI4yEQMxFDZYu+Ja1q28AhGjiXSAMUqALFenqPsl8rl2LB0xNLqXKb9GGDbQ9RLj00OEyeq3nAyrl26jt9hBrjYtTFm++CLaW3rJehlaCm3kcwW0hvsf/yoNv8bNl78TSzloo2gr9rLzwEOMTBxkwOpKc1dpjAXInj3UiyzrupStV13FA4/+ALLT86poLZuF4rk7gb9UStkqMepXA/cBWcACoRbZvDkvhW3Hjx9nfO8xblm+DcnkJmDZyhZmaLETNsPlcZ4bewnV2suNl76VRV3LJVYRaVppQSixQeKuhuIUuLaDSa21iKLhV+Vzs9mcAGowiCNgW8l3EHWG7HuEIUZb/P2//j7vfPUfk81kcVwJVMUZqDeqVGtlvv+Lz3DFtZek2QdGhkfwq4obL389a5ZvxhiEXZ/60ke44srLF/TEgoaUqaYsiQDbGNMeg1tNOXA5kAdMSi3Hk+t5ke7ubob3HILEyIqbKjmpgDCMMBjR5Y+P7mblqmu545q7aIRVIBKdrVCUKlMS+PlBlYybJ59to96oSArdAkBL2hxIrgbHzmHZCkyESjetjAG0AAFK3GVAAsnxmVFuuvyt8n0j0wBjMIBlbCw7Tz7Xwiu3v5NnD3yXnp4+jh48ziuvegvXXX4bM+VJCT6Vcvi3h77JpdsuXhCMlCVKwezgW/36j+/95udTQLY3vwnn7XyG0NrzPHSLRyWoJ6tTAZJKx498LGx2jx+k2LGCO669U1SRMUZW/s6XHuXw0C6W9m1mpnxC1Ev8c2HYuuWXAjrV0zL5pOGhUTSXsCtFAsAslSrgpZPW09XDkkUD6KgBWhgFKnFZLRtjoLe7n67RTXgNm7t/4z/QUiwyOjYK2NRrPj968B9RLdMU3PaXDaItyyQ2Z9ac/zrweZUcqPklsOUkgqKuOI8ikfrQ03u5OtbdtaCRRMESEYu6uO/4M7zmlo+yun9dajN4cud9PPr8T9i+8TUs7b1IGJDNZnAcjzCqcXx0L1vWXYWyJJ91RnZt7u22bQmgRieRe6iTiB6UlaIMBhifnODw4C5WDqyjo62X0YnjPL/3IY5P7WLTpo2ntT1Rn72B1QCs2J57DpAHNjb5y83GfEGUmz2M+aKaeEh6H4VCgaA7G9uIA6wo9kp0HDUVNnS0L2FJ9wCgJCr/t4f/BaMzvOKyd9Lfsw5NiOyPOLbYhZZiAcdR1P0ybS3tGHPy+8gFA6SsWNgVlZ9L0YMSUE3ifh89foA9h57GzvpEBOjI0JlbztoVW2lr74hB6KCQu4qd+x/Dc/K8dOhZ3PYyFw1slEWGUadKOApLtJ4Vk9gxOZY7QDfgpO5AwpDmve9TFqUtLPNdwo0bN7J/916mymU6Mq1C3UpYZW9llFtvvpuO1k60DnnpyIvYVp6L178SZUEm44r+ti2FagK5p6OPSPuJepLv2qyefmUaw3EslCVqTmwaaCzX4zP//IeE1Pj4n32M6667llwux/T0DD+7/xd89u/+iduufTstLW3kcgWODO9BYYEdyn2p13UqMYDlACGppBzcrmLf9zeUUl9LAcEgZzhIPJCpyWkAjh49ghSdtbfLpozjOIyOjnH8+CDValVGX/eyWK9vwXYsvGKEVv6CkeveHS9gTQeU/CozSvP+t3yCQj4DlqFeCbnvsXtY2reF5UvWkc9l8DyL8yXKQlgGiBdlJ/Vejp3lJw99jZ8/8W2+fs9X+bXX3pFOSXI1MSgP8fa3vZsPv+u/Mzx2jC99+0943eVv5sWpfSxe1sIZiLCjXlFzjzX8oaOU2jL3C6NIi8+YPFGhVqmzYeVVkhbPOBmsapGDQ3uYLk3Q1b6U26+9iVtvfBNBWItp/JTsZ+zZ/zzTlQqRqmC7SsplbNsWcNZdsplgyqaQXcRVW18tase2HCrVqmRwDxx7jmsufiPFQhbXUWjDSbUjq9CWEYaRxAyO7cqeh2U7UvSmLGHwgqpWmKEUrivXRMXYjJeGuf/Rb/HpT/7fMRivxRgJYKGpPOjmV97Mx//0D/jkX/5ZbPzXkq+OYmYOMF2fYDFnBIhoB5iX/d3oACtmuV9W6qUYisUixTVF9uw6wKqBTWJAo2S71HM9YUkQRpJKOHr4iKy8ga71EldsXnMV41MjMWiTHBt+KQZnjKHRowR+iOsG3H7N22MwF1P3a+TsDI16IF4KBro7B+jp7CY0NbRGjLmXdZN9dYsTk8c5NnSAYqeNcgN6unvx7YDO9m5KJwzVaYtFfX2JG6pIJVVrnmcnSU9RMTieje3DumVbeN0bbwOiearaknikwXvfdxfat/job3+QdyxxyCzdTvTC18+GqQvJEgdYNdfgCENS9BQsW7mY793/j7EK2YAOBVkkwm4EkhBs+EFaLC0qwHFdPNchX/DoaomNde8KlGWolCrUaoGU5hSKGbSREhqJ3Gs1H8fOsO/I4yzqGsC2IPCTCcy4SdFAnnt/+Q0efeEH/Ml//SPe/Z47ZUJj5hGFoQAwPDTK/T9+mJ2PHWJR91Lx5lI3W4rfLNV0sstKmSMFcBdt3kpXdwdgWEhsYaXPK26/jkJnG1ZLiMn1S93vGUtyAnkOkfscoGvunXNEDNbAyj4++7U/4oqLbmdTHLyVymWQ3E6ViZkRZipTdBU7UVYGXwcUcq0UykWmJqtksi7ZrJPaE/FaGo2I0A8FiDAIASQ6PjE9yJLupemOnvxuDKD8nYee/h7rt7fz3Z8OEgaB3OMlMYljO+SyedraOli/YRN3vfcunt55kKsufpVE2cIKUVEGB4WyZzsorbkeqvUJMl6RIKjhujnAYEw4y6uUBeQ36OpsYTCzlMWNMl1dXZyNqPndC1odoHP2TQt7VD09PbICf/CL/0m1VmOgb52AcO8j/wRGMaAP4OYLhHaRE/WAXOtSyk4HG9fdRnd7L8KeJHDzGyGqXMOYhIkSFxiMirho9Xa62voIogbZrIuX8Xh29yPsH3ya//LxD/Hq219HpTIlwWF+weMCGoXhk5/6a373tz7KkcH9LBtYieEkUzQGC0UiwrADh3dz+2teASBg7Nr1vCzEFSvWpPZERhRFbNq4kVWbNqOmL+L4xB68Nu98HSgsWnBKa5RWnot3tfWSTfzwoS/wo19+gS//rz/FN9PctOWD3LJ2HSs62unPatbnIwYaLxEN/YKXYgMdaZIU+8nADJKrao5tIhZ3r5B0iefaZHIOQ2OH+d7Pv8gn/vYPeeUrbqHRKJPPFyT6X0jSzywUcnziU3/Gz5/8Vlr4ljKUKNCgmhliJN/1zjvfDsC3vvUN7rzzPTEou/nJT36IUu6suVDK4Ybrb+SlwccYa+w6u4NFwAIecs4C3PnBEnMljSWEnlddfSWhNcMlF1/M+vXrGRw9gFI2uWyW9pZWulrj0dYmWdaZ8hiu7QkgWouHdAoeayRwSryrvQd38Du/9wG2bNmSVDNmTnPbVEkwuv6iVYyOH08Skfpk9aEhFUlQrll+kbAOIr785a8IO26++SaeeWYHWvtzXHfF4kVLqHCU3t7epnjtnMU5kzZIKShixLZu3cryFcvE+9gz+DPKLbcyNTOGY0Xkiy20F1vpb28lUpru9h5kV045DI8dlQkw2vxKKhs0tqPRTo3bb3u1pDaEFajTdCuV3L+kv0+Osvl+2By4iYeVslQ8OVeidKmm37NnL48//jgf/vBH+NKX/kkK6Wa70YY1q1dSyBU4z6IsoDGPS+bUoKQxRXdPD3hVdk4aSks/yrBzqdTHYispt5w+sZMv//DjvHjwKe659zPs3P8EtWpAPR5hoFlILEllgO1aaBNQbMmnicB5ti0Mw5dN79i2S3dvK1PTUwkYCpX8Hk09TaJAJwsGUYetrW14XoavfOWrlEozUp0/+28Yuno7yeQyAOfzxHBgAeUzwCMFZdahmauvvZSSeY6nDt7PqH0RY4t+i4rqYn1HnjcuL3JNdpDOke9yU0edK9dej448xGWuhbJS54AhwZu4z7ZNsZiju6sLY+aeUZW6WqampkSnz8EkUVEBJvDoau8jiSmRasfIYDdF/yaJPJUlOTKWL18mgeY3vvE1pqfLAs5sZhr6FvUJy89WFLAAjnULmKBJzhRsqfrQhsXL2lm6PsuBme/y+O4fMtP5BsqBodXRdHcupWvj7zDUcgfPHT7Ik7u/z/DEYYkd/HpAKrZjCQscx8YgG0Ny8NIPgkTVnMyx1WoVvvCFL/K9732fT3/6UwLKQlKr1ZHiN5DIPgZxblAm9mpqtColq8py+f3f/6gw77bb7uCVcXTe2toyh50Wg8cGCcNzY8YCyYTSAoAozlBkEk1ygnXVqlXozBAHRg9TXnwXFWcpkx2/wfef/CGP7/lHhmoPYreP8+zBnzBZHkOHCowwIykCsEFWs1SsyzgxdqLJ0TDCyscee0wOeL73ve/ni1/8x/l+pEGkVJrGD+pgoLnviolIbYgsgIkTVUaPT6Ejn0sv3c6jjz7MPXFO6/Of/2ySqmlGUQuLisVzsyHGqAUB2Qdw9iyZn5Lv7eth95GfMlFpMJx7Iz9+9J/ZHxv+tWtXsXzFAC3FFlauW8TgyGEwVmJLUr2vENFgMCxbshqjdKqn0VrsF88++xz33nt/bHS/yPDwCGNjQ7NUmrKU3Ldly1bx8lBNVtPImQ8g9ZwMmazDkZfGpIhBaz8G5RLe+tY3i1c5X4krYQjq5Pc+GzHzGTJkAUfS9+ffdHbAtLa2MrCqjR2Hvs2juz/PdLiPG2+8kc7OjtRbkeNh1caUMDJhgoCRgoqtUBhast2YyJplyMHhgQceFFDe/e67xGs7Fk8QqDkLRHHZxVfTku1Epe+l+yYGYV/qbRU7sux57pic4g2DMGWEXOdX0iiefvoZ8b7Onh0sJMMWsHseaoZzlo6ODlas7WHjJcu57rrrJFHZvHp379pDT8dSWalJwwDJNYEwA8sSA4yti9Sn3DQ4JRFhxV13vYe7734/QRCSy2VfhrkWkTbzKilNUsMrdsOGQkuWJx55jkcefoxqrSI2ZKGVr3VEGNbYv++gFG+crZelo9kvEWGPBTw+18vS5w6IqItsNisZ4WQiZ9NbGWaqY5ikqkN+nAxlG1AIa4x22PvcqASeTXhI5fng4KCorXXr1rJhw2YgXNC+KWZXEKbRvDHJ+0ahlc9A31q+8uWvypG7SqUsQM91s+v1hiyGhx54AhM5Z+1iaa3mAmKAHRZQmls8JIb23EUmPx1zRDo0DI7uFSAavkEZlcQKJDGBAqPwMjaHdo/h18Om+CfgD/7gY8zMlKRC5Dvf+VdAs5Dkch5Oxm6eCzHiqWhhipHkZECZygmXQ4cPy+ng8fHRNA5BDveUSkxOTvCud3yAnsxWXnXlO2JVeSxl7+nj8fIMeT6NQ15oTp3okAslaYJOVNpMZZJGUBN/vlGPRHejDJEwIz2BpMi1uDzz0H4J9FKgL774Mh566AEeeeQXDAyswJiIhSRb9HAdu8moW4kdEQcBdFL/Gxm6ujpY038Zf/3nn+Mzn/kMR48cF1cZSY3YAsYb3/Qm1ne+ios2bOXqba9iZjwQ5pyJYTdiv2bdb5LmZwespDH9DppE+toqLoSkeR+p9Ks2SrJDaJRhptSgUdOyhWu0GPkk8DQU2zM88rN9c4xbmLDPSv+fhUTZwrpZLe4irQX8KIwA0oBR3lu3+iK2rryFn/9gJx/56H/mg3d/KAbhLdz59vfxtjf8Dleveg+9XUtAzpyUeM0NH+T55144Y+/KmFlgZICfNYe+T9IkykAYXjiGAJJnavhl6dJjlBHD3qhGBHVDlIIRIS5xqlGff3o3SrlnEHgF1BtlKo1pUki0MQKGJBq1kYFBrn4QoYDFPf1sWXU9rdEm6qOdrC2+hjUtv8Zt2++iJdOJJSe/LIg0Ha0dbFv7BoaGhk7bwOv5gAB8sxmQx4EyoAFQ0mT4grZvlUP8OSUeTRQajIJKNaBSDgSYNGgLfSMpFj+s8Xf//TNo3TitJhRS6V6vI9vLo7uSHJxungEBJwhCUUvJW8Ke9vZuli1dyUVrriBrtTA4dpC9h55mcGQ/bsZGtB5ywIhG3Wd08rC0eTrdmCSK1EKA3BOXAblWchzhUWACiJrdMmMuLEtsqSx/gXI5lK3VUBsq9YBGPZRCtTQQNKHF+OQoY8NTDI8MyUZZFPkywS+jFpNKmBpPPfMElsklet5irghjwij5TE29XkUpLdvGbe1FNq7bxtqlF7NpzXYWLxrAWBplG7m/WvUpVaqMTO6Wtk2nK1EITbjZwIsxBjMAVlwGlL71i6b6rLSpMKgLAoiAcf3111Oxd7L74MMMD5cJQoMBJqd9qqVA1IhSlsQE3R19tLnL+dGPfiRAlMtVGg0fPctdMUnCcVI6LOzbt58P/faHKJWn5qqTuTVU8ns6NDy848e8dGQXEjSGobAhW3RwM0j1jG0nbaKwxHV9ds9DrFq79AzU6Hwv1hhzT3KNLGlDh7z4K0A1O/NhABgulMgkbNywEdr3snfoPo4PHaFaDQi1ZqYUiOdlkigebdPft5o//tgnePDBhwAjrmnMAik8iF1TcYMnJiYEFNfJxoHj/0mrt4SL110PmFllPSPjh6WAe7azYXFocE8SjSd3qiRWSWqAIx2IS35g8EWU8SjVhiXeOh3boZJuQcqat0B/FKsrFWOhFUDaDCW+DgJLmj8gW9BN9Lqw4IweUfhVh6u3vA7LDmktunhZJylQAKNhYnKcb9z3af70//ovvOH1r5P4QKLxMEKbSLrI/cu/fI1P/PWniAKLO+/4ffp6loLSzU2pYyb8EK1Drr/s9bOYE+lQasQWEHmvmGvnqz/8JK++7k4C3+LhPf9Mz5Li6XW9A2oliznyFHBDPP/VZqOe8v7jzYZGa1FbXFhJ1YfN4pUWkZrCWJGwpN7QBH5EvR4i+yMZS/Jh73vTf+Vv//xr/OeP/DFPPfUMDzz4U779nW/zJ3/05/ze7/4h3/3qE9yw9V1cufkOBhatBhXNqyzYtulmrrnkNfNWtmJO7iphlut4ckL4b/7pP/Kq696GbWeYqgxR8U+c/hMZGvNiD4B7UzAAUqOuY1viGWO+DtSbGwb4jQsPSLMqqfjDBL6Rui5L9DXoUIBJQHEAeMPNdxEML+Vzf/lj/u6/fZ//+bcPcuhZC3+snyVdm4VxW1ZfI4V4mPkUz2XyYkMWLujQaRkS+WyRWr3M/Y99Q1j17tf9ATmvhTDUNII6ruOctu0Ig1mA+IjwCZrEapqUIHnMzz/QLBpCPzXuF16M8jk+ukfsl1JGWGqARiOUbV+dVoxYEb09faxZdjnbNtzGNZfdQbHYSqFQlD38zWsvpVhoQbBWC7JywZ+lXSAKuRaxMd+697Ps2PUIa5dt56bL3yxH34IgIuPl2LP/UToO1jl+fOhU6ko0jZ4fDN4Tk2EiNhUncVigtcaVwM8BLwUMBfmi5sILsulk11Zy9dY3o/DJ5lw8T+FYCsuRfXV0ZMnZkS1rrkPrdG9DkcvksKW+S+Mk9xrM6TBUQKjWy0zOjPHUi/dzdGQvmdaIsAZvfeXHyOdyolaNVsLWatjghfu+QHcEv/QGufzyy/kVIg3NjJ7di1FrvdhxnBM/+rdvhCRiLdAN6DFjzC+AqBnPoHFBWJKuVDm9uv/5XRSO1qiVjkmhRBBFVGs+vq8lhY5WYJSok662ZTz2wv28EK/SA8de4ODxF+LX3+WRZ3/IocEXKVWnxF32nByOlSGXKcpROFt55LMt8joeUr5aq/o8+ux9/PKZ/8VPnvh7fvN9t/LNb32FjRs209+xVaJxMfRGSawCisNHn6Gl7nOsPiEJzpcXmbu5yUQb+Ie4lcnw3H5b6mX6LC6zLOvw3NZ+uYJGWec/r3XixAmGn9nP1a2rcbDZWx1l+bb34GaKWI5FxnMo5mxsR5HxXGGKMRaVaoVao4qFBSj2H9lJ/6YaQ0OjhA0Lv+7T2bqI7p5eBgeP0NLaQkuxjZ0v7pFtgcg0WLduDRsuWh4HkE/RxWWcmDnMzW9ayzVXXcOtN7+ZD/0f/w0gTbVQbzTkyN193/6r+PuuYWf9OMfafC677DJZXPMrdNRC7ZlqwHZg59yucs4Cbf3s2JYcia//j1LqPzSfG/EbFpmcviAsabdz5L0cRsEG08PjT36eTdvvxglsbCtHzYcsFsb42KEtrnCxkKVYzKYJO9bbm3hkxz/zmc/9DVs2b423YN/GscNDvOuDr+W22/5ICuHe+pbf5NrNb2JqZpz9U/fyht+8kW2XbecXP91BaA7T09nPsz+d4l+/9Jd8+N2fplKdSZqkgY6kzSzf/9GneWX7WrSjGLC7OBwdWyDYTBtizvOsFPC1GIgXWUDUKVr8HQHamz/Oy2kc7/wFjFpWnmbowRfZ3rlauoEaSzE9PsGzTsiSlbfTWegik7XJZVvwPI2d7C66rp2e8wAMtuXyxHMPMBrsoF6tsa7vFpb1rOOr9/0Fd//Wu/nO977N8uINLOrtZ3TyGC/ueQrfGufSyy/iyIs+oWnEQeSN9Pctp5DPUamWACthBzLZ93zvT7nSdNLa1goYUaVfH36MQmcrbY5Ndz5LaMB2XbAyeC19ONk8idQBG+iNAZk6NSDzgfkA8FkSOa+qq1lljYxivzjB+vZ+2TxyMi6SApmZ5lC9RK19BUv6NstefSHflRy4gXzOEVBs25IhuKA4cuwArmczsHi1pD9GR0f43Hf+E6+74QNsWLVNomzXzpPLtGCMkorL/kUracm3JkeWjXhSkqYPtSQ/bdvjGz//JBvLARt6V2BkizkUl/yno8/Q7VRpsR1spTAAGEI3g15/DZZtN59Hf1+sgb4QayAVX83ZdLZ+HLi8+X7LMmQL5rwB8uzTz7B5uo3eYideNiM1wjoKZa/ExuLo1DBPNk6wcvnNdLQtERbFJ7ekIDubsbClPawhIzFKkvYQxtjpPjg6kuPZoEzS4iPCoLGUlZYxpdMhYDR8yQDjh5oT4wfYt/d+eisVNvatxMlmMWiq5YrYqecmdtORmcFNupyCkhR9bdXlmGyBJnkgZsZNZ9smNpU3AseABpBJz8c16pDNGYw5d0DK0yXa1CLpg+KZTFoaLin6MAxY1rWEfr+Hh48+yPBkN7lCHxEBflAh6xVpKXTRUeyWvlyOrcQRcByraZItjIqkiZnCSvNaMiKMsIC0f1aoCQKk+ebekWc4vvdR7LFDbO9ZQ7GvD1xbWBwEmnICyIw/Ta8nu4pyUjiby1HuXS1gNDU7KQPvTFq3B2fTSDntozUY0+tNSqlvNbduigKFb51b6780mHK1whCJe5vPayI0jpwX9AgjDx2GWHmLm3IXM1abYKx+gonDDzGKYdPK6wh9X7wf13jScsnySRsCSDmqZSvZEVRoJJ0PEvVjONnCSSsc5eJm8oyVD3Jwz8/JTQyx3ivSvXQLypHuAdKIOQxD2c4tl0qM10soVcax2/GyeckwVNuXUMt3pmBoRPioPA7pPDTjt+TIWBT9LfAh5oiXMzhn+ZiKtInY/p89yaaom1BHtLS209LWQj6fk9Vm2ZZkcjGIaDS2UaAN040yT4y/xLGwRl/Pehb3rGOgd73EF6nH4zkOGkMSO2IrjQbR9dogYPhBxNTMMMdGdzE29ALdfsC1A5sJLYORViBSQYObzSBJ0NFhJqYnicoNHvb3c21HBrdYxPVcwmInk92r556u/VYMxptP50GUitOUG6/7NS/+Uk8AmwE1+9kh+qw7B42NjcGTg/SQlw4P+WyBtvZ2OuLh2BZOxktP32JQCY4Go5O+WZbLTK3EkZlRyjpkJgoIlIXnFWlr6SPMFPCy8cgUsbRm95HHKE0NYbkZelsW0ahMYYV1CrUS61oHyBVaeXByH9ctWk/ByRIFgXRPzWRzGAwzpWkGJwdplEvsK08R2ZNs7W4n11IkzLcz3rU6ZX6qL5+MQdh+us/RVWf4zMKCUmosQT1Dk2TyBts+Y5pI+1i1e4LuuoMf+aKq8tk83R1dOJ4nBXDSrEYMpkaTbnA5WIjKQRmhGsoARlEN6jTqVbFJE/UZfGMY8Ss8WzrAZZkB+nId4ChpO9iaK9Keb5UDpcq1sRXS1P/J0b1c3b2eSqNKm5clkytIe9jR8hiTlTGGYmBG/AkubsvT1t0JhfaYGWvAsprtxmFjzFUxU0fixjKG0xDnDHV+AGwADjFHGlVFJscZP9ilf8kSDry0j6F6C9241KM6UT3EmlRkc3np0ZvxPHEd0/6KKr66yZNwdNpyCQWWEvAKbgHprBBq2sIOaSubLY8z6ndySdcaArS0NM9lM7huPDIetutghIWarkyRWqNOaWJaGp1lihbT1SrVsMREbZJqvcbxcIY1nk2+kCPMFCnFYJAwo8mIvzl2bYcv2EPBjDFBTLsjwBWABsJZoNQUga9Q6sya0izRARV7gnFqgEJFhlK9RLk8LbuC8U4g0zMzlMrl+FqS49XlcplSJb6WypQrFdlDb9QaYnDDIECH0m0UFHi2x97qCJcWlhKhxTDHzCObK8QjK8e4EQ8rpF6pyTNM2qMMB8pDhLUaY9MTjMwMMVGZxK9V2dmYoE+FdLcWMG09zCzeKMxoOlYbAnfEc/WUZHIv/GPzRH1tV0o9DtSAHE1iO5DNaQynlpmxURrPPoUb+gzXNWWToUiRxeQkoec4Lhk7I1G47UnjmeT4wskI3Tr5aAtZ9UhsYREloLi+5t7xF7k6vxKVscnlC9hOfM3l5XO0NgJiGPhShVIulwhLdXaER1nqFNHKCJBWELFLz1CkyqaOFqL+Nfi9K5trVE0Cxk0xGA+nRvyCAxKjrizLUlrr9cDOl2uLmsmfevt3dHSUzPMxIEZTrwVSkzVlYByHJXTQRRHbceUDs44r+ai0EZmFkjSLdHgAAUFpg7Jt8aIUSjyyXdUh8qFNp1cgk8+Sz+UluWjHA4wA5/s+8pi9hi8R+IH6OENMsU61ggELi2FTp2JNsrUtD2suJWzrm5ujKiXMeOgCPXr11I9Diq8blVIPAD1pemDeM6rcl+fKvn37WD54QPoxinG2FGEjIAoMQ9owjk2namHAtOBZOXJJV2zE8QogaZCvlcYyQhUsbPHCbGUT+T479BCbVS84Dq0treTyOYlPSLtYNxpiM8JKgxkr4Fk9yEa6GdQz9JMnBMapELll1nd3YVZfhsnmm+MMCzistX5znFJ/KmXGOQNyDuC0J6BsBcK5zoJlGzI5syBbdjz4czabAMtx0kK1kw+erzeY8X1K2jAdQdEUaVcdeHi04OJgqBPgq5AQLf+FBMKgLFksYzGpy9QI6KaAp7LiVcWACKhSXY+mVq1JlD+iK/JYpU1eH65x2BHtZrFboGZCcpmIruWbiBatApgLxpNa69fGYAyf6/PVnfO0J16LaXpxvDK+Arx9fkZX9gRwM7Oeoy7G061XIJtBEoSijpRkUKU3VrFIplKhzfdZbOBEUGekMUhoHGpGAS4duPSZPBlsIiRWQQBF46kMEYoc8RWNMRH1Wh0hktaANO5HEplRhd2MsI1FtOgMj5rDrC/YuJ7G5Nowq7YRedmFWl5I0Hf7rW9RAKcBxoVnyJxSovcDfwO0zGWLaCQLHE/juLB/zy5ajhyg3XNki1SepOY4oDUqOYUbNnwpCw1D8ZwIwlDOaJggoq4NDQ0loA44WIDCUx4eGU6YKnll027aaMNDYaFAjLSUDhGgjBI27GKcLlxyuJTQtOZbqRRmWLxsLVHHItA67aqQquUy8J9iMP5HDIYXxxk+50EU51HiL6biL2ZiUFYnaftb0l3Hedu2yjC+bwddU8dlovKFPF4mK+kHExkBRI4RRJrQ6MQtFZdWQAmiCCJpUS7xhq1AAShRezIUyDhchzy95IwtsDgo4VJIgINDCZ+daoI24+LgsrhjCf1r1jJVdLHtpCBMWQZoAFngQWPMO2I2HD1Le3HhAZmflJTSoruVUp8CsswXMbyqNoM1tI9coyzpCdtzMUZJeY1rWWhOPt3AhBGT9Qa2MfEQJwBjFmhWJmkVObMhicmnpxtsYRVlAmZMnQYBJRpihyKFMKlPtcRALMJZ3Y/dUgRLsYAExpgPJvsZTnwNSeSCAXIBVFhnosLeAThABFiAkklD1ACEIbnSEPn6NDaarG2jDBhAgzRcDn1f7jtWqWJ8n27XRjmuAPJyMlouUa91scLtwbEcsplMwrCQkhNQUz6VLo9FKzYSOUrYqyCNKTRgAzXga8DvxWyYat7P+HcDCEC6K5YAtBH4CPBeRPABoQOkxlhhDLhhjVxUJxNU8cI6TtiQavO0CbMHPHDoKL22ojOXFUBfjoH7J0ssZg1t0mHIw+lpI8i7BFkHPxtfcyf7eKXVA0opvylX9w/Ap2UPfM6/6d8ZIAursfjaDXwBuAOwT8VSZbQMKwpw/CpeUCdDwMT4CQ6MnWBVxhbjrxBQ0wd1YByP0HIYN1k6iktQxSxkXLAUxrY4Dfm61vp3Y1d2aKFnDv57ByQFRQCIgQnjUqN+y7I+ALwWuISTEgEqHVwYMU3DnlP4fB/wVzEAE69+1VsdrTUxGCHA/16AzH9WYpSAlAO2AK8A3g2s56Q0ElCsdHB2opNhkmuGk7LTGHOPUuqHSZ1UFWCu9/S/MSDzJVUJTVH/bwBvBW4A7PPEFtPEwJ8B39Ra3xOrpGmAU6il/38Bkq5IwFFKmTiWCZqqKJdblnUFsAHYBCxKRitQBHJNwWcI1IASUAaOA8PAXuAZrfWLMQD7m+ImN3kOSCQR9v8H5P8FdKdwLi9BNikAAAAASUVORK5CYII=" + }; + var signinLink = document.getElementById('persona_login'); if (signinLink) { - signinLink.onclick = function() { navigator.id.request(); }; + signinLink.onclick = function() { navigator.id.request(requestParams); }; } var signinLink1 = document.getElementById('persona_login1'); if (signinLink1) { - signinLink1.onclick = function() { navigator.id.request(); }; + signinLink1.onclick = function() { navigator.id.request(requestParams); }; } var signoutLink = document.getElementById('logout'); @@ -33,11 +39,13 @@ $(document).ready(function () { } var logout_url = document.getElementById('_logout_url').value; + var persona_user = document.getElementById('_persona_user').value; navigator.id.watch({ + loggedInUser: persona_user || null, onlogin: function(assertion) { document.getElementById('_assertion').value = assertion; - document.getElementById('_persona_login').submit() + document.getElementById('_persona_login').submit(); }, onlogout: function() { $.ajax({ diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html index 08879da5..a022c62a 100644 --- a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html +++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html @@ -17,9 +17,8 @@ #} {% block persona_edit_link %} - <p> - <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}"> - {% trans %}Edit your Persona email addresses{% endtrans %} - </a> - </p> + <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}"> + {% trans %}Persona's{% endtrans %} + </a> + · {% endblock %} diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html index 372bd246..03d63aae 100644 --- a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html +++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html @@ -28,5 +28,11 @@ <input type="hidden" name="assertion" type="text" id="_assertion"/> <input type="hidden" name="_logout_url" type="text" id="_logout_url" value="{{ request.urlgen('mediagoblin.auth.logout') }}"/> + <input type="hidden" type="text" id="_persona_user" + {% if request.session.get('persona_login_email', False) %} + value="{{ request.session['persona_login_email'] }}"/> + {% else %} + value=""/> + {% endif %} </form> {% endblock %} diff --git a/mediagoblin/plugins/persona/views.py b/mediagoblin/plugins/persona/views.py index 4ea16fa7..1bba3b8c 100644 --- a/mediagoblin/plugins/persona/views.py +++ b/mediagoblin/plugins/persona/views.py @@ -64,6 +64,7 @@ def login(request): if user: request.session['user_id'] = unicode(user.id) + request.session['persona_login_email'] = email request.session.save() return redirect(request, "index") @@ -183,6 +184,8 @@ def add(request): new_entry.user_id = request.user.id new_entry.save() + request.session['persona_login_email'] = email + messages.add_message( request, messages.SUCCESS, diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index bdbe0441..246091d6 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -14,7 +14,13 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from collections import OrderedDict +# Use an ordered dict if we can. If not, we'll just use a normal dict +# later. +try: + from collections import OrderedDict +except: + OrderedDict = None + import logging import os @@ -187,7 +193,10 @@ class ProcessingManager(object): """ def __init__(self): # Dict of all MediaProcessors of this media type - self.processors = OrderedDict() + if OrderedDict is not None: + self.processors = OrderedDict() + else: + self.processors = {} def add_processor(self, processor): """ diff --git a/mediagoblin/static/images/frontpage_image.png b/mediagoblin/static/images/frontpage_image.png Binary files differdeleted file mode 100644 index 689eb2c2..00000000 --- a/mediagoblin/static/images/frontpage_image.png +++ /dev/null diff --git a/mediagoblin/static/images/home_goblin.xcf b/mediagoblin/static/images/home_goblin.xcf Binary files differnew file mode 100644 index 00000000..e75d6b5f --- /dev/null +++ b/mediagoblin/static/images/home_goblin.xcf diff --git a/mediagoblin/static/js/file_size.js b/mediagoblin/static/js/file_size.js new file mode 100644 index 00000000..2238ef89 --- /dev/null +++ b/mediagoblin/static/js/file_size.js @@ -0,0 +1,45 @@ +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +$(document).ready(function(){ + var file = document.getElementById('file'); + var uploaded = parseInt(document.getElementById('uploaded').value); + var upload_limit = parseInt(document.getElementById('upload_limit').value); + var max_file_size = parseInt(document.getElementById('max_file_size').value); + + file.onchange = function() { + var file_size = file.files[0].size / (1024.0 * 1024); + + if (file_size >= max_file_size) { + $('#file').after('<p id="file_size_error" class="form_field_error">Sorry, the file size is too big.</p>'); + } + else if (document.getElementById('file_size_error')) { + $('#file_size_error').hide(); + } + + if (upload_limit) { + if ( uploaded + file_size >= upload_limit) { + $('#file').after('<p id="upload_limit_error" class="form_field_error">Sorry, uploading this file will put you over your upload limit.</p>'); + } + else if (document.getElementById('upload_limit_error')) { + $('#upload_limit_error').hide(); + console.log(file_size >= max_file_size); + } + } + }; +}); diff --git a/mediagoblin/storage/__init__.py b/mediagoblin/storage/__init__.py index bbe134a7..51b46c07 100644 --- a/mediagoblin/storage/__init__.py +++ b/mediagoblin/storage/__init__.py @@ -191,6 +191,13 @@ class StorageInterface(object): # Copy to storage system in 4M chunks shutil.copyfileobj(source_file, dest_file, length=4*1048576) + def get_file_size(self, filepath): + """ + Return the size of the file in bytes. + """ + # Subclasses should override this method. + self.__raise_not_implemented() + ########### # Utilities diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py index 250f06d4..47c81ad6 100644 --- a/mediagoblin/storage/cloudfiles.py +++ b/mediagoblin/storage/cloudfiles.py @@ -168,6 +168,12 @@ class CloudFilesStorage(StorageInterface): # Copy to storage system in 4096 byte chunks dest_file.send(source_file) + def get_file_size(self, filepath): + """Returns the file size in bytes""" + obj = self.container.get_object( + self._resolve_filepath(filepath)) + return obj.total_bytes + class CloudFilesStorageObjectWrapper(): """ Wrapper for python-cloudfiles's cloudfiles.storage_object.Object diff --git a/mediagoblin/storage/filestorage.py b/mediagoblin/storage/filestorage.py index 3d6e0753..29b8383b 100644 --- a/mediagoblin/storage/filestorage.py +++ b/mediagoblin/storage/filestorage.py @@ -111,3 +111,6 @@ class BasicFileStorage(StorageInterface): os.makedirs(directory) # This uses chunked copying of 16kb buffers (Py2.7): shutil.copy(filename, self.get_local_path(filepath)) + + def get_file_size(self, filepath): + return os.stat(self._resolve_filepath(filepath)).st_size diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py index e9bd93fd..e2264645 100644 --- a/mediagoblin/submit/forms.py +++ b/mediagoblin/submit/forms.py @@ -17,30 +17,44 @@ import wtforms +from mediagoblin import mg_globals from mediagoblin.tools.text import tag_length_validator from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.tools.licenses import licenses_as_choices -class SubmitStartForm(wtforms.Form): - file = wtforms.FileField(_('File')) - title = wtforms.TextField( - _('Title'), - [wtforms.validators.Length(min=0, max=500)]) - description = wtforms.TextAreaField( - _('Description of this work'), - description=_("""You can use - <a href="http://daringfireball.net/projects/markdown/basics"> - Markdown</a> for formatting.""")) - tags = wtforms.TextField( - _('Tags'), - [tag_length_validator], - description=_( - "Separate tags by commas.")) - license = wtforms.SelectField( - _('License'), - [wtforms.validators.Optional(),], - choices=licenses_as_choices()) +def get_submit_start_form(form, **kwargs): + max_file_size = kwargs.get('max_file_size') + desc = None + if max_file_size: + desc = _('Max file size: {0} mb'.format(max_file_size)) + + class SubmitStartForm(wtforms.Form): + file = wtforms.FileField( + _('File'), + description=desc) + title = wtforms.TextField( + _('Title'), + [wtforms.validators.Length(min=0, max=500)]) + description = wtforms.TextAreaField( + _('Description of this work'), + description=_("""You can use + <a href="http://daringfireball.net/projects/markdown/basics"> + Markdown</a> for formatting.""")) + tags = wtforms.TextField( + _('Tags'), + [tag_length_validator], + description=_( + "Separate tags by commas.")) + license = wtforms.SelectField( + _('License'), + [wtforms.validators.Optional(),], + choices=licenses_as_choices()) + max_file_size = wtforms.HiddenField('') + upload_limit = wtforms.HiddenField('') + uploaded = wtforms.HiddenField('') + + return SubmitStartForm(form, **kwargs) class AddCollectionForm(wtforms.Form): title = wtforms.TextField( diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 6bb95ecb..7f7dee33 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -43,8 +43,28 @@ def submit_start(request): """ First view for submitting a file. """ - submit_form = submit_forms.SubmitStartForm(request.form, - license=request.user.license_preference) + user = request.user + if user.upload_limit >= 0: + upload_limit = user.upload_limit + else: + upload_limit = mg_globals.app_config.get('upload_limit', None) + + if upload_limit and user.uploaded >= upload_limit: + messages.add_message( + request, + messages.WARNING, + _('Sorry, you have reached your upload limit.')) + return redirect(request, "mediagoblin.user_pages.user_home", + user=request.user.username) + + max_file_size = mg_globals.app_config.get('max_file_size', None) + + submit_form = submit_forms.get_submit_start_form( + request.form, + license=request.user.license_preference, + max_file_size=max_file_size, + upload_limit=upload_limit, + uploaded=user.uploaded) if request.method == 'POST' and submit_form.validate(): if not check_file_field(request, 'file'): @@ -86,24 +106,49 @@ def submit_start(request): with queue_file: queue_file.write(request.files['file'].stream.read()) - # Save now so we have this data before kicking off processing - entry.save() + # Get file size and round to 2 decimal places + file_size = request.app.queue_store.get_file_size( + entry.queued_media_file) / (1024.0 * 1024) + file_size = float('{0:.2f}'.format(file_size)) + + error = False + + # Check if file size is over the limit + if max_file_size and file_size >= max_file_size: + submit_form.file.errors.append( + _(u'Sorry, the file size is too big.')) + error = True + + # Check if user is over upload limit + if upload_limit and (user.uploaded + file_size) >= upload_limit: + submit_form.file.errors.append( + _('Sorry, uploading this file will put you over your' + ' upload limit.')) + error = True + + if not error: + user.uploaded = user.uploaded + file_size + user.save() + + entry.file_size = file_size - # Pass off to async processing - # - # (... don't change entry after this point to avoid race - # conditions with changes to the document via processing code) - feed_url = request.urlgen( - 'mediagoblin.user_pages.atom_feed', - qualified=True, user=request.user.username) - run_process_media(entry, feed_url) + # Save now so we have this data before kicking off processing + entry.save() - add_message(request, SUCCESS, _('Woohoo! Submitted!')) + # Pass off to processing + # + # (... don't change entry after this point to avoid race + # conditions with changes to the document via processing code) + feed_url = request.urlgen( + 'mediagoblin.user_pages.atom_feed', + qualified=True, user=request.user.username) + run_process_media(entry, feed_url) + add_message(request, SUCCESS, _('Woohoo! Submitted!')) - add_comment_subscription(request.user, entry) + add_comment_subscription(request.user, entry) - return redirect(request, "mediagoblin.user_pages.user_home", - user=request.user.username) + return redirect(request, "mediagoblin.user_pages.user_home", + user=user.username) except Exception as e: ''' This section is intended to catch exceptions raised in diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 3329b5d0..93cd82d9 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -20,8 +20,8 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script> + {{ super() }} + {% template_hook("fp_head") %} {% endblock %} {% block title -%} @@ -39,21 +39,10 @@ {% trans %}Logging in failed!{% endtrans %} </div> {% endif %} - {% if allow_registration %} - <p> - {% trans %}Don't have an account yet?{% endtrans %} - <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> - {%- trans %}Create one here!{% endtrans %}</a> - </p> - {% endif %} + {% template_hook("create_account") %} {% template_hook("login_link") %} {{ wtforms_util.render_divs(login_form, True) }} - {% if pass_auth %} - <p> - <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password"> - {% trans %}Forgot your password?{% endtrans %}</a> - </p> - {% endif %} + {% template_hook("fp_link") %} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/> </div> diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 14011daa..574fe459 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -41,6 +41,7 @@ Changing {{ username }}'s account settings {%- endtrans -%} </h1> + {% template_hook("edit_link") %} {{ wtforms_util.render_divs(form, True) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> @@ -59,7 +60,7 @@ </a> {% if pass_auth is defined %} · - <a href="{{ request.urlgen('mediagoblin.edit.pass') }}"> + <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}"> {% trans %}Password{% endtrans %} </a> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index e35169bf..c6f770c1 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -21,9 +21,32 @@ {% block mediagoblin_head -%} {{ super() }} <script type="text/javascript" src="{{ - request.staticdirect('/extlib/video-js/video.min.js') }}"></script> - <link href="{{ request.staticdirect('/css/vjs-mg-skin.css') }}" + request.staticdirect('/extlib/video-js/video.js') }}"></script> + {# Sadly commented out till we can get the mediagoblin skin ported over + # to the newest video.js release ;\ #} + {# + <link href="{{ request.staticdirect('/css/vjs-mg-skin.css') }}" + rel="stylesheet"> + #} + <link href="{{ + request.staticdirect('/extlib/video-js/video-js.css') }}" rel="stylesheet"> + + <style type="text/css"> + .vjs-default-skin .vjs-big-play-button + { + top: 50%; + left: 50%; + margin: -1.5em auto auto -2em; + } + .vjs-play-progress, .vjs-volume-level { + background-color: #561792 !important; + } + .vjs-default-skin { + color: #a59ead !important; + } + + </style> {%- endblock %} {% block mediagoblin_media %} @@ -31,7 +54,7 @@ <video controls {% if global_config['plugins']['mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %} - preload="auto" class="video-js vjs-mg-skin" + preload="auto" class="video-js vjs-default-skin" data-setup='{"height": {{ media.media_data.height }}, "width": {{ media.media_data.width }} }'> <source src="{{ request.app.public_store.file_url(display_path) }}" diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index aa390f56..d335d742 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -19,6 +19,11 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} +{% block mediagoblin_head %} + <script type="text/javascript" + src="{{ request.staticdirect('/js/file_size.js') }}"></script> +{% endblock %} + {% block title -%} {% trans %}Add your media{% endtrans %} — {{ super() }} {%- endblock %} diff --git a/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini b/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini index a64e9e40..07c69442 100644 --- a/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini +++ b/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini @@ -3,8 +3,8 @@ direct_remote_path = /test_static/ email_sender_address = "notice@mediagoblin.example.org" email_debug_mode = true -# TODO: Switch to using an in-memory database -sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db" +sql_engine = "sqlite://" +run_migrations = true # Celery shouldn't be set up by the application as it's setup via # mediagoblin.init.celery.from_celery diff --git a/mediagoblin/tests/auth_configs/ldap_appconfig.ini b/mediagoblin/tests/auth_configs/ldap_appconfig.ini new file mode 100644 index 00000000..9be37e17 --- /dev/null +++ b/mediagoblin/tests/auth_configs/ldap_appconfig.ini @@ -0,0 +1,41 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +[mediagoblin] +direct_remote_path = /test_static/ +email_sender_address = "notice@mediagoblin.example.org" +email_debug_mode = true + +sql_engine = "sqlite://" +run_migrations = true + +# Celery shouldn't be set up by the application as it's setup via +# mediagoblin.init.celery.from_celery +celery_setup_elsewhere = true + +[storage:publicstore] +base_dir = %(here)s/user_dev/media/public +base_url = /mgoblin_media/ + +[storage:queuestore] +base_dir = %(here)s/user_dev/media/queue + +[celery] +CELERY_ALWAYS_EAGER = true +CELERY_RESULT_DBURI = "sqlite:///%(here)s/user_dev/celery.db" +BROKER_HOST = "sqlite:///%(here)s/user_dev/kombu.db" + +[plugins] +[[mediagoblin.plugins.ldap]] diff --git a/mediagoblin/tests/auth_configs/openid_appconfig.ini b/mediagoblin/tests/auth_configs/openid_appconfig.ini index c2bd82fd..3433e139 100644 --- a/mediagoblin/tests/auth_configs/openid_appconfig.ini +++ b/mediagoblin/tests/auth_configs/openid_appconfig.ini @@ -18,8 +18,8 @@ direct_remote_path = /test_static/ email_sender_address = "notice@mediagoblin.example.org" email_debug_mode = true -# TODO: Switch to using an in-memory database -sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db" +sql_engine = "sqlite://" +run_migrations = true # Celery shouldn't be set up by the application as it's setup via # mediagoblin.init.celery.from_celery diff --git a/mediagoblin/tests/resources.py b/mediagoblin/tests/resources.py index f7b3037d..480f6d9a 100644 --- a/mediagoblin/tests/resources.py +++ b/mediagoblin/tests/resources.py @@ -29,6 +29,8 @@ EVIL_JPG = resource('evil.jpg') EVIL_PNG = resource('evil.png') BIG_BLUE = resource('bigblue.png') GOOD_PDF = resource('good.pdf') +MED_PNG = resource('medium.png') +BIG_PNG = resource('big.png') def resource_exif(f): diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index 61503d32..e4bb60e5 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -183,7 +183,7 @@ def test_register_views(test_app): message = mail.EMAIL_TEST_INBOX.pop() assert message['To'] == 'happygrrl@example.org' email_context = template.TEMPLATE_TEST_CONTEXT[ - 'mediagoblin/auth/fp_verification_email.txt'] + 'mediagoblin/plugins/basic_auth/fp_verification_email.txt'] #TODO - change the name of verification_url to something forgot-password-ish assert email_context['verification_url'] in message.get_payload(decode=True) @@ -204,7 +204,8 @@ def test_register_views(test_app): ## Verify step 1 of password-change works -- can see form to change password template.clear_test_template_context() response = test_app.get("%s?%s" % (path, get_params)) - assert 'mediagoblin/auth/change_fp.html' in template.TEMPLATE_TEST_CONTEXT + assert 'mediagoblin/plugins/basic_auth/change_fp.html' in \ + template.TEMPLATE_TEST_CONTEXT ## Verify step 2.1 of password-change works -- report success to user template.clear_test_template_context() diff --git a/mediagoblin/tests/test_basic_auth.py b/mediagoblin/tests/test_basic_auth.py index cdd80fca..45deab7c 100644 --- a/mediagoblin/tests/test_basic_auth.py +++ b/mediagoblin/tests/test_basic_auth.py @@ -13,7 +13,12 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import urlparse + +from mediagoblin.db.models import User from mediagoblin.plugins.basic_auth import tools as auth_tools +from mediagoblin.tests.tools import fixture_add_user +from mediagoblin.tools import template from mediagoblin.tools.testing import _activate_testing _activate_testing() @@ -57,3 +62,40 @@ def test_bcrypt_gen_password_hash(): pw, hashed_pw, '3><7R45417') assert not auth_tools.bcrypt_check_password( 'notthepassword', hashed_pw, '3><7R45417') + + +def test_change_password(test_app): + """Test changing password correctly and incorrectly""" + test_user = fixture_add_user(password=u'toast') + + test_app.post( + '/auth/login/', { + 'username': u'chris', + 'password': u'toast'}) + + # test that the password can be changed + res = test_app.post( + '/edit/password/', { + 'old_password': 'toast', + 'new_password': '123456', + }) + res.follow() + + # Did we redirect to the correct page? + assert urlparse.urlsplit(res.location)[2] == '/edit/account/' + + # test_user has to be fetched again in order to have the current values + test_user = User.query.filter_by(username=u'chris').first() + assert auth_tools.bcrypt_check_password('123456', test_user.pw_hash) + + # test that the password cannot be changed if the given + # old_password is wrong + template.clear_test_template_context() + test_app.post( + '/edit/password/', { + 'old_password': 'toast', + 'new_password': '098765', + }) + + test_user = User.query.filter_by(username=u'chris').first() + assert not auth_tools.bcrypt_check_password('098765', test_user.pw_hash) diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py index c43a3a42..4740bd2a 100644 --- a/mediagoblin/tests/test_edit.py +++ b/mediagoblin/tests/test_edit.py @@ -56,41 +56,6 @@ class TestUserEdit(object): self.login(test_app) - def test_change_password(self, test_app): - """Test changing password correctly and incorrectly""" - self.login(test_app) - - # test that the password can be changed - template.clear_test_template_context() - res = test_app.post( - '/edit/password/', { - 'old_password': 'toast', - 'new_password': '123456', - }) - res.follow() - - # Did we redirect to the correct page? - assert urlparse.urlsplit(res.location)[2] == '/edit/account/' - - # test_user has to be fetched again in order to have the current values - test_user = User.query.filter_by(username=u'chris').first() - assert auth.check_password('123456', test_user.pw_hash) - # Update current user passwd - self.user_password = '123456' - - # test that the password cannot be changed if the given - # old_password is wrong - template.clear_test_template_context() - test_app.post( - '/edit/password/', { - 'old_password': 'toast', - 'new_password': '098765', - }) - - test_user = User.query.filter_by(username=u'chris').first() - assert not auth.check_password('098765', test_user.pw_hash) - - def test_change_bio_url(self, test_app): """Test changing bio and URL""" self.login(test_app) diff --git a/mediagoblin/tests/test_ldap.py b/mediagoblin/tests/test_ldap.py new file mode 100644 index 00000000..708ce6cb --- /dev/null +++ b/mediagoblin/tests/test_ldap.py @@ -0,0 +1,125 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import urlparse +import pkg_resources +import pytest +import mock + +from mediagoblin import mg_globals +from mediagoblin.db.base import Session +from mediagoblin.tests.tools import get_app +from mediagoblin.tools import template + +pytest.importorskip("ldap") + + +@pytest.fixture() +def ldap_plugin_app(request): + return get_app( + request, + mgoblin_config=pkg_resources.resource_filename( + 'mediagoblin.tests.auth_configs', + 'ldap_appconfig.ini')) + + +def return_value(): + return u'chris', u'chris@example.com' + + +def test_ldap_plugin(ldap_plugin_app): + res = ldap_plugin_app.get('/auth/login/') + + assert urlparse.urlsplit(res.location)[2] == '/auth/ldap/login/' + + res = ldap_plugin_app.get('/auth/register/') + + assert urlparse.urlsplit(res.location)[2] == '/auth/ldap/register/' + + res = ldap_plugin_app.get('/auth/ldap/register/') + + assert urlparse.urlsplit(res.location)[2] == '/auth/ldap/login/' + + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/login/', {}) + + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/login.html'] + form = context['login_form'] + assert form.username.errors == [u'This field is required.'] + assert form.password.errors == [u'This field is required.'] + + @mock.patch('mediagoblin.plugins.ldap.tools.LDAP.login', mock.Mock(return_value=return_value())) + def _test_authentication(): + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/login/', + {'username': u'chris', + 'password': u'toast'}) + + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/register.html'] + register_form = context['register_form'] + + assert register_form.username.data == u'chris' + assert register_form.email.data == u'chris@example.com' + + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/register/', + {'username': u'chris', + 'email': u'chris@example.com'}) + res.follow() + + assert urlparse.urlsplit(res.location)[2] == '/u/chris/' + assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT + + # Try to register with same email and username + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/register/', + {'username': u'chris', + 'email': u'chris@example.com'}) + + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/register.html'] + register_form = context['register_form'] + + assert register_form.email.errors == [u'Sorry, a user with that email address already exists.'] + assert register_form.username.errors == [u'Sorry, a user with that name already exists.'] + + # Log out + ldap_plugin_app.get('/auth/logout/') + + # Get user and detach from session + test_user = mg_globals.database.User.query.filter_by( + username=u'chris').first() + Session.expunge(test_user) + + # Log back in + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/login/', + {'username': u'chris', + 'password': u'toast'}) + res.follow() + + assert urlparse.urlsplit(res.location)[2] == '/' + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT + + # Make sure user is in the session + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] + session = context['request'].session + assert session['user_id'] == unicode(test_user.id) + + _test_authentication() diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini index da0dffb9..4cd3d9b6 100644 --- a/mediagoblin/tests/test_mgoblin_app.ini +++ b/mediagoblin/tests/test_mgoblin_app.ini @@ -13,6 +13,10 @@ tags_max_length = 50 # So we can start to test attachments: allow_attachments = True +upload_limit = 500 + +max_file_size = 2 + [storage:publicstore] base_dir = %(here)s/user_dev/media/public base_url = /mgoblin_media/ diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py index 23a2290e..3dfafb60 100644 --- a/mediagoblin/tests/test_openid.py +++ b/mediagoblin/tests/test_openid.py @@ -29,6 +29,7 @@ from mediagoblin.plugins.openid.models import OpenIDUserURL from mediagoblin.tests.tools import get_app, fixture_add_user from mediagoblin.tools import template + # App with plugin enabled @pytest.fixture() def openid_plugin_app(request): diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index ac941063..7f4e8086 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -24,13 +24,14 @@ import pytest from mediagoblin.tests.tools import fixture_add_user from mediagoblin import mg_globals -from mediagoblin.db.models import MediaEntry +from mediagoblin.db.models import MediaEntry, User +from mediagoblin.db.base import Session from mediagoblin.tools import template from mediagoblin.media_types.image import ImageMediaManager from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \ - BIG_BLUE, GOOD_PDF, GPS_JPG + BIG_BLUE, GOOD_PDF, GPS_JPG, MED_PNG, BIG_PNG GOOD_TAG_STRING = u'yin,yang' BAD_TAG_STRING = unicode('rage,' + 'f' * 26 + 'u' * 26) @@ -107,9 +108,38 @@ class TestSubmission: self.logout() self.test_app.get(url) + def user_upload_limits(self, uploaded=None, upload_limit=None): + if uploaded: + self.test_user.uploaded = uploaded + if upload_limit: + self.test_user.upload_limit = upload_limit + + self.test_user.save() + + # Reload + self.test_user = User.query.filter_by( + username=self.test_user.username + ).first() + + # ... and detach from session: + Session.expunge(self.test_user) + def test_normal_jpg(self): + # User uploaded should be 0 + assert self.test_user.uploaded == 0 + self.check_normal_upload(u'Normal upload 1', GOOD_JPG) + # User uploaded should be the same as GOOD_JPG size in Mb + file_size = os.stat(GOOD_JPG).st_size / (1024.0 * 1024) + file_size = float('{0:.2f}'.format(file_size)) + + # Reload user + self.test_user = User.query.filter_by( + username=self.test_user.username + ).first() + assert self.test_user.uploaded == file_size + def test_normal_png(self): self.check_normal_upload(u'Normal upload 2', GOOD_PNG) @@ -121,6 +151,75 @@ class TestSubmission: self.check_url(response, '/u/{0}/'.format(self.test_user.username)) assert 'mediagoblin/user_pages/user.html' in context + def test_default_upload_limits(self): + self.user_upload_limits(uploaded=500) + + # User uploaded should be 500 + assert self.test_user.uploaded == 500 + + response, context = self.do_post({'title': u'Normal upload 4'}, + do_follow=True, + **self.upload_data(GOOD_JPG)) + self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + assert 'mediagoblin/user_pages/user.html' in context + + # Reload user + self.test_user = User.query.filter_by( + username=self.test_user.username + ).first() + + # Shouldn't have uploaded + assert self.test_user.uploaded == 500 + + def test_user_upload_limit(self): + self.user_upload_limits(uploaded=25, upload_limit=25) + + # User uploaded should be 25 + assert self.test_user.uploaded == 25 + + response, context = self.do_post({'title': u'Normal upload 5'}, + do_follow=True, + **self.upload_data(GOOD_JPG)) + self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + assert 'mediagoblin/user_pages/user.html' in context + + # Reload user + self.test_user = User.query.filter_by( + username=self.test_user.username + ).first() + + # Shouldn't have uploaded + assert self.test_user.uploaded == 25 + + def test_user_under_limit(self): + self.user_upload_limits(uploaded=499) + + # User uploaded should be 499 + assert self.test_user.uploaded == 499 + + response, context = self.do_post({'title': u'Normal upload 6'}, + do_follow=False, + **self.upload_data(MED_PNG)) + form = context['mediagoblin/submit/start.html']['submit_form'] + assert form.file.errors == [u'Sorry, uploading this file will put you' + ' over your upload limit.'] + + # Reload user + self.test_user = User.query.filter_by( + username=self.test_user.username + ).first() + + # Shouldn't have uploaded + assert self.test_user.uploaded == 499 + + def test_big_file(self): + response, context = self.do_post({'title': u'Normal upload 7'}, + do_follow=False, + **self.upload_data(BIG_PNG)) + + form = context['mediagoblin/submit/start.html']['submit_form'] + assert form.file.errors == [u'Sorry, the file size is too big.'] + def check_media(self, request, find_data, count=None): media = MediaEntry.query.filter_by(**find_data) if count is not None: @@ -155,6 +254,7 @@ class TestSubmission: 'ffffffffffffffffffffffffffuuuuuuuuuuuuuuuuuuuuuuuuuu'] def test_delete(self): + self.user_upload_limits(uploaded=50) response, request = self.do_post({'title': u'Balanced Goblin'}, *REQUEST_CONTEXT, do_follow=True, **self.upload_data(GOOD_JPG)) @@ -199,6 +299,14 @@ class TestSubmission: self.check_media(request, {'id': media_id}, 0) self.check_comments(request, media_id, 0) + # Reload user + self.test_user = User.query.filter_by( + username = self.test_user.username + ).first() + + # Check that user.uploaded is the same as before the upload + assert self.test_user.uploaded == 50 + def test_evil_file(self): # Test non-suppoerted file with non-supported extension # ----------------------------------------------------- diff --git a/mediagoblin/tests/test_submission/COPYING.txt b/mediagoblin/tests/test_submission/COPYING.txt new file mode 100644 index 00000000..3818aae4 --- /dev/null +++ b/mediagoblin/tests/test_submission/COPYING.txt @@ -0,0 +1,5 @@ +Images located in this directory tree are released under a GPLv3 license +and CC BY-SA 3.0 license. To the extent possible under law, the author(s) +have dedicated all copyright and related and neighboring rights to these +files to the public domain worldwide. These files are distributed without +any warranty. diff --git a/mediagoblin/tests/test_submission/big.png b/mediagoblin/tests/test_submission/big.png Binary files differnew file mode 100644 index 00000000..a284cfda --- /dev/null +++ b/mediagoblin/tests/test_submission/big.png diff --git a/mediagoblin/tests/test_submission/medium.png b/mediagoblin/tests/test_submission/medium.png Binary files differnew file mode 100644 index 00000000..e8b9ca00 --- /dev/null +++ b/mediagoblin/tests/test_submission/medium.png diff --git a/mediagoblin/tools/pagination.py b/mediagoblin/tools/pagination.py index d0f08c94..855878e0 100644 --- a/mediagoblin/tools/pagination.py +++ b/mediagoblin/tools/pagination.py @@ -18,7 +18,7 @@ import urllib import copy from math import ceil, floor from itertools import izip, count - +from werkzeug.datastructures import MultiDict PAGINATION_DEFAULT_PER_PAGE = 30 @@ -98,7 +98,11 @@ class Pagination(object): """ Get a page url by adding a page= parameter to the base url """ - new_get_params = dict(get_params) or {} + if isinstance(get_params, MultiDict): + new_get_params = get_params.to_dict() + else: + new_get_params = dict(get_params) or {} + new_get_params['page'] = page_no return "%s?%s" % ( base_url, urllib.urlencode(new_get_params)) diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 3f98aa8a..1eabe9f1 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -252,7 +252,7 @@ def get_hook_templates(hook_name): .. code-block:: html+jinja - {% template_hook "media_sidebar" %} + {% template_hook("media_sidebar") %} ... which will include all templates for you, partly using this method. diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index ac39c4ba..974cb3c6 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -293,6 +293,11 @@ def media_confirm_delete(request, media): if request.method == 'POST' and form.validate(): if form.confirm.data is True: username = media.get_uploader.username + + media.get_uploader.uploaded = media.get_uploader.uploaded - \ + media.file_size + media.get_uploader.save() + # Delete MediaEntry and all related files, comments etc. media.delete() messages.add_message( |
