From: Jan Szejko Date: Wed, 5 Dec 2018 14:11:23 +0000 (+0100) Subject: add vimeo X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/15e6c9027a47700418d9b80bdfac488529f09e4d?ds=sidebyside add vimeo --- diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo index 5c5b3ede..d9595da8 100644 Binary files a/apps/wiki/locale/pl/LC_MESSAGES/django.mo and b/apps/wiki/locale/pl/LC_MESSAGES/django.mo differ diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po index c4808f41..bde41ae5 100644 --- a/apps/wiki/locale/pl/LC_MESSAGES/django.po +++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po @@ -136,10 +136,10 @@ msgstr "" #: templates/wiki/bootstrap.html:186 msgid "" "Add a video material to your document to make it more attractive. Paste the " -"http link from a YouTube channel." +"http link from a YouTube or Vimeo channel." msgstr "" "Dodaj materiał video, by Twój dokument był jeszcze bardziej atrakcyjny. " -"Wklej link http z kanału YouTube." +"Wklej link http z kanału YouTube lub Vimeo." #: templates/wiki/bootstrap.html:187 msgid "" diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo index 12222d78..3ce9db77 100644 Binary files a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo and b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo differ diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po index bbe7941d..5b473776 100644 --- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po +++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po @@ -550,8 +550,8 @@ msgid "Edit video url" msgstr "Edytuj adres wideo" #: static/wiki/editor/src/editor/plugins/core/video/videoElement.js:74 -msgid "YouTube link" -msgstr "Link do YouTube" +msgid "YouTube or Vimeo link" +msgstr "Link do YouTube lub Vimeo" #: static/wiki/editor/src/editor/translation-fix.js:2 msgid "edit" diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor index 6b836441..b3175511 160000 --- a/apps/wiki/static/wiki/editor +++ b/apps/wiki/static/wiki/editor @@ -1 +1 @@ -Subproject commit 6b836441828cd0b8f06715cda23a54cadf37875e +Subproject commit b3175511e034e17b05ffb5b12413ba94e2f69bee diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html index 1298fa69..61abfb95 100644 --- a/apps/wiki/templates/wiki/bootstrap.html +++ b/apps/wiki/templates/wiki/bootstrap.html @@ -185,7 +185,7 @@ {name: 'switchToHeader', text: '{% trans "Place the cursor at the end of the line after which you want to add a new header, and press Enter. Click “header” to switch the new paragraph into a header." %}'}, {name: 'switchToParagraph', text: '{% trans "Use this option to switch a header to a paragraph." %}'}, {name: 'switchToImage', text: '{% trans "Add graphics to your document. Click “image” to make a frame, then click this frame to insert an image file (JPG, PNG, GIF, SVG)." %}'}, - {name: 'switchToVideo', text: '{% trans "Add a video material to your document to make it more attractive. Paste the http link from a YouTube channel." %}'}, + {name: 'switchToVideo', text: '{% trans "Add a video material to your document to make it more attractive. Paste the http link from a YouTube or Vimeo channel." %}'}, {name: 'toggleBulletList', text: '{% trans "Select this option to create a bullet list. Press Enter to add another item. To end the list, place the cursor at the end of the last item, and press Enter twice." %}'}, {name: 'toggleEnumList', text: '{% trans "Create numbered lists. To end the list, set the cursor at the end of the last item, and press Enter twice." %}'}, {name: 'emphasis', text: '{% trans "Emphasize some text by using boldface. To turn it off, click the specific word and then click “emphasis”." %}'}, diff --git a/lib/librarian b/lib/librarian index c5ed685c..ea9a4eea 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit c5ed685cce7a1d4666e36f1415ae449ab09cf0b9 +Subproject commit ea9a4eea8ee61954c9ae52e8662139c8933ea95d