From 0445100b30a2236539a5695b172b5256c0460ca2 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 16 Aug 2011 08:18:38 -0500 Subject: [PATCH 01/17] Pulled down latest translations --- .../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 0 -> 5561 bytes .../i18n/eo/LC_MESSAGES/mediagoblin.po | 319 ++++++++++++++++++ .../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 0 -> 6281 bytes .../i18n/ja/LC_MESSAGES/mediagoblin.po | 310 +++++++++++++++++ .../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 0 -> 5387 bytes .../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 310 +++++++++++++++++ 6 files changed, 939 insertions(+) create mode 100644 mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo create mode 100644 mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po create mode 100644 mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo create mode 100644 mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po create mode 100644 mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo create mode 100644 mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo new file mode 100644 index 0000000000000000000000000000000000000000..114ab7c0ebf4c33f53390840b0190e714907e557 GIT binary patch literal 5561 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 Ql`d#7^j9uXSaVwa7Y|C6mH+?% literal 0 HcmV?d00001 diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po new file mode 100644 index 00000000..ea19af01 --- /dev/null +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po @@ -0,0 +1,319 @@ +# Translations template for PROJECT. +# Copyright (C) 2011 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# , 2011. +# Fernando Inocencio , 2011. +msgid "" +msgstr "" +"Project-Id-Version: GNU MediaGoblin\n" +"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" +"POT-Creation-Date: 2011-08-13 19:47-0500\n" +"PO-Revision-Date: 2011-08-15 20:33+0000\n" +"Last-Translator: fajro \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: eo\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +msgid "Username" +msgstr "Uzantnomo" + +#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +msgid "Password" +msgstr "Pasvorton" + +#: mediagoblin/auth/forms.py:34 +msgid "Passwords must match." +msgstr "Pasvortoj devas koincidi. " + +#: mediagoblin/auth/forms.py:36 +msgid "Confirm password" +msgstr "Retajpu pasvorton" + +#: mediagoblin/auth/forms.py:39 +msgid "Email address" +msgstr "Retadreso" + +#: mediagoblin/auth/views.py:40 +msgid "Sorry, registration is disabled on this instance." +msgstr "Bedaŭrinde, registrado estas malaktivita en tiu ĉi instanco." + +#: mediagoblin/auth/views.py:57 +msgid "Sorry, a user with that name already exists." +msgstr "Bedaŭrinde, uzanto kun tiu nomo jam ekzistas." + +#: mediagoblin/auth/views.py:61 +msgid "Sorry, that email address has already been taken." +msgstr "" + +#: mediagoblin/auth/views.py:159 +msgid "" +"Your email address has been verified. You may now login, edit your profile, " +"and submit images!" +msgstr "" +"Vian retadreson estas kontrolita. Vi povas nun ensaluti, redakti vian " +"profilon, kaj alŝuti bildojn!" + +#: mediagoblin/auth/views.py:165 +msgid "The verification key or user id is incorrect" +msgstr "La kontrol-kodo aŭ la uzantonomo ne estas korekta" + +#: mediagoblin/auth/views.py:186 +#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 +msgid "Resent your verification email." +msgstr "Resendi vian kontrol-mesaĝon." + +#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 +msgid "Title" +msgstr "Titolo" + +#: mediagoblin/edit/forms.py:29 +msgid "Slug" +msgstr "" + +#: mediagoblin/edit/forms.py:30 +msgid "The slug can't be empty" +msgstr "" + +#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31 +msgid "Tags" +msgstr "Etikedoj" + +#: mediagoblin/edit/forms.py:38 +msgid "Bio" +msgstr "Bio" + +#: mediagoblin/edit/forms.py:41 +msgid "Website" +msgstr "Retejo" + +#: mediagoblin/edit/forms.py:43 +msgid "Improperly formed URL" +msgstr "" + +#: mediagoblin/edit/views.py:54 +msgid "An entry with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:75 +msgid "You are editing another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:96 +msgid "You are editing a user's profile. Proceed with caution." +msgstr "" + +#: mediagoblin/submit/forms.py:25 +msgid "File" +msgstr "Dosiero" + +#: mediagoblin/submit/views.py:46 +msgid "You must provide a file." +msgstr "Vi devas provizi dosieron." + +#: mediagoblin/submit/views.py:49 +msgid "The file doesn't seem to be an image!" +msgstr "" + +#: mediagoblin/submit/views.py:94 +msgid "Woohoo! Submitted!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:22 +msgid "GNU MediaGoblin" +msgstr "GNU MediaGoblin" + +#: mediagoblin/templates/mediagoblin/base.html:45 +msgid "Mediagoblin logo" +msgstr " Logogramo de Mediagoblin" + +#: mediagoblin/templates/mediagoblin/base.html:51 +msgid "Submit media" +msgstr "Alŝuti aŭd-vid-dosieron" + +#: mediagoblin/templates/mediagoblin/base.html:62 +msgid "verify your email!" +msgstr "kontrolu vian retpoŝton! " + +#: mediagoblin/templates/mediagoblin/base.html:72 +msgid "Login" +msgstr "Ensaluti" + +#: mediagoblin/templates/mediagoblin/base.html:88 +msgid "" +"Powered by MediaGoblin, a GNU project" +msgstr "" +"Provizita de MediaGoblin, unu el la " +"GNU projectoj" + +#: mediagoblin/templates/mediagoblin/root.html:23 +msgid "Welcome to GNU MediaGoblin!" +msgstr "Bonvenon al GNU MediaGoblin!" + +#: mediagoblin/templates/mediagoblin/root.html:28 +msgid "Submit an item" +msgstr "Alŝuti dosieron" + +#: mediagoblin/templates/mediagoblin/root.html:33 +#, python-format +msgid "If you have an account, you can Login." +msgstr "Se vi havas konton, vi povas Ensaluti." + +#: mediagoblin/templates/mediagoblin/root.html:39 +#, python-format +msgid "" +"If you don't have an account, please Register." +msgstr "" +"Se vi ne havas konton, bonvolu Registriĝi." + +#: mediagoblin/templates/mediagoblin/auth/login.html:26 +msgid "Log in" +msgstr "Ensaluti" + +#: mediagoblin/templates/mediagoblin/auth/login.html:29 +msgid "Login failed!" +msgstr "Ensalutado malsukcesis!" + +#: mediagoblin/templates/mediagoblin/auth/login.html:34 +#: mediagoblin/templates/mediagoblin/auth/register.html:30 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/submit/start.html:29 +msgid "Submit" +msgstr "Alŝuti" + +#: mediagoblin/templates/mediagoblin/auth/login.html:42 +msgid "Don't have an account yet?" +msgstr "Ĉu ankoraŭ sen konto?" + +#: mediagoblin/templates/mediagoblin/auth/login.html:45 +msgid "Create one here!" +msgstr "Kreu unu ĉi tie!" + +#: mediagoblin/templates/mediagoblin/auth/register.html:27 +msgid "Create an account!" +msgstr "Kreu konton!" + +#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 +#, python-format +msgid "" +"Hi %(username)s,\n" +"\n" +"to activate your GNU MediaGoblin account, open the following URL in\n" +"your web browser:\n" +"\n" +"%(verification_url)s" +msgstr "" +"Sal %(username)s,\n" +"\n" +"por aktivigi vian GNU MediaGoblin konton, malfermu la sekvantan URLon en via retumilo:\n" +"\n" +"%(verification_url)s" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:29 +#, python-format +msgid "Editing %(media_title)s" +msgstr "Editing %(media_title)s" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:36 +msgid "Cancel" +msgstr "Nuligi" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:37 +msgid "Save changes" +msgstr "Konservi ŝanĝojn" + +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29 +#, python-format +msgid "Editing %(username)s's profile" +msgstr "Redaktanta profilon de %(username)s'" + +#: mediagoblin/templates/mediagoblin/listings/tag.html:31 +msgid "Media tagged with:" +msgstr "Dosiero markita kiel:" + +#: mediagoblin/templates/mediagoblin/listings/tag.html:42 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:104 +msgid "atom feed" +msgstr "Atom-a informfluado" + +#: mediagoblin/templates/mediagoblin/submit/start.html:26 +msgid "Submit yer media" +msgstr "Alŝutu vian aŭd-vid-dosieron" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:32 +#, python-format +msgid "%(username)s's media" +msgstr "%(username)s-a aŭd-vid-dosiero" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:32 +msgid "Sorry, no such user found." +msgstr "Uzanto ne trovita." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:59 +msgid "Verification needed" +msgstr "Kontrolon bezonata" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:42 +msgid "Almost done! Your account still needs to be verified." +msgstr "Preskaŭ farite! Via konto ankoraŭ devas esti kontrolita." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:47 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" +"Retmesaĝo alvenos post kelkaj momentoj kun instrukcioj pri kiel tion fari." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:51 +msgid "In case it doesn't:" +msgstr "Se tio ne okazas:" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:54 +msgid "Resend verification email" +msgstr "Resendu kontrolmesaĝon" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" verified." +msgstr "" +"Iu registris konton kun tiu ĉi uzantonomo, sed ĝi devas ankoraŭ esti " +"kontrolita." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:68 +#, python-format +msgid "" +"If you are that person but you've lost your verification email, you can log in and resend it." +msgstr "" +"Se vi estas tiu sed vi perdis vian kontrolmesaĝon, vi povas ensaluti kaj resendi ĝin." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:78 +#, python-format +msgid "%(username)s's profile" +msgstr "%(username)s'-a profilo" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:86 +msgid "Edit profile" +msgstr "Redakti profilo" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:98 +#, python-format +msgid "View all of %(username)s's media" +msgstr "Rigardu ĉiuj aŭd-vid-dosierojn de %(username)s'" + +#: mediagoblin/user_pages/forms.py:24 +msgid "Comment" +msgstr "Komento" + + diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo new file mode 100644 index 0000000000000000000000000000000000000000..78455ad2709820cd5393594c99bde44e5980926d GIT binary patch literal 6281 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, 2011. +msgid "" +msgstr "" +"Project-Id-Version: GNU MediaGoblin\n" +"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" +"POT-Creation-Date: 2011-08-13 19:47-0500\n" +"PO-Revision-Date: 2011-08-14 00:47+0000\n" +"Last-Translator: cwebber \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +msgid "Username" +msgstr "ユーザネーム" + +#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +msgid "Password" +msgstr "パスワード" + +#: mediagoblin/auth/forms.py:34 +msgid "Passwords must match." +msgstr "パスワードが一致している必要があります。" + +#: mediagoblin/auth/forms.py:36 +msgid "Confirm password" +msgstr "パスワードを確認" + +#: mediagoblin/auth/forms.py:39 +msgid "Email address" +msgstr "メールアドレス" + +#: mediagoblin/auth/views.py:40 +msgid "Sorry, registration is disabled on this instance." +msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。" + +#: mediagoblin/auth/views.py:57 +msgid "Sorry, a user with that name already exists." +msgstr "申し訳ありませんが、その名前を持つユーザーがすでに存在しています。" + +#: mediagoblin/auth/views.py:61 +msgid "Sorry, that email address has already been taken." +msgstr "" + +#: mediagoblin/auth/views.py:159 +msgid "" +"Your email address has been verified. You may now login, edit your profile, " +"and submit images!" +msgstr "メアドが確認されています。これで、ログインしてプロファイルを編集し、画像を提出することができます！" + +#: mediagoblin/auth/views.py:165 +msgid "The verification key or user id is incorrect" +msgstr "検証キーまたはユーザーIDが間違っています" + +#: mediagoblin/auth/views.py:186 +#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 +msgid "Resent your verification email." +msgstr "検証メールを再送しました。" + +#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 +msgid "Title" +msgstr "タイトル" + +#: mediagoblin/edit/forms.py:29 +msgid "Slug" +msgstr "スラグ" + +#: mediagoblin/edit/forms.py:30 +msgid "The slug can't be empty" +msgstr "スラグは必要です。" + +#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31 +msgid "Tags" +msgstr "タグ" + +#: mediagoblin/edit/forms.py:38 +msgid "Bio" +msgstr "自己紹介" + +#: mediagoblin/edit/forms.py:41 +msgid "Website" +msgstr "URL" + +#: mediagoblin/edit/forms.py:43 +msgid "Improperly formed URL" +msgstr "不適切な形式のURL" + +#: mediagoblin/edit/views.py:54 +msgid "An entry with that slug already exists for this user." +msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。" + +#: mediagoblin/edit/views.py:75 +msgid "You are editing another user's media. Proceed with caution." +msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。" + +#: mediagoblin/edit/views.py:96 +msgid "You are editing a user's profile. Proceed with caution." +msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。" + +#: mediagoblin/submit/forms.py:25 +msgid "File" +msgstr "ファイル" + +#: mediagoblin/submit/views.py:46 +msgid "You must provide a file." +msgstr "ファイルを提供する必要があります。" + +#: mediagoblin/submit/views.py:49 +msgid "The file doesn't seem to be an image!" +msgstr "ファイルが画像ではないようです！" + +#: mediagoblin/submit/views.py:94 +msgid "Woohoo! Submitted!" +msgstr "投稿終了！" + +#: mediagoblin/templates/mediagoblin/base.html:22 +msgid "GNU MediaGoblin" +msgstr "GNU MediaGoblin" + +#: mediagoblin/templates/mediagoblin/base.html:45 +msgid "Mediagoblin logo" +msgstr "MediaGoblinロゴ" + +#: mediagoblin/templates/mediagoblin/base.html:51 +msgid "Submit media" +msgstr "コンテンツを投稿" + +#: mediagoblin/templates/mediagoblin/base.html:62 +msgid "verify your email!" +msgstr "メアドを確認してください！" + +#: mediagoblin/templates/mediagoblin/base.html:72 +msgid "Login" +msgstr "ログイン" + +#: mediagoblin/templates/mediagoblin/base.html:88 +msgid "" +"Powered by MediaGoblin, a GNU project" +msgstr "" +"Powered by MediaGoblin, a GNU project" + +#: mediagoblin/templates/mediagoblin/root.html:23 +msgid "Welcome to GNU MediaGoblin!" +msgstr "GNU MediaGoblinへようこそ！" + +#: mediagoblin/templates/mediagoblin/root.html:28 +msgid "Submit an item" +msgstr "アイテムを投稿" + +#: mediagoblin/templates/mediagoblin/root.html:33 +#, python-format +msgid "If you have an account, you can Login." +msgstr "もしアカウントが持ったら、ログインできます。" + +#: mediagoblin/templates/mediagoblin/root.html:39 +#, python-format +msgid "" +"If you don't have an account, please Register." +msgstr "アカウントが持っていなければ、登録してお願いします。" + +#: mediagoblin/templates/mediagoblin/auth/login.html:26 +msgid "Log in" +msgstr "ログイン" + +#: mediagoblin/templates/mediagoblin/auth/login.html:29 +msgid "Login failed!" +msgstr "ログイン失敗！" + +#: mediagoblin/templates/mediagoblin/auth/login.html:34 +#: mediagoblin/templates/mediagoblin/auth/register.html:30 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/submit/start.html:29 +msgid "Submit" +msgstr "送信" + +#: mediagoblin/templates/mediagoblin/auth/login.html:42 +msgid "Don't have an account yet?" +msgstr "まだアカウントを持っていませんか？" + +#: mediagoblin/templates/mediagoblin/auth/login.html:45 +msgid "Create one here!" +msgstr "ここで作成！" + +#: mediagoblin/templates/mediagoblin/auth/register.html:27 +msgid "Create an account!" +msgstr "アカウントを作成！" + +#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 +#, python-format +msgid "" +"Hi %(username)s,\n" +"\n" +"to activate your GNU MediaGoblin account, open the following URL in\n" +"your web browser:\n" +"\n" +"%(verification_url)s" +msgstr "" +"%(username)s様へ\n" +"\n" +"GNU MediaGoblinアカウントを検証にするには、このURLを開いてください。\n" +"\n" +"%(verification_url)s" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:29 +#, python-format +msgid "Editing %(media_title)s" +msgstr "%(media_title)sを編集中" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:36 +msgid "Cancel" +msgstr "キャンセル" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:37 +msgid "Save changes" +msgstr "投稿する" + +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29 +#, python-format +msgid "Editing %(username)s's profile" +msgstr "%(username)sさんのプロフィールを編集中" + +#: mediagoblin/templates/mediagoblin/listings/tag.html:31 +msgid "Media tagged with:" +msgstr "タグ付けされたコンテンツ：" + +#: mediagoblin/templates/mediagoblin/listings/tag.html:42 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:104 +msgid "atom feed" +msgstr "Atomフィード" + +#: mediagoblin/templates/mediagoblin/submit/start.html:26 +msgid "Submit yer media" +msgstr "コンテンツを投稿" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:32 +#, python-format +msgid "%(username)s's media" +msgstr "%(username)sさんのコンテンツ" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:32 +msgid "Sorry, no such user found." +msgstr "申し訳ありませんが、そのユーザーは見つかりませんでした。" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:59 +msgid "Verification needed" +msgstr "確認必要" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:42 +msgid "Almost done! Your account still needs to be verified." +msgstr "ほぼ完了！アカウントを検証する必要があります。" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:47 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "メールは、その方法の指示でいくつかの瞬間に到着します。" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:51 +msgid "In case it doesn't:" +msgstr "到着しない場合は、" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:54 +msgid "Resend verification email" +msgstr "確認メールを再送信" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" verified." +msgstr "誰かがこのユーザ名でアカウントを登録しているが、まだ検証する必要があります。" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:68 +#, python-format +msgid "" +"If you are that person but you've lost your verification email, you can log in and resend it." +msgstr "あなたの確認メールを紛失した場合、ログインして再送できます。" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:78 +#, python-format +msgid "%(username)s's profile" +msgstr "%(username)sさんのプロフィール" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:86 +msgid "Edit profile" +msgstr "プロフィールを編集" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:98 +#, python-format +msgid "View all of %(username)s's media" +msgstr "%(username)sさんのコンテンツをすべて見る" + +#: mediagoblin/user_pages/forms.py:24 +msgid "Comment" +msgstr "" + + diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo new file mode 100644 index 0000000000000000000000000000000000000000..9615e44c791e27e0764e8a265c872b0db189af94 GIT binary patch literal 5387 zcmbW4Yiu0V6~}K|=)*v11Enn>dN(3Upx(7jd2Sv+LP$ds8pVbPJ~W!$y}LWGJLAsG z#w@6kA94JOV?!JpCx*PkV&f!Ef@5s#v{mUtYO7WiYNbj=m3AI0@ujNN_EXjWnLE2) zJA_uX68~~%?mhS1^Z4J%Ushaqh~ei^{Jj%@Z~ZKd7JqKMjhTZehYj7B!7EB@@oWq790a>!M}raF8(FP8o;#yvmp6#6#O!H1|&Q0 zg0%lnL9+J;a25C`kmB)gknG-8BmLh5Vhgqvr1R|rIhX|DD(eF800%%i-vsy&xB#vN z{{emjyzd6aegJ+C#1?EEr1_V?w?D(!FF>;MLj<7c(0(d|8F?cT+!eQuK+X6O% zT69#xJt-5lDIX7^L^tW3x5jjUYXL0K6M~8l?9o zNO5=>r1ibvYH%cYe+8sC{v4$G{VP}x{u6umJZ*^N`jzti?wpai$6UFgdiJ_HWdl}ZMM72B#t%xS7^-nFLo1L){~| zs&R!UMGMdBS)o}bZ&9r@o|=}Ci(9I$nOxU+T5lnP37wm|G^JTaUe2}B3UCLeW{Ykl*d`dT1Xtjc zJW{Cq2#4iqVTcfWLf2MXJgva_#d$n0tVh}Aglbj7N&{6(@l|X5u=%E+=M<>SNS8NG!Zd1mJ}1iZ#y*CJv(X6P-5ShS{Q)f$<kNUFQj^BgcLqBun zK^|w351N#e$(pExQ9k7Y-!siFAuS6Wko^SzpnmBKT4-66{$O0qB=S!)~>EhKD;X4dHj_XFIIj-bLry^Ic({xCl zJYU(TPh0D^7Rr8)nn20;f%c6W!4+1WRzICGn7HQXK15UIxrQ4HovUiKoV=HE2$PgF z6ekqT^m8v$Wrmny=~-Nah^B8WFIV_w6k<3gwP1K_B8>Q(IAnBr0Bd%NX5FyD+s%}k z2ye`#%y5$)64qW3=(u79Au9uvbm#U7RXSw8Q6USE%S->%0`%{Ilf!cB&vnHe0@ zi1Ik@nHUnXF8Ie|35Z!fp3!p&5}plMp`~)D;c$~svQhqWdUw+`xXSw&_){X>hEjlWi!7-II73GYmseRjXoJy@LG7vjbFWAt|B zqBnZ9IM-hqYsLH0+aum&PlVYE-B^J4&RB;t)>E8mwa>Sej?CGUgQbpli*wWVtG!;~ z5^UIK+Kcmt?6$)ZR%#uEk6zcfS7^54V;h3A=N;I5!OU-Jt?@XP9KS zUu5>curu9V`G#^&%zESf_PKrTiT9a3H|tLH(ax=X(#sID#|qfQJ9&J`%fYuotkk~O zx$qiXl~e7J1CKKIa>0B5+>)@#N6WvXcyVSjn7veUC;)!EX+rh!i}U^N{8<(xW10Ri zd!(?$4!)}FLr3ktL(3bDOK)pA4kq*Awhnk_=Izk}c653UmWC05zS0{f;E6kZ!G5Fl zTAxzLgY)JXCFJ~+^ZL0``$>85S|oZOJ!qS?Pfa2Ah%i!IymFl09J2?`73WS@Rg*6? z<&PY9bk6QPO}907_fFdj`%7K@rPeki#d+sAs>I*ZX)oC44?APy$fmt8Qa+M5(YN?9 zuxd^DRxX?N3Ul_pUis-$u~W$({H$`%J#xu8aJt&sHM~R(b`+e+lPIK0z?j|EYDU7;Pr`-10r5{ju?2YedHj1p*YiTcb{LjW^smmQ99P?9ywbP66f%Q-8LqR=l}UiLiO5Rvydu+ zjI`V#coe8*@Lo!!FQ7rI%en{}-yQ4o-o0F0*heSn7^vjV9vgOhy6oYh(2_7?me(=w zzCG)X&NG=V2%XbCObaV9^94C5M?}wir=2an^aIMOwVF9cPs5Mu|HPs6?al%^K^`XX z9P;5#jIw1~#huCH-jxIBVW{iykk>jLLKZ1F_JKJRK?s{4Lq{QZQab|~FAHOYqtCr} z-g7z+c%z5h!F`cyE~xhAlb6X(as~#A3rA#b0^g-JE)!sgA<6>1Dnl6|IdcaV;3*_f q>YD8IS{}GA(^++mdae75Geh#cZs%J_TJ^`1yp9kW1hjhZ5c?12Y!R3M literal 0 HcmV?d00001 diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po new file mode 100644 index 00000000..d8f8c98d --- /dev/null +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -0,0 +1,310 @@ +# Translations template for PROJECT. +# Copyright (C) 2011 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# , 2011. +msgid "" +msgstr "" +"Project-Id-Version: GNU MediaGoblin\n" +"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" +"POT-Creation-Date: 2011-08-13 19:47-0500\n" +"PO-Revision-Date: 2011-08-14 00:47+0000\n" +"Last-Translator: cwebber \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 +msgid "Username" +msgstr "使用者名稱" + +#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 +msgid "Password" +msgstr "密碼" + +#: mediagoblin/auth/forms.py:34 +msgid "Passwords must match." +msgstr "密碼必須一至" + +#: mediagoblin/auth/forms.py:36 +msgid "Confirm password" +msgstr "確認密碼" + +#: mediagoblin/auth/forms.py:39 +msgid "Email address" +msgstr "電子郵件位置" + +#: mediagoblin/auth/views.py:40 +msgid "Sorry, registration is disabled on this instance." +msgstr "抱歉, 這個項目已經被暫停註冊." + +#: mediagoblin/auth/views.py:57 +msgid "Sorry, a user with that name already exists." +msgstr "抱歉, 這個使用者名稱已經存在." + +#: mediagoblin/auth/views.py:61 +msgid "Sorry, that email address has already been taken." +msgstr "" + +#: mediagoblin/auth/views.py:159 +msgid "" +"Your email address has been verified. You may now login, edit your profile, " +"and submit images!" +msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且送出照片!" + +#: mediagoblin/auth/views.py:165 +msgid "The verification key or user id is incorrect" +msgstr "認證碼或是使用者帳號錯誤" + +#: mediagoblin/auth/views.py:186 +#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 +msgid "Resent your verification email." +msgstr "重送認證郵件." + +#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 +msgid "Title" +msgstr "稱謂" + +#: mediagoblin/edit/forms.py:29 +msgid "Slug" +msgstr "自訂字串" + +#: mediagoblin/edit/forms.py:30 +msgid "The slug can't be empty" +msgstr "自訂字串不能空白" + +#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31 +msgid "Tags" +msgstr "標籤" + +#: mediagoblin/edit/forms.py:38 +msgid "Bio" +msgstr "自傳" + +#: mediagoblin/edit/forms.py:41 +msgid "Website" +msgstr "網站" + +#: mediagoblin/edit/forms.py:43 +msgid "Improperly formed URL" +msgstr "部正確的網址" + +#: mediagoblin/edit/views.py:54 +msgid "An entry with that slug already exists for this user." +msgstr "這個自訂字串已經被其他人用了" + +#: mediagoblin/edit/views.py:75 +msgid "You are editing another user's media. Proceed with caution." +msgstr "你正在編輯他人的媒體檔案. 請謹慎處理." + +#: mediagoblin/edit/views.py:96 +msgid "You are editing a user's profile. Proceed with caution." +msgstr "你正在編輯他人的檔案. 請謹慎處理." + +#: mediagoblin/submit/forms.py:25 +msgid "File" +msgstr "檔案" + +#: mediagoblin/submit/views.py:46 +msgid "You must provide a file." +msgstr "你必須提供一個檔案" + +#: mediagoblin/submit/views.py:49 +msgid "The file doesn't seem to be an image!" +msgstr "檔案看起來不像是一個圖片喔!" + +#: mediagoblin/submit/views.py:94 +msgid "Woohoo! Submitted!" +msgstr "喔耶! 送出去了!" + +#: mediagoblin/templates/mediagoblin/base.html:22 +msgid "GNU MediaGoblin" +msgstr "GNU MediaGoblin" + +#: mediagoblin/templates/mediagoblin/base.html:45 +msgid "Mediagoblin logo" +msgstr "Mediagoblin 標誌" + +#: mediagoblin/templates/mediagoblin/base.html:51 +msgid "Submit media" +msgstr "送出媒體" + +#: mediagoblin/templates/mediagoblin/base.html:62 +msgid "verify your email!" +msgstr "確認您的電子郵件!" + +#: mediagoblin/templates/mediagoblin/base.html:72 +msgid "Login" +msgstr "登入" + +#: mediagoblin/templates/mediagoblin/base.html:88 +msgid "" +"Powered by MediaGoblin, a GNU project" +msgstr "" +"由 MediaGoblin 製作, 她是一個 GNU project" + +#: mediagoblin/templates/mediagoblin/root.html:23 +msgid "Welcome to GNU MediaGoblin!" +msgstr "GNU MediaGoblin 歡迎您!" + +#: mediagoblin/templates/mediagoblin/root.html:28 +msgid "Submit an item" +msgstr "送出一個項目" + +#: mediagoblin/templates/mediagoblin/root.html:33 +#, python-format +msgid "If you have an account, you can Login." +msgstr "如果您有帳號了, 你可以直接 登入." + +#: mediagoblin/templates/mediagoblin/root.html:39 +#, python-format +msgid "" +"If you don't have an account, please Register." +msgstr "如果您尚未取得帳號, 請 註冊." + +#: mediagoblin/templates/mediagoblin/auth/login.html:26 +msgid "Log in" +msgstr "登入" + +#: mediagoblin/templates/mediagoblin/auth/login.html:29 +msgid "Login failed!" +msgstr "登入錯誤" + +#: mediagoblin/templates/mediagoblin/auth/login.html:34 +#: mediagoblin/templates/mediagoblin/auth/register.html:30 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/submit/start.html:29 +msgid "Submit" +msgstr "送出" + +#: mediagoblin/templates/mediagoblin/auth/login.html:42 +msgid "Don't have an account yet?" +msgstr "還沒有帳號嗎?" + +#: mediagoblin/templates/mediagoblin/auth/login.html:45 +msgid "Create one here!" +msgstr "在這裡建立一個吧!" + +#: mediagoblin/templates/mediagoblin/auth/register.html:27 +msgid "Create an account!" +msgstr "建立一個帳號!" + +#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 +#, python-format +msgid "" +"Hi %(username)s,\n" +"\n" +"to activate your GNU MediaGoblin account, open the following URL in\n" +"your web browser:\n" +"\n" +"%(verification_url)s" +msgstr "" +"嗨 %(username)s,\n" +"\n" +"啟動 GNU MediaGoblin 帳號, 在你的瀏覽器中打開下面的網址:\n" +"\n" +"%(verification_url)s" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:29 +#, python-format +msgid "Editing %(media_title)s" +msgstr "編輯 %(media_title)s 中" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:36 +msgid "Cancel" +msgstr "取消" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:37 +msgid "Save changes" +msgstr "儲存變更" + +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29 +#, python-format +msgid "Editing %(username)s's profile" +msgstr "編輯 %(username)s'的檔案中" + +#: mediagoblin/templates/mediagoblin/listings/tag.html:31 +msgid "Media tagged with:" +msgstr "媒體被標籤為:" + +#: mediagoblin/templates/mediagoblin/listings/tag.html:42 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:104 +msgid "atom feed" +msgstr "atom feed" + +#: mediagoblin/templates/mediagoblin/submit/start.html:26 +msgid "Submit yer media" +msgstr "送出你的媒體檔案" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:32 +#, python-format +msgid "%(username)s's media" +msgstr "%(username)s的媒體" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:32 +msgid "Sorry, no such user found." +msgstr "抱歉, 找不到這個使用者." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:59 +msgid "Verification needed" +msgstr "需要驗證" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:42 +msgid "Almost done! Your account still needs to be verified." +msgstr "快要完成了! 你的帳號仍需要驗證." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:47 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "很快的會有一封電子郵件告訴你如何做." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:51 +msgid "In case it doesn't:" +msgstr "假設它無法:" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:54 +msgid "Resend verification email" +msgstr "重送認證郵件 " + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" verified." +msgstr "有人已經註冊了這個帳號, 但此帳號仍需要驗證." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:68 +#, python-format +msgid "" +"If you are that person but you've lost your verification email, you can log in and resend it." +msgstr "如果你就是那個人, 但是遺失了認證信, 你可以登入 然後重送一次." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:78 +#, python-format +msgid "%(username)s's profile" +msgstr "%(username)s的個人檔案" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:86 +msgid "Edit profile" +msgstr "編輯個人檔案" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:98 +#, python-format +msgid "View all of %(username)s's media" +msgstr "查看%(username)s的全部媒體檔案" + +#: mediagoblin/user_pages/forms.py:24 +msgid "Comment" +msgstr "" + + From 908b20f51c63add1a01f349d45e119ae767a855b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 16 Aug 2011 08:38:36 -0500 Subject: [PATCH 02/17] Pulled down latest translations --- .../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 5406 -> 5983 bytes .../i18n/fr/LC_MESSAGES/mediagoblin.po | 200 ++++++++++-------- .../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 5461 -> 5597 bytes .../i18n/sv/LC_MESSAGES/mediagoblin.po | 76 ++++--- 4 files changed, 154 insertions(+), 122 deletions(-) diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo index a7daf2c91cd50bd2dea5da7b64a63ece9b1ac78f..f88547344412fe8a48365c3c9005d92d53b4ac43 100644 GIT binary patch literal 5983 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 H52pSDX2CHIO00{zKu*O=`=9C@SQ+Ch6bD=^| ze6;$|*ds}8)DWwQJcy>mw?@-!q7Nq42aU!DiAEERn#P2h#s~HPu|(>IsWz* zVgiec^79(3VZIOJN-d}X230JK;U1jA?f4S1S6#qzd;_1u_iz^Xamy&agMGM;cjEqH zrFP;7N+1@pMWs>Bbx;DD#|rLO=NOc*u!M5JGN$okyc?T&SciQ`#Of4EU@ks^0k-02 zD4E^FPTX0V51=1+Fds(Qe;lPUX^e5dnq|<4&!bf0ZIlDAphW%)a;CbDlG#nv7%!u& z*oL*(jgr};xF1t^KfaFD_zj-GKaeBTBezq3+3*yD_Y0KDqV#$ z{u4^CYe`E2s6)x92`llyrb8%|dm1J4d6YoTqO|(09n_z*)KwOwq}Nb-{Ux5oA5nVk zuqcuLj1tHow@Itcqg3Qwl#H%y`Uy%PU!WxT1Il|hP%2rhN?`w>^g70A(wgHay?zlp@e)b^U*R3NhH}9=a;GZeb~&dOrPUgx)dLF*S5QiQ4JELzk+anelwOx`tMvL1N{Q!DDz=Cc*g8rp{zlc<9Qwv{ ztgP94sXA7$s*6Trt4pOH6qa-x(8**^_kGcm@%rKpo$TyMc1175s~ScuZ|ZT+8aJV* zd$UY}{N&JN*0MA0<8C&(9RFx_d#tcv;jrU`88fGjxXy&_W%ab>`)6D)rH**HWizKk zNAv!4VCq#r!~YiTal2lPHd!-fu5HE*eI2;rX*cxztsM`l{*)c)Y0sUoGe$k^=-jd_ zG&W~V%C=4hc94nA6%Ca1xsGgYjiU0Fds0RZjvmz`^2(rlDq}mX+6`wsV#zceeQa3! zp&k8I-W82)n>#jU>y68ujX)&$t?OI0-(+X<&!;n1ZY5~dy_QaUX5wH&W3y)_Z9g#H z$#UoyC+u-6AjW91KOFxhI*<5Fw(CFOK>T6}Y3hHvp9w*a<{QXuc, 2011. +# Valentin Villenave , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-08 22:53-0500\n" -"PO-Revision-Date: 2011-08-10 21:24+0000\n" -"Last-Translator: MarkTraceur \n" +"POT-Creation-Date: 2011-08-13 19:47-0500\n" +"PO-Revision-Date: 2011-08-16 13:22+0000\n" +"Last-Translator: joar \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,102 +22,112 @@ msgstr "" #: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46 msgid "Username" -msgstr "" +msgstr "Nom d'utilisateur" #: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50 msgid "Password" -msgstr "" +msgstr "Mot de passe" #: mediagoblin/auth/forms.py:34 msgid "Passwords must match." -msgstr "" +msgstr "Les mots de passe doivent correspondre." #: mediagoblin/auth/forms.py:36 msgid "Confirm password" -msgstr "" +msgstr "Confirmer le mot de passe" #: mediagoblin/auth/forms.py:39 msgid "Email address" -msgstr "" +msgstr "Adresse e-mail" #: mediagoblin/auth/views.py:40 msgid "Sorry, registration is disabled on this instance." -msgstr "" +msgstr "L'inscription n'est pas activée sur ce serveur, désolé." -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:57 msgid "Sorry, a user with that name already exists." +msgstr "Un utilisateur existe déjà avec ce nom, désolé." + +#: mediagoblin/auth/views.py:61 +msgid "Sorry, that email address has already been taken." msgstr "" -#: mediagoblin/auth/views.py:152 +#: mediagoblin/auth/views.py:159 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" +"Votre adresse e-mail a bien été vérifiée. Vous pouvez maintenant vous " +"identifier, modifier votre profil, et soumettre des images !" -#: mediagoblin/auth/views.py:158 +#: mediagoblin/auth/views.py:165 msgid "The verification key or user id is incorrect" -msgstr "" +msgstr "La clé de vérification ou le nom d'utilisateur est incorrect." -#: mediagoblin/auth/views.py:179 +#: mediagoblin/auth/views.py:186 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." -msgstr "Nous avons renvoyé votre e-mail de vérification." +msgstr "E-mail de vérification renvoyé." -#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26 +#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 msgid "Title" -msgstr "" +msgstr "Titre" #: mediagoblin/edit/forms.py:29 msgid "Slug" -msgstr "" +msgstr "Légende" #: mediagoblin/edit/forms.py:30 msgid "The slug can't be empty" -msgstr "" +msgstr "La légende ne peut pas être laissée vide." #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31 msgid "Tags" -msgstr "" +msgstr "Tags" #: mediagoblin/edit/forms.py:38 msgid "Bio" -msgstr "" +msgstr "Bio" #: mediagoblin/edit/forms.py:41 msgid "Website" -msgstr "" +msgstr "Site web" #: mediagoblin/edit/forms.py:43 msgid "Improperly formed URL" -msgstr "" +msgstr "Adresse web mal formée" #: mediagoblin/edit/views.py:54 msgid "An entry with that slug already exists for this user." -msgstr "" +msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende." #: mediagoblin/edit/views.py:75 msgid "You are editing another user's media. Proceed with caution." msgstr "" +"Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez " +"prendre garde." #: mediagoblin/edit/views.py:96 msgid "You are editing a user's profile. Proceed with caution." msgstr "" +"Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre " +"garde." -#: mediagoblin/submit/forms.py:29 +#: mediagoblin/submit/forms.py:25 msgid "File" -msgstr "" +msgstr "Fichier" -#: mediagoblin/submit/views.py:45 +#: mediagoblin/submit/views.py:46 msgid "You must provide a file." -msgstr "" +msgstr "Il vous faut fournir un fichier." -#: mediagoblin/submit/views.py:48 +#: mediagoblin/submit/views.py:49 msgid "The file doesn't seem to be an image!" -msgstr "" +msgstr "Ce fichier ne semble pas être une image !" -#: mediagoblin/submit/views.py:96 +#: mediagoblin/submit/views.py:94 msgid "Woohoo! Submitted!" -msgstr "" +msgstr "Youhou, c'est envoyé !" #: mediagoblin/templates/mediagoblin/base.html:22 msgid "GNU MediaGoblin" @@ -127,73 +139,74 @@ msgstr "logo de MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:51 msgid "Submit media" -msgstr "Soumettez des médias" +msgstr "Soumettre un média" #: mediagoblin/templates/mediagoblin/base.html:62 msgid "verify your email!" -msgstr "vérifiez votre addresse e-mail" +msgstr "vérifier son adresse e-mail" #: mediagoblin/templates/mediagoblin/base.html:72 msgid "Login" -msgstr "Connexion" +msgstr "Identification" #: mediagoblin/templates/mediagoblin/base.html:88 msgid "" "Powered by MediaGoblin, a GNU project" msgstr "" -"Alimenté par MediaGoblin, un projet GNU" +"Propulsé par MediaGoblin, un projet " +"de GNU" -#: mediagoblin/templates/mediagoblin/root.html:21 +#: mediagoblin/templates/mediagoblin/root.html:23 msgid "Welcome to GNU MediaGoblin!" -msgstr "Bienvenue à GNU MediaGoblin!" +msgstr "Bienvenue sur GNU MediaGoblin !" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "Submit an item" -msgstr "Soumettez un fichier" +msgstr "Soumettre un fichier" -#: mediagoblin/templates/mediagoblin/root.html:31 +#: mediagoblin/templates/mediagoblin/root.html:33 #, python-format msgid "If you have an account, you can Login." msgstr "" -"Si vous avez un compte, vous pouvez Connecter." +"Si vous avez un compte, vous pouvez vous identifier." -#: mediagoblin/templates/mediagoblin/root.html:37 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "If you don't have an account, please Register." msgstr "" -"Si vous n'avez pas un compte, s'il vous plaît, vous inscrivez." +"Si vous n'avez pas de compte, veuillez vous inscrire." #: mediagoblin/templates/mediagoblin/auth/login.html:26 msgid "Log in" -msgstr "Connexion" +msgstr "S'identifier" #: mediagoblin/templates/mediagoblin/auth/login.html:29 msgid "Login failed!" -msgstr "Connexion manqué" +msgstr "L'identification a échoué !" #: mediagoblin/templates/mediagoblin/auth/login.html:34 #: mediagoblin/templates/mediagoblin/auth/register.html:30 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 -#: mediagoblin/templates/mediagoblin/submit/start.html:32 +#: mediagoblin/templates/mediagoblin/submit/start.html:29 msgid "Submit" -msgstr "Soumettez" +msgstr "Soumettre" #: mediagoblin/templates/mediagoblin/auth/login.html:42 msgid "Don't have an account yet?" -msgstr "N'avez-vous toujours un compte?" +msgstr "Pas encore de compte ?" #: mediagoblin/templates/mediagoblin/auth/login.html:45 msgid "Create one here!" -msgstr "En créez un ici!" +msgstr "Créez-en un ici !" #: mediagoblin/templates/mediagoblin/auth/register.html:27 msgid "Create an account!" -msgstr "Créez un compte!" +msgstr "Créer un compte !" #: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 #, python-format @@ -205,101 +218,112 @@ msgid "" "\n" "%(verification_url)s" msgstr "" -"Bonjour, %(username)s,\n" +"Bonjour %(username)s,\n" "\n" -"pour activer votre compte de GNU MediaGoblin, ouvrez l'URL suite avec votre navigateur web:\n" +"pour activer votre compte sur GNU MediaGoblin, veuillez vous rendre à l'adresse suivante avec votre navigateur web:\n" "\n" "%(verification_url)s" #: mediagoblin/templates/mediagoblin/edit/edit.html:29 #, python-format msgid "Editing %(media_title)s" -msgstr "On édit %(media_title)s" +msgstr "Modification de %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/edit.html:36 msgid "Cancel" -msgstr "Annulez" +msgstr "Annuler" #: mediagoblin/templates/mediagoblin/edit/edit.html:37 msgid "Save changes" -msgstr "Enregistrez les modifications" +msgstr "Enregistrer les modifications" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29 #, python-format msgid "Editing %(username)s's profile" -msgstr "" +msgstr "Modification du profil de %(username)s" -#: mediagoblin/templates/mediagoblin/listings/tag.html:29 +#: mediagoblin/templates/mediagoblin/listings/tag.html:31 msgid "Media tagged with:" -msgstr "" +msgstr "Média comportant les tags suivants :" -#: mediagoblin/templates/mediagoblin/listings/tag.html:40 -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 +#: mediagoblin/templates/mediagoblin/listings/tag.html:42 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:104 msgid "atom feed" -msgstr "" +msgstr "flux Atom" #: mediagoblin/templates/mediagoblin/submit/start.html:26 msgid "Submit yer media" -msgstr "" +msgstr "Soumettez ce média" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:32 #, python-format msgid "%(username)s's media" -msgstr "" +msgstr "Médias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:30 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:32 msgid "Sorry, no such user found." -msgstr "" +msgstr "Impossible de trouver cet utilisateur, désolé." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:37 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:59 msgid "Verification needed" -msgstr "" +msgstr "Vérification requise" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:42 msgid "Almost done! Your account still needs to be verified." -msgstr "" +msgstr "C'est presque fini ! Il vous faut encore vérifier votre compte." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:47 msgid "" "An email should arrive in a few moments with instructions on how to do so." msgstr "" +"Un e-mail devrait vous parvenir dans quelques instants ; il vous indiquera " +"comment procéder." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:49 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:51 msgid "In case it doesn't:" -msgstr "" +msgstr "Si la vérification n'est pas arrivée à bon port :" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:54 msgid "Resend verification email" -msgstr "" +msgstr "Renvoyer l'e-mail de vérification" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:60 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 msgid "" "Someone has registered an account with this username, but it still has to be" " verified." msgstr "" +"Quelqu'un a créé un compte à ce nom, mais le compte n'a pas encore été " +"vérifié." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:66 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:68 #, python-format msgid "" "If you are that person but you've lost your verification email, you can log in and resend it." msgstr "" +"Si c'est de vous qu'il s'agit, mais que vous avez perdu l'e-mail de " +"vérification, vous pouvez vous identifier et " +"le renvoyer." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:76 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:78 #, python-format msgid "%(username)s's profile" -msgstr "" +msgstr "profil de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:84 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:86 msgid "Edit profile" -msgstr "" +msgstr "Modifier le profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:98 #, python-format msgid "View all of %(username)s's media" +msgstr "Voir tous les médias de %(username)s" + +#: mediagoblin/user_pages/forms.py:24 +msgid "Comment" msgstr "" diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo index 04fe0b6ffde34b7eabe97b8ea9784f123e96795b..0d4b463c06c1faaaa3a5aa4b0870e2983abf2847 100644 GIT binary patch delta 1195 zcmYMyOGs2<6u|N0IF{yP@{zrKe3%85X)~J7AW;{k6qOQKXxx~aQ#qr|Obd%}5f!>A z5ECK@#Dr>*bSpt9EPHJV!Uo#dE<$J#gssB*AG^>nbAR7==iYP9cfK#NV`1mummKe? z@Y%<&fM1?RXa7GLUXgsJnOK3PxCcA16^Gq<0+X4ir--aVAFjrHT#H4RgB9+)2{(xh zN;`uL{)pguyog0Of|>XTi7m6}!`FBT6F7kFWIKfKu?Y*vx(-ibE}lm%Xb5>lZlK1! zi8G^XM^)Bqnbgx_!@9_G(tJd0ZJFlu3Acnoi28U938CMHe9j}5M2)I#oH z7EWRY`Q-@%E#M_;zI#pd!P7{sat$}*b<~zWz#4px z4fqQ;U?83TcQa^XKn}T&`od#eND_IAdCc$9uX3EhT3p0dEMXZ{7)I^LIO+-?qQ-lQ zTHq||0zV|&v&u|I%qeFCE;cuj7 zsmc~9#75Lkb-VVUuDl=hxuIv)I3wJGlTBnmHWU4+|C0D)I$E?ZY*IRG;up>;!Y%&^q?Nf z3#fa43k{AVwaXmVVFD}B$H~^i-OQy6vpX4RMboH<=7qDE>`O`shwVt*S@It7R`f-q z17#*2vf{=LTW5NW6%0o0Sj>d1n6Y}JwiO&Or))c7;?_Ak;xwl@o>YIO@z>Q?)r>5s zn^b?b@mJOd0?xLKYEN2Q-%4;R>YT`W<25b3Xz%Lpi^Z*#uuSJBq9$qwEsfaY6z0}? F{sOyfl7IjJ delta 1079 zcmYMyOGs2v9LMp$<24^mlR7<*%1BsYpMGvAE83{w7Mh`-$rZyE3 zNJJn}FiqpV)|wW0t}scH%j&KZg8b-*E}fVl~cTEtZ!p_Cpw=A4R`e z-r8xbX5b)h!1K5a?;&$-7?mzxDKiwdL%nPNHAy8Wnt zu3$i; zDT6kMc*Z?YS3ITh{Fq3zeh3idc&qkGG~050CoY bidfohO0~vf#hd;ezT(@!JEu4jO#1!-Hau!s diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index 311c5656..23605892 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n" -"POT-Creation-Date: 2011-08-08 22:53-0500\n" -"PO-Revision-Date: 2011-08-09 15:00+0000\n" +"POT-Creation-Date: 2011-08-13 19:47-0500\n" +"PO-Revision-Date: 2011-08-16 13:22+0000\n" "Last-Translator: joar \n" "Language-Team: Swedish (http://www.transifex.net/projects/p/mediagoblin/team/sv/)\n" "MIME-Version: 1.0\n" @@ -42,11 +42,15 @@ msgstr "E-postadress" msgid "Sorry, registration is disabled on this instance." msgstr "Vi beklagar, registreringen är avtängd på den här instansen." -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:57 msgid "Sorry, a user with that name already exists." msgstr "En användare med det användarnamnet finns redan." -#: mediagoblin/auth/views.py:152 +#: mediagoblin/auth/views.py:61 +msgid "Sorry, that email address has already been taken." +msgstr "Den e-postadressen är redan tagen." + +#: mediagoblin/auth/views.py:159 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" @@ -54,16 +58,16 @@ msgstr "" "Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och " "ladda upp filer!" -#: mediagoblin/auth/views.py:158 +#: mediagoblin/auth/views.py:165 msgid "The verification key or user id is incorrect" msgstr "Verifieringsnyckeln eller användar-IDt är fel." -#: mediagoblin/auth/views.py:179 +#: mediagoblin/auth/views.py:186 #: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22 msgid "Resent your verification email." msgstr "Skickade ett nytt verifierings-email." -#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26 +#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:27 msgid "Title" msgstr "Titel" @@ -103,19 +107,19 @@ msgstr "Var försiktig, du redigerar någon annans inlägg." msgid "You are editing a user's profile. Proceed with caution." msgstr "Var försiktig, du redigerar en annan användares profil." -#: mediagoblin/submit/forms.py:29 +#: mediagoblin/submit/forms.py:25 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:45 +#: mediagoblin/submit/views.py:46 msgid "You must provide a file." msgstr "Du måste ange en fil" -#: mediagoblin/submit/views.py:48 +#: mediagoblin/submit/views.py:49 msgid "The file doesn't seem to be an image!" msgstr "Filen verkar inte vara en giltig bildfil!" -#: mediagoblin/submit/views.py:96 +#: mediagoblin/submit/views.py:94 msgid "Woohoo! Submitted!" msgstr "Tjohoo! Upladdat!" @@ -147,20 +151,20 @@ msgstr "" "Drivs av MediaGoblin, ett GNU-projekt" -#: mediagoblin/templates/mediagoblin/root.html:21 +#: mediagoblin/templates/mediagoblin/root.html:23 msgid "Welcome to GNU MediaGoblin!" msgstr "Välkommen till GNU MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "Submit an item" msgstr "Ladda upp" -#: mediagoblin/templates/mediagoblin/root.html:31 +#: mediagoblin/templates/mediagoblin/root.html:33 #, python-format msgid "If you have an account, you can Login." msgstr "Har du ett konto? Logga in." -#: mediagoblin/templates/mediagoblin/root.html:37 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "If you don't have an account, please %(username)s's media" msgstr "%(username)ss media" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:30 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:32 msgid "Sorry, no such user found." msgstr "Finns ingen sådan användare ännu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:37 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:59 msgid "Verification needed" msgstr "Verifiering krävs" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:42 msgid "Almost done! Your account still needs to be verified." msgstr "Nästan klart! Nu behöver du bara verifiera ditt konto." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:47 msgid "" "An email should arrive in a few moments with instructions on how to do so." msgstr "" "Ett e-postmeddelande med instruktioner kommer att hamna hos dig inom kort." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:49 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:51 msgid "In case it doesn't:" msgstr "Om det inte skulle göra det:" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:54 msgid "Resend verification email" msgstr "Skicka ett nytt e-postmeddelande" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:60 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 msgid "" "Someone has registered an account with this username, but it still has to be" " verified." @@ -284,7 +288,7 @@ msgstr "" "Det finns redan ett konto med det här användarnamnet, men det behöver " "verifieras." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:66 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:68 #, python-format msgid "" "If you are that person but you've lost your verification email, you can logga in och begära ett nytt." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:76 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:78 #, python-format msgid "%(username)s's profile" msgstr "%(username)ss profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:84 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:86 msgid "Edit profile" msgstr "Redigera profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:98 #, python-format msgid "View all of %(username)s's media" msgstr "Se all media från %(username)s" +#: mediagoblin/user_pages/forms.py:24 +msgid "Comment" +msgstr "Kommentar" + From 745961104aabb962fb7dada2ec11f6903cc19abe Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 16 Aug 2011 23:24:07 +0200 Subject: [PATCH 03/17] Small changes to media.html: changed order of uploader/date and description, added css classes --- .../templates/mediagoblin/user_pages/media.html | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 9c0a1cca..e1175fc4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -28,16 +28,10 @@ src="{{ request.app.public_store.file_url( media.get_display_media(media.media_files)) }}" /> - -

+

{{media.title}}

- - {% autoescape False %} -

{{ media.description_html }}

- {% endautoescape %} - -

+

{% trans date="%4d-%02d-%02d"|format( media.created.year, media.created.month, media.created.day), @@ -45,11 +39,13 @@ 'mediagoblin.user_pages.user_home', user=media.uploader().username), username=media.uploader().username -%} - — uploaded on {{ date }} by {{ username }} + Uploaded on {{ date }} by {{ username }} {%- endtrans %}

+ {% autoescape False %} +

{{ media.description_html }}

+ {% endautoescape %}
-

{% trans %}Comments{% endtrans %}

{% if request.user %}
{% block mediagoblin_logo %} - {% endblock %} {% if request.user and request.user['status'] == 'active' %} From 9ecf7cd17c339d5f293cf9868c66e54c9e9b5010 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 18 Aug 2011 15:18:54 +0200 Subject: [PATCH 05/17] Whole bunch of changes to base.css --- mediagoblin/static/css/base.css | 42 ++++++++++++++--------------- mediagoblin/static/images/logo.png | Bin 839 -> 0 bytes 2 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 mediagoblin/static/images/logo.png diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 59c2f49d..b15a08d7 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -14,19 +14,9 @@ form { padding: 0px; } -/* Carter One font */ - -@font-face { - font-family: 'Carter One'; - font-style: normal; - font-weight: normal; - src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff'); -} - /* text styles */ h1{ - font-family: 'Carter One',arial,serif; margin-bottom: 15px; margin-top: 15px; color: #fff; @@ -39,12 +29,12 @@ h2{ } h3{ - border-bottom: 1px solid #222; + border-bottom: 1px solid #333; font-size: 18px; } a { - color: #999; + color: #86D4B1; } a.highlight { @@ -66,7 +56,12 @@ label { height: 36px; padding-top: 14px; margin-bottom: 20px; - border-bottom: 1px solid #222222; + border-bottom: 1px solid #333; +} + +a.mediagoblin_logo{ + color:#fff; + font-weight:bold; } .header_submit{ @@ -79,17 +74,16 @@ label { background-image: -o-linear-gradient(top, #D2D2D2, #aaa); background-image: linear-gradient(top, #D2D2D2, #aaa); box-shadow: 0px 0px 4px #000; - border-radius: 5px 5px 5px 5px; + border-radius: 3px; margin: 8px; padding: 3px 8px; text-decoration: none; border: medium none; - font-family: 'Carter One',arial,serif; } .mediagoblin_footer { height: 30px; - border-top: 1px solid #222222; + border-top: 1px solid #333; bottom: 0px; padding-top: 8px; text-align: center; @@ -108,7 +102,6 @@ label { /* common website elements */ .button { - font-family: 'Carter One', arial, serif; height: 32px; min-width: 99px; background-color: #86d4b1; @@ -119,7 +112,7 @@ label { background-image: -o-linear-gradient(top, #86d4b1, #62caa2); background-image: linear-gradient(top, #86d4b1, #62caa2); box-shadow: 0px 0px 4px #000; - border-radius: 5px; + border-radius: 3px; border: none; color: #272727; margin: 10px 0px 10px 15px; @@ -214,10 +207,18 @@ text-align: center; /* media detail */ -.media_image_container { +.media_image_container{ text-align: center; } +h2.media_title{ + margin-bottom:0px; +} + +p.media_uploader{ + font-size:0.9em; +} + /* icons */ img.media_icon{ @@ -232,10 +233,9 @@ img.media_icon{ display: block; float: left; text-align: center; - background-color: #222; + background-color: #333; text-decoration: none; padding: 12px 0pt; - font-family: 'Carter One', arial, serif; font-size: 2em; margin: 0 0 20px } diff --git a/mediagoblin/static/images/logo.png b/mediagoblin/static/images/logo.png deleted file mode 100644 index cf28a6d4118a823c937235335ac6e03cee5f1df3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01egv01egwkZ*aM00007bV*G`2ipe- z4L30gxPk5f00PHJL_t(Y$HiB{Zqq;zeKWReJ5ETOmKIcT=Ti`0z?mb0FG1>sKj=^N zAGmVkhCnDuNkd5-+i`Xu2kah!e7>0kFg@a8-YwevJF-ejPABYM* zfQ};~eXVp?Y6ew)|5>Kf=|RJGziu+FhovS(&Oj)G!Q>8%nqD*m|}lHO4FYsWZP(G*oNtNmJ{6 zC?F(VesTbrlI%4^#8tW{TLKxa0CD-b0ss{eXIWWmFC754`jcFJ5fM3T1VZwlfkc~t z>^1#njnqF@ZjYLP_^NvBs_!riZvn}&?ATR?m6QNx045|q-__nlcly2iRN3@`0Q)zJ0SRlduJ0O&d#wz4eyP|c(PfS6<=B5eQ(fOfTNJ*s%M?5^9)I3&k4 zkVlSZdLr_64gG^pXLUrhAtL`pthGxZ`#T<-ztpL@@3=LuR@8U%p>P?9W3me$&ZF=pQBbZRH%edp9| Date: Thu, 18 Aug 2011 15:22:40 +0200 Subject: [PATCH 06/17] Remove space at end of MediaGoblin logo link --- mediagoblin/templates/mediagoblin/base.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 39428897..f46871c6 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -41,8 +41,7 @@ {% block mediagoblin_logo %} + alt="{% trans %}MediaGoblin logo{% endtrans %}" /> {% endblock %} {% if request.user and request.user['status'] == 'active' %} Date: Thu, 18 Aug 2011 15:26:00 +0200 Subject: [PATCH 07/17] No longer center small images --- mediagoblin/static/css/base.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index b15a08d7..1f64eadf 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -207,10 +207,6 @@ text-align: center; /* media detail */ -.media_image_container{ - text-align: center; -} - h2.media_title{ margin-bottom:0px; } From 1f5a55f667bdb497d7baa9a13806f043799d66aa Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 18 Aug 2011 15:53:52 +0200 Subject: [PATCH 08/17] Replace the Feed icon with a transparent one, put it next to the [atom feed] links --- mediagoblin/static/images/icon_feed.png | Bin 522 -> 378 bytes .../templates/mediagoblin/listings/tag.html | 5 +++-- .../templates/mediagoblin/user_pages/user.html | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mediagoblin/static/images/icon_feed.png b/mediagoblin/static/images/icon_feed.png index 11e5b1e76b8e0e6c357a58e8ff018b170b5cec68..81889473b4950247497dca8fe000058c63cffa3c 100644 GIT binary patch delta 305 zcmV-10nYx41o{GyHwgd$0002_L%V;GKp%ey5)CXehjTmR0002`NklDdTs=!kqZIpChM<=xbw6Sk3BM}|Uc#QJW3?-Y_9FhC zu!BtST&Zo6k{<#)PS{oL1)X}CNN&@C)4(2!hE{vfC6dp;`ky*42?oGM@waQhDEw&} z8h~**2!rG|$=?ZkUF6?{oh(Lav56h5sNc)#mnScNJcLxzsp6973ivARy=P40UhUa;zTCHN+Hh)>Z?=zdtFrp|@wrzjo zx-Nx6K_`S^i0irx27_No%y{#)7$BR?((QH`4u`)g(F$s{8u@%4%d)U6i%ce?lWw;g zrBVsQFi=W8DbNJ3tKDwX>2ydW5*mBW^L-zpC{iM#-Mw5cYC4@N5m6$dmdm9+3&T+3 zagF(UvuT=CDi!AQIrVy-X0u5U1OR`eQmHpnHNkj1CI|u^j|TwhbedkThvPUj8V&CE zI{?LEkyfkq$q={jHFmq5mVG*%l!&N)zpt^w;hR07*qoM6N<$f@^KZTmS$7 diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index a43355a7..d047096b 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -38,8 +38,9 @@
- {%- trans %}atom feed{% endtrans -%} + tag=tag_slug) }}" + >{%- trans %}atom feed{% endtrans -%}
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 4649c8c7..ce6415d7 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -100,8 +100,9 @@

- {%- trans %}atom feed{% endtrans -%} + user=user.username) }}" + >{%- trans %}atom feed{% endtrans -%}
From a97e5bb22c81bf90ab8f49ea1a7edb9a037914fb Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 18 Aug 2011 17:29:38 +0200 Subject: [PATCH 09/17] Fix text sizes (use relative values), remove some unnecessary text sizes, add some spaces here and there --- mediagoblin/static/css/base.css | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 1f64eadf..272a6aee 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -20,7 +20,7 @@ h1{ margin-bottom: 15px; margin-top: 15px; color: #fff; - font-size: 30px; + font-size: 1.875em; } h2{ @@ -30,7 +30,7 @@ h2{ h3{ border-bottom: 1px solid #333; - font-size: 18px; + font-size: 1.125em; } a { @@ -60,8 +60,8 @@ label { } a.mediagoblin_logo{ - color:#fff; - font-weight:bold; + color: #fff; + font-weight: bold; } .header_submit{ @@ -87,7 +87,7 @@ a.mediagoblin_logo{ bottom: 0px; padding-top: 8px; text-align: center; - font-size: 14px; + font-size: 0.8125em; color: #999; } @@ -116,7 +116,6 @@ a.mediagoblin_logo{ border: none; color: #272727; margin: 10px 0px 10px 15px; - font-size: 1em; text-align: center; padding-left: 11px; padding-right: 11px; @@ -137,7 +136,6 @@ text-align: center; background-color: #222; background-image: url("../images/background_lines.png"); background-repeat: repeat-x; - font-size: 18px; padding-bottom: 30px; padding-top: 30px; margin-left: auto; @@ -150,13 +148,8 @@ text-align: center; background-image: url("../images/background_edit.png"); } -.form_box h1 { - font-size: 28px; -} - .form_field_input input, .form_field_input textarea { width: 100%; - font-size: 18px; } .form_field_box { @@ -171,7 +164,6 @@ text-align: center; background-color: #87453b; color: #fff; border: none; - font-size: 16px; padding: 9px; margin-top: 8px; margin-bottom: 8px; @@ -186,7 +178,7 @@ text-align: center; .comment_author { margin-bottom: 40px; padding-top: 4px; - font-size: 14px; + font-size: 0.9em; } .comment_content p { @@ -208,11 +200,11 @@ text-align: center; /* media detail */ h2.media_title{ - margin-bottom:0px; + margin-bottom: 0px; } p.media_uploader{ - font-size:0.9em; + font-size: 0.9em; } /* icons */ From 1d03221d0448903aad17180b0fac0ee73c32204b Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 18 Aug 2011 18:17:53 +0200 Subject: [PATCH 10/17] Added empty_space class for user profile placeholders --- mediagoblin/static/css/base.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 272a6aee..2293ea50 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -79,6 +79,7 @@ a.mediagoblin_logo{ padding: 3px 8px; text-decoration: none; border: medium none; + font-style: normal; } .mediagoblin_footer { @@ -130,6 +131,14 @@ text-align: center; margin: 5px; } +.empty_space{ + background-color: #222; + font-style: italic; + text-align: center; + height: 160px; + padding-top: 70px; +} + /* forms */ .form_box { From 3617ff4acf108bc1d90c6181e51c67dcb4fc44f0 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 19:17:14 -0500 Subject: [PATCH 11/17] From Jef van Schendel: "here's a spot to tell others about yourself" This should display if the user is logged in and they don't have anything in their profile yet. --- .../mediagoblin/user_pages/user.html | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index ce6415d7..f189ed94 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -78,15 +78,29 @@ {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} -
- {% include "mediagoblin/utils/profile.html" %} - {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} + {% if request.user['_id'] == user['_id'] + and not user['url'] and not user['profile'] %} +
+

+ {% trans %}Here's a spot to tell others about yourself.{% endtrans %} +

+ user.username }}" + class="header_submit"> {%- trans %}Edit profile{% endtrans -%} - {% endif %} -
+
+ {% else %} +
+ {% include "mediagoblin/utils/profile.html" %} + {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} + + {%- trans %}Edit profile{% endtrans -%} + + {% endif %} +
+ {% endif %}
{{ object_gallery(request, media_entries, pagination, From 66a65c9c4c8ef08a7a8ab7935259c749fa7b9d51 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 19:57:24 -0500 Subject: [PATCH 12/17] Switch "atom feed" to "Atom feed" and made the icons and text separate links Before doing the latter there was an ugly underline spanning the icon and the text. --- mediagoblin/templates/mediagoblin/listings/tag.html | 12 +++++++----- .../templates/mediagoblin/user_pages/gallery.html | 13 ++++++++----- .../templates/mediagoblin/user_pages/user.html | 11 +++++++---- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index d047096b..f36f3df4 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -36,11 +36,13 @@
- {%- trans %}atom feed{% endtrans -%} + {% set feed_url = request.urlgen( + 'mediagoblin.listings.tag_atom_feed', + tag=tag_slug) %} + + + {%- trans %}Atom feed{% endtrans -%}
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index ff935ac4..6acee9ef 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -37,16 +37,19 @@ {%- endtrans %} -
{{ object_gallery(request, media_entries, pagination) }}
+
- - {%- trans %}atom feed{% endtrans -%} + {% set feed_url = request.urlgen( + 'mediagoblin.user_pages.atom_feed', + user=user.username) %} + + + {%- trans %}Atom feed{% endtrans -%}
{% else %} {# This *should* not occur as the view makes sure we pass in a user. #} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index f189ed94..56f6503c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -113,11 +113,14 @@ View all of {{ username }}'s media{% endtrans -%}

- {%- trans %}atom feed{% endtrans -%} + {% set feed_url = request.urlgen( + 'mediagoblin.user_pages.atom_feed', + user=user.username) %} + + + {%- trans %}Atom feed{% endtrans -%}
From 6890822cce835b132fb9e7bd2f7747de5bcb7716 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 19:57:49 -0500 Subject: [PATCH 13/17] Added an alt tag to the feed icons. Accessibility! Woo! --- mediagoblin/templates/mediagoblin/listings/tag.html | 2 +- mediagoblin/templates/mediagoblin/user_pages/gallery.html | 2 +- mediagoblin/templates/mediagoblin/user_pages/user.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index f36f3df4..bf2b4c01 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -41,7 +41,7 @@ tag=tag_slug) %} + class="media_icon" alt="{% trans %}feed icon{% endtrans %} /> {%- trans %}Atom feed{% endtrans -%} diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index 6acee9ef..e54422da 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -47,7 +47,7 @@ user=user.username) %} + class="media_icon" alt="{% trans %}feed icon{% endtrans %}" /> {%- trans %}Atom feed{% endtrans -%} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 56f6503c..1a9a0f83 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -118,7 +118,7 @@ user=user.username) %} + class="media_icon" alt="{% trans %}feed icon{% endtrans %}" /> {%- trans %}Atom feed{% endtrans -%} From 293a7fe4118151ff27153a324d27a554c6c0fc8b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 21:16:50 -0500 Subject: [PATCH 14/17] Give a message if the user hasn't filled in their profile yet. --- .../mediagoblin/user_pages/user.html | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 1a9a0f83..00d25464 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -78,18 +78,27 @@ {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} - {% if request.user['_id'] == user['_id'] - and not user['url'] and not user['profile'] %} -
-

- {% trans %}Here's a spot to tell others about yourself.{% endtrans %} -

- - {%- trans %}Edit profile{% endtrans -%} - -
+ {% if not user['url'] and not user['profile'] %} + {% if request.user['_id'] == user['_id'] %} +
+

+ {% trans %}Here's a spot to tell others about yourself.{% endtrans %} +

+ + {%- trans %}Edit profile{% endtrans -%} + +
+ {% else %} +
+

+ {% trans -%} + This user hasn't filled in their profile (yet). + {%- endtrans %} +

+
+ {% endif %} {% else %}
{% include "mediagoblin/utils/profile.html" %} From 0ddea95ea60c2ef61f771c64afb94357d3e005ec Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 21:23:06 -0500 Subject: [PATCH 15/17] More useful messages about when stuff isn't there on a user's homepage. --- .../mediagoblin/user_pages/user.html | 63 +++++++++++++------ 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 00d25464..02e6fdc2 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -111,27 +111,50 @@
{% endif %} -
- {{ object_gallery(request, media_entries, pagination, - pagination_base_url=user_gallery_url, col_number=3) }} - {% include "mediagoblin/utils/object_gallery.html" %} -
-

- - {% trans username=user.username -%} - View all of {{ username }}'s media{% endtrans -%} + {% if media_entries.count() %} +

+ {{ object_gallery(request, media_entries, pagination, + pagination_base_url=user_gallery_url, col_number=3) }} + {% include "mediagoblin/utils/object_gallery.html" %} +
+

+ + {% trans username=user.username -%} + View all of {{ username }}'s media{% endtrans -%} + +

+ {% set feed_url = request.urlgen( + 'mediagoblin.user_pages.atom_feed', + user=user.username) %} + + {% trans %}feed icon{% endtrans %} -

- {% set feed_url = request.urlgen( - 'mediagoblin.user_pages.atom_feed', - user=user.username) %} - - {% trans %}feed icon{% endtrans %} - - {%- trans %}Atom feed{% endtrans -%} -
- + {%- trans %}Atom feed{% endtrans -%} +
+ {% else %} + {% if request.user['_id'] == user['_id'] %} +
+

+ {% trans -%} + This is where your media will appear, but you don't seem to have added anything yet. + {%- endtrans %} +

+ + {%- trans %}Add media{% endtrans -%} + +
+ {% else %} +
+

+ {% trans -%} + There doesn't seem to be any media here yet... + {%- endtrans %} +

+
+ {% endif %} + {% endif %}
{% endif %} {% endblock %} From 5b21ecf9db4c1618066142b77aaa750d1333a1d7 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 21:28:00 -0500 Subject: [PATCH 16/17] Feed link, as an includable template! --- .../templates/mediagoblin/listings/tag.html | 6 +---- .../mediagoblin/user_pages/gallery.html | 6 +---- .../mediagoblin/user_pages/user.html | 6 +---- .../mediagoblin/utils/feed_link.html | 23 +++++++++++++++++++ 4 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 mediagoblin/templates/mediagoblin/utils/feed_link.html diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index bf2b4c01..289f44b8 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -39,10 +39,6 @@ {% set feed_url = request.urlgen( 'mediagoblin.listings.tag_atom_feed', tag=tag_slug) %} - - {% trans %}feed icon{% endtrans %} /> - </a> - <a href={%- trans %}Atom feed{% endtrans -%} + {% include "mediagoblin/utils/feed_link.html" %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index e54422da..3a3d2373 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -45,11 +45,7 @@ {% set feed_url = request.urlgen( 'mediagoblin.user_pages.atom_feed', user=user.username) %} - - {% trans %}feed icon{% endtrans %} - - {%- trans %}Atom feed{% endtrans -%} + {% include "mediagoblin/utils/feed_link.html" %} {% else %} {# This *should* not occur as the view makes sure we pass in a user. #} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 02e6fdc2..0214082c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -126,11 +126,7 @@ {% set feed_url = request.urlgen( 'mediagoblin.user_pages.atom_feed', user=user.username) %} - - {% trans %}feed icon{% endtrans %} - - {%- trans %}Atom feed{% endtrans -%} + {% include "mediagoblin/utils/feed_link.html" %} {% else %} {% if request.user['_id'] == user['_id'] %} diff --git a/mediagoblin/templates/mediagoblin/utils/feed_link.html b/mediagoblin/templates/mediagoblin/utils/feed_link.html new file mode 100644 index 00000000..c4036bf3 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/utils/feed_link.html @@ -0,0 +1,23 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011 Free Software Foundation, Inc +# +# 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 . +#} + + + {% trans %}feed icon{% endtrans %} + +{%- trans %}Atom feed{% endtrans -%} From b5017dbac8ad9e8afd70d2d2281571e0155c3739 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 18 Aug 2011 22:00:55 -0500 Subject: [PATCH 17/17] Switch the grid over to using a... erk... table! :) Also changes the gridification routine a bit. --- mediagoblin/static/css/base.css | 1 - .../mediagoblin/utils/object_gallery.html | 51 +++++++------------ mediagoblin/util.py | 32 ++++++++++++ 3 files changed, 49 insertions(+), 35 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 2293ea50..83f5357c 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -199,7 +199,6 @@ text-align: center; .media_thumbnail { padding: 0px; width: 180px; - height: 180px; overflow: hidden; float: left; margin: 0px 4px 10px 4px; diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index c7286678..b451946d 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -18,44 +18,27 @@ {% from "mediagoblin/utils/pagination.html" import render_pagination %} -{% macro media_grid(request, media_list, col_number=5) %} - {% set num_items = media_list.count() %} - {% set col_counter = 0 %} - {% set row_counter = 0 %} - {% set item_counter = 0 %} - - {% set num_rows = num_items // col_number %} - {% if num_items % col_number != 0 %} - {% set num_rows = num_rows + 1 %} - {% endif %} - -
- {% for entry in media_list %} - {% if col_counter == 0 %} -
- {% endif %} - -
+{% macro media_grid(request, media_entries, col_number=5) %} + + {% for row in gridify_cursor(media_entries, col_number) %} + + {% for entry in row %} + + {% endfor %} + {% endfor %} - +
- - - - {% if col_number == col_counter + 1 or num_items == item_counter + 1 %} - - {% set row_counter = row_counter + 1 %} - {% endif %} - - {% set item_counter = item_counter + 1 %} - {% set col_counter = col_counter + 1 %} - {% if col_counter == col_number %} - {% set col_counter = 0 %} - {% endif %} + + +
{%- endmacro %} - {# Render a media gallery with pagination. diff --git a/mediagoblin/util.py b/mediagoblin/util.py index b46c65d9..cc426228 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -100,7 +100,10 @@ def get_jinja_env(template_loader, locale): # All templates will know how to ... # ... fetch all waiting messages and remove them from the queue + # ... construct a grid of thumbnails or other media template_env.globals['fetch_messages'] = messages.fetch_messages + template_env.globals['gridify_list'] = gridify_list + template_env.globals['gridify_cursor'] = gridify_cursor if exists(locale): SETUP_JINJA_ENVS[locale] = template_env @@ -628,3 +631,32 @@ class Pagination(object): """ return self.get_page_url_explicit( request.path_info, request.GET, page_no) + + +def gridify_list(this_list, num_cols=5): + """ + Generates a list of lists where each sub-list's length depends on + the number of columns in the list + """ + grid = [] + + # Figure out how many rows we should have + num_rows = int(ceil(float(len(this_list)) / num_cols)) + + for row_num in range(num_rows): + slice_min = row_num * num_cols + slice_max = (row_num + 1) * num_cols + + row = this_list[slice_min:slice_max] + + grid.append(row) + + return grid + + +def gridify_cursor(this_cursor, num_cols=5): + """ + Generates a list of lists where each sub-list's length depends on + the number of columns in the list + """ + return gridify_list(list(this_cursor), num_cols)