- galaxy-dev - lists.galaxyproject.org

[hg] galaxy 1740: Fixes for wormbase tools, use post as http met...
by Greg Von Kuster 20 Mar '09

20 Mar '09

details: http://www.bx.psu.edu/hg/galaxy/rev/a5a995ca3abc changeset: 1740:a5a995ca3abc user: Greg Von Kuster <greg(a)bx.psu.edu> date: Thu Mar 19 21:41:06 2009 -0400 description: Fixes for wormbase tools, use post as http method rather than get. 3 file(s) affected in this change: tools/data_source/wormbase.xml tools/data_source/wormbase_test.xml universe_wsgi.ini.sample diffs (32 lines): diff -r dc62ee52012e -r a5a995ca3abc tools/data_source/wormbase.xml --- a/tools/data_source/wormbase.xml Tue Mar 17 22:46:47 2009 -0400 +++ b/tools/data_source/wormbase.xml Thu Mar 19 21:41:06 2009 -0400 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool name="Wormbase" id="wormbase" tool_type="data_source" URL_method="get"> +<tool name="Wormbase" id="wormbase" tool_type="data_source" URL_method="post"> <description>server</description> <command interpreter="python">data_source.py $output</command> <inputs action="http://www.wormbase.org/db/seq/gbrowse/c_elegans/" check_values="false" method="get" target="_top"> diff -r dc62ee52012e -r a5a995ca3abc tools/data_source/wormbase_test.xml --- a/tools/data_source/wormbase_test.xml Tue Mar 17 22:46:47 2009 -0400 +++ b/tools/data_source/wormbase_test.xml Thu Mar 19 21:41:06 2009 -0400 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tool name="Wormbase" id="wormbase_test" tool_type="data_source" URL_method="get"> +<tool name="Wormbase" id="wormbase_test" tool_type="data_source" URL_method="post"> <description>test server</description> <command interpreter="python">data_source.py $output</command> <inputs action="http://dev.wormbase.org/db/seq/gbrowse/c_elegans/" check_values="false" method="get" target="_top"> diff -r dc62ee52012e -r a5a995ca3abc universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample Tue Mar 17 22:46:47 2009 -0400 +++ b/universe_wsgi.ini.sample Thu Mar 19 21:41:06 2009 -0400 @@ -115,7 +115,7 @@ # Comma separated list of UCSC / gbrowse browsers to use for viewing ucsc_display_sites = main,test,archaea -gbrowse_display_sites = elegans,flybase +gbrowse_display_sites = c_elegans,c_briggsae,c_remanei,c_brenneri,c_japonica,p_pristionchus,b_malayi # Serving static files (needed if running standalone) static_enabled = True

1 0

[hg] galaxy 1739: Integrating i18n support provided by Mitsuteru...
by Greg Von Kuster 17 Mar '09

17 Mar '09

details: http://www.bx.psu.edu/hg/galaxy/rev/dc62ee52012e changeset: 1739:dc62ee52012e user: Greg Von Kuster <greg(a)bx.psu.edu> date: Tue Mar 17 22:46:47 2009 -0400 description: Integrating i18n support provided by Mitsuteru Nakao, Takashi Hatakeyama, and Hideyuki Morita. 33 file(s) affected in this change: eggs.ini lib/galaxy/config.py lib/galaxy/web/framework/__init__.py locale/en/LC_MESSAGES/ginga.mo locale/en/LC_MESSAGES/ginga.po locale/en/LC_MESSAGES/tools.mo locale/en/LC_MESSAGES/tools.po locale/ginga.pot locale/ja/LC_MESSAGES/ginga.mo locale/ja/LC_MESSAGES/ginga.po locale/ja/LC_MESSAGES/tools.mo locale/ja/LC_MESSAGES/tools.po locale/tools.pot scripts/paster.py templates/admin_main.mako templates/base.mako templates/base_panels.mako templates/dataset/edit_attributes.mako templates/form.mako templates/history/list.mako templates/history/options.mako templates/history/rename.mako templates/history/share.mako templates/message.mako templates/root/history.mako templates/root/history_as_xml.mako templates/root/history_common.mako templates/root/index.mako templates/root/masthead.mako templates/root/tool_menu.mako templates/user/index.mako templates/workflow/build_from_current_history.mako test/functional/__init__.py diffs (2471 lines): diff -r ab1b5bd846bc -r dc62ee52012e eggs.ini --- a/eggs.ini Sun Mar 08 14:25:19 2009 -0400 +++ b/eggs.ini Tue Mar 17 22:46:47 2009 -0400 @@ -47,6 +47,7 @@ WebHelpers = 0.2 WebOb = 0.8.5 wsgiref = 0.1.2 +Babel = 0.9.4 ; extra version information [tags] @@ -92,3 +93,4 @@ WebHelpers = http://pypi.python.org/packages/source/W/WebHelpers/WebHelpers-0.2.tar.gz WebOb = http://pypi.python.org/packages/source/W/WebOb/WebOb-0.8.5.tar.gz wsgiref = http://pypi.python.org/packages/source/w/wsgiref/wsgiref-0.1.2.zip +Babel = http://ftp.edgewall.com/pub/babel/Babel-0.9.4.zip diff -r ab1b5bd846bc -r dc62ee52012e lib/galaxy/config.py --- a/lib/galaxy/config.py Sun Mar 08 14:25:19 2009 -0400 +++ b/lib/galaxy/config.py Tue Mar 17 22:46:47 2009 -0400 @@ -165,5 +165,3 @@ # Hook everything up handler.setFormatter( formatter ) root.addHandler( handler ) - - diff -r ab1b5bd846bc -r dc62ee52012e lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py Sun Mar 08 14:25:19 2009 -0400 +++ b/lib/galaxy/web/framework/__init__.py Tue Mar 17 22:46:47 2009 -0400 @@ -23,6 +23,9 @@ pkg_resources.require( "Mako" ) import mako.template import mako.lookup + +pkg_resources.require( "Babel" ) +from babel.support import Translations pkg_resources.require( "SQLAlchemy >= 0.4" ) from sqlalchemy import and_ @@ -110,6 +113,7 @@ self.__history = NOT_SET self.__galaxy_session = NOT_SET base.DefaultWebTransaction.__init__( self, environ ) + self.setup_i18n() self.sa_session.clear() self.debug = asbool( self.app.config.get( 'debug', False ) ) # Flag indicating whether we are in workflow building mode (means @@ -118,6 +122,16 @@ self.workflow_building_mode = False # Always have a valid galaxy session self.__ensure_valid_session( session_cookie ) + def setup_i18n( self ): + if 'HTTP_ACCEPT_LANGUAGE' in self.environ: + # locales looks something like: ['en', 'en-us;q=0.7', 'ja;q=0.3'] + locales = self.environ['HTTP_ACCEPT_LANGUAGE'].split( ',' ) + locales = [ l.split( ';' )[0] for l in locales ] + else: + # Default to English + locales = 'en' + t = Translations.load( dirname='locale', locales=locales, domain='ginga' ) + self.template_context.update ( dict( _=t.gettext, n_=t.gettext, N_=t.ngettext ) ) @property def sa_session( self ): """ diff -r ab1b5bd846bc -r dc62ee52012e locale/en/LC_MESSAGES/ginga.mo Binary file locale/en/LC_MESSAGES/ginga.mo has changed diff -r ab1b5bd846bc -r dc62ee52012e locale/en/LC_MESSAGES/ginga.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/en/LC_MESSAGES/ginga.po Tue Mar 17 22:46:47 2009 -0400 @@ -0,0 +1,299 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-21 18:33+0900\n" +"PO-Revision-Date: 2009-03-17 03:55-0400\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: en <LL(a)li.org>\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.4\n" + +#: templates/history/options.mako:17 +msgid " a new empty history" +msgstr "" + +#: templates/history/options.mako:22 templates/history/options.mako:24 +msgid " current history" +msgstr "" + +#: templates/history/options.mako:14 +#, python-format +msgid " current history (stored as \"%s\")" +msgstr "" + +#: templates/history/options.mako:20 +msgid " from the current history" +msgstr "" + +#: templates/history/options.mako:15 +msgid " previously stored histories" +msgstr "" + +#: templates/history/options.mako:8 +msgid " to store or switch histories." +msgstr "" + +#: templates/user/index.mako:9 templates/user/index.mako:11 +msgid "Account settings" +msgstr "" + +#: templates/root/masthead.mako:39 +msgid "Account: " +msgstr "" + +#: templates/admin_main.mako:16 +msgid "Admin password: " +msgstr "" + +#: templates/root/history_common.mako:41 +msgid "An error occurred running this job: " +msgstr "" + +#: templates/history/options.mako:24 +msgid "Are you sure you want to delete the current history?" +msgstr "" + +#: templates/user/index.mako:16 +msgid "Change your password" +msgstr "" + +#: templates/history/options.mako:20 +msgid "Construct workflow" +msgstr "" + +#: templates/history/options.mako:17 +msgid "Create" +msgstr "" + +#: templates/user/index.mako:24 +msgid "Create new account" +msgstr "" + +#: templates/history/rename.mako:9 +msgid "Current Name" +msgstr "" + +#: templates/history/options.mako:24 +msgid "Delete" +msgstr "" + +#: templates/history/share.mako:23 +msgid "Email of User to share with:" +msgstr "" + +#: templates/root/history_common.mako:76 +#, python-format +msgid "Error: unknown dataset state \"%s\"." +msgstr "" + +#: templates/admin_main.mako:2 templates/admin_main.mako:7 +msgid "Galaxy Administration" +msgstr "" + +#: templates/root/history.mako:12 +msgid "Galaxy History" +msgstr "" + +#: templates/root/tool_menu.mako:11 +msgid "Galaxy Tools" +msgstr "" + +#: templates/root/index.mako:34 +msgid "History" +msgstr "" + +#: templates/history/share.mako:8 +msgid "History Name:" +msgstr "" + +#: templates/history/options.mako:4 +msgid "History Options" +msgstr "" + +#: templates/root/history_common.mako:57 templates/root/masthead.mako:25 +msgid "Info: " +msgstr "" + +#: templates/root/history_common.mako:38 +msgid "Job is currently running" +msgstr "" + +#: templates/root/history_common.mako:36 +msgid "Job is waiting to run" +msgstr "" + +#: templates/history/options.mako:15 +msgid "List" +msgstr "" + +#: templates/root/masthead.mako:36 +#, python-format +msgid "Logged in as %s: " +msgstr "" + +#: templates/user/index.mako:23 +msgid "Login" +msgstr "" + +#: templates/user/index.mako:18 +msgid "Logout" +msgstr "" + +#: templates/root/tool_menu.mako:100 +msgid "Manage" +msgstr "" + +#: templates/history/rename.mako:9 +msgid "New Name" +msgstr "" + +#: templates/root/history_common.mako:45 +msgid "No data: " +msgstr "" + +#: templates/history/share.mako:8 +msgid "Number of Datasets:" +msgstr "" + +#: templates/root/index.mako:32 +msgid "Options" +msgstr "" + +#: templates/admin_main.mako:27 +msgid "Reload" +msgstr "" + +#: templates/admin_main.mako:18 +msgid "Reload tool: " +msgstr "" + +#: templates/history/options.mako:14 +msgid "Rename" +msgstr "" + +#: templates/history/rename.mako:2 templates/history/rename.mako:5 +msgid "Rename History" +msgstr "" + +#: templates/history/options.mako:22 +msgid "Share" +msgstr "" + +#: templates/history/share.mako:5 +msgid "Share Histories" +msgstr "" + +#: templates/history/share.mako:8 +msgid "Share Link" +msgstr "" + +#: templates/history/share.mako:2 +msgid "Share histories" +msgstr "" + +#: templates/history/share.mako:14 +msgid "This history contains no data." +msgstr "" + +#: templates/root/index.mako:5 +msgid "Tools" +msgstr "" + +#: templates/user/index.mako:17 +msgid "Update your email address" +msgstr "" + +#: templates/root/tool_menu.mako:95 +msgid "Workflow" +msgstr "" + +#: templates/user/index.mako:14 +#, python-format +msgid "You are currently logged in as %s." +msgstr "" + +#: templates/user/index.mako:21 +msgid "You are currently not logged in." +msgstr "" + +#: templates/root/history.mako:223 +msgid "You are currently viewing a deleted history!" +msgstr "" + +#: templates/history/options.mako:8 +msgid "You must be " +msgstr "" + +#: templates/root/history.mako:252 +msgid "Your history is empty. Click 'Get Data' on the left pane to start" +msgstr "" + +#: templates/root/masthead.mako:28 +msgid "blog" +msgstr "" + +#: templates/history/share.mako:20 +msgid "copy link to share" +msgstr "" + +#: templates/root/masthead.mako:39 +msgid "create" +msgstr "" + +#: templates/root/history_common.mako:50 +msgid "database: " +msgstr "" + +#: templates/root/history_common.mako:49 +msgid "format: " +msgstr "" + +#: templates/history/options.mako:8 +msgid "logged in" +msgstr "" + +#: templates/root/masthead.mako:40 +msgid "login" +msgstr "" + +#: templates/root/masthead.mako:37 +msgid "logout" +msgstr "" + +#: templates/root/masthead.mako:36 +msgid "manage" +msgstr "" + +#: templates/root/history.mako:218 +msgid "refresh" +msgstr "" + +#: templates/root/masthead.mako:25 +msgid "report bugs" +msgstr "" + +#: templates/root/history_common.mako:42 +msgid "report this error" +msgstr "" + +#: templates/root/masthead.mako:27 +msgid "screencasts" +msgstr "" + +#: templates/root/masthead.mako:26 +msgid "wiki" +msgstr "" + +#: templates/root/tool_menu.mako:100 +msgid "workflows" +msgstr "" + diff -r ab1b5bd846bc -r dc62ee52012e locale/en/LC_MESSAGES/tools.mo Binary file locale/en/LC_MESSAGES/tools.mo has changed diff -r ab1b5bd846bc -r dc62ee52012e locale/en/LC_MESSAGES/tools.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/en/LC_MESSAGES/tools.po Tue Mar 17 22:46:47 2009 -0400 @@ -0,0 +1,85 @@ +# English translations for PROJECT. +# Copyright (C) 2009 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2009-03-17 04:07-0400\n" +"PO-Revision-Date: 2009-03-17 04:07-0400\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: en <LL(a)li.org>\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.4\n" + +msgid "Get Data" +msgstr "" + +msgid "Get ENCODE Data" +msgstr "" + +msgid "ENCODE Tools" +msgstr "" + +msgid "Lift-Over" +msgstr "" + +msgid "Text Manipulation" +msgstr "" + +msgid "Filter and Sort" +msgstr "" + +msgid "Join, Subtract and Group" +msgstr "" + +msgid "Convert Formats" +msgstr "" + +msgid "Extract Features" +msgstr "" + +msgid "Fetch Sequences" +msgstr "" + +msgid "Fetch Alignments" +msgstr "" + +msgid "Get Genomic Scores" +msgstr "" + +msgid "Operate on Genomic Intervals" +msgstr "" + +msgid "Statistics" +msgstr "" + +msgid "Graph/Display Data" +msgstr "" + +msgid "Regional Variation" +msgstr "" + +msgid "Evolution: HyPhy" +msgstr "" + +msgid "Taxonomy manipulation" +msgstr "" + +msgid "Solexa tools" +msgstr "" + +msgid "FASTA manipulation" +msgstr "" + +msgid "Short Read QC and Manipulation" +msgstr "" + +msgid "Short Read Mapping" +msgstr "" + diff -r ab1b5bd846bc -r dc62ee52012e locale/ginga.pot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/ginga.pot Tue Mar 17 22:46:47 2009 -0400 @@ -0,0 +1,296 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-21 18:33+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: templates/history/options.mako:17 +msgid " a new empty history" +msgstr "" + +#: templates/history/options.mako:22 templates/history/options.mako:24 +msgid " current history" +msgstr "" + +#: templates/history/options.mako:14 +#, python-format +msgid " current history (stored as \"%s\")" +msgstr "" + +#: templates/history/options.mako:20 +msgid " from the current history" +msgstr "" + +#: templates/history/options.mako:15 +msgid " previously stored histories" +msgstr "" + +#: templates/history/options.mako:8 +msgid " to store or switch histories." +msgstr "" + +#: templates/user/index.mako:9 templates/user/index.mako:11 +msgid "Account settings" +msgstr "" + +#: templates/root/masthead.mako:39 +msgid "Account: " +msgstr "" + +#: templates/admin_main.mako:16 +msgid "Admin password: " +msgstr "" + +#: templates/root/history_common.mako:41 +msgid "An error occurred running this job: " +msgstr "" + +#: templates/history/options.mako:24 +msgid "Are you sure you want to delete the current history?" +msgstr "" + +#: templates/user/index.mako:16 +msgid "Change your password" +msgstr "" + +#: templates/history/options.mako:20 +msgid "Construct workflow" +msgstr "" + +#: templates/history/options.mako:17 +msgid "Create" +msgstr "" + +#: templates/user/index.mako:24 +msgid "Create new account" +msgstr "" + +#: templates/history/rename.mako:9 +msgid "Current Name" +msgstr "" + +#: templates/history/options.mako:24 +msgid "Delete" +msgstr "" + +#: templates/history/share.mako:23 +msgid "Email of User to share with:" +msgstr "" + +#: templates/root/history_common.mako:76 +#, python-format +msgid "Error: unknown dataset state \"%s\"." +msgstr "" + +#: templates/admin_main.mako:2 templates/admin_main.mako:7 +msgid "Galaxy Administration" +msgstr "" + +#: templates/root/history.mako:12 +msgid "Galaxy History" +msgstr "" + +#: templates/root/tool_menu.mako:11 +msgid "Galaxy Tools" +msgstr "" + +#: templates/root/index.mako:34 +msgid "History" +msgstr "" + +#: templates/history/share.mako:8 +msgid "History Name:" +msgstr "" + +#: templates/history/options.mako:4 +msgid "History Options" +msgstr "" + +#: templates/root/history_common.mako:57 templates/root/masthead.mako:25 +msgid "Info: " +msgstr "" + +#: templates/root/history_common.mako:38 +msgid "Job is currently running" +msgstr "" + +#: templates/root/history_common.mako:36 +msgid "Job is waiting to run" +msgstr "" + +#: templates/history/options.mako:15 +msgid "List" +msgstr "" + +#: templates/root/masthead.mako:36 +#, python-format +msgid "Logged in as %s: " +msgstr "" + +#: templates/user/index.mako:23 +msgid "Login" +msgstr "" + +#: templates/user/index.mako:18 +msgid "Logout" +msgstr "" + +#: templates/root/tool_menu.mako:100 +msgid "Manage" +msgstr "" + +#: templates/history/rename.mako:9 +msgid "New Name" +msgstr "" + +#: templates/root/history_common.mako:45 +msgid "No data: " +msgstr "" + +#: templates/history/share.mako:8 +msgid "Number of Datasets:" +msgstr "" + +#: templates/root/index.mako:32 +msgid "Options" +msgstr "" + +#: templates/admin_main.mako:27 +msgid "Reload" +msgstr "" + +#: templates/admin_main.mako:18 +msgid "Reload tool: " +msgstr "" + +#: templates/history/options.mako:14 +msgid "Rename" +msgstr "" + +#: templates/history/rename.mako:2 templates/history/rename.mako:5 +msgid "Rename History" +msgstr "" + +#: templates/history/options.mako:22 +msgid "Share" +msgstr "" + +#: templates/history/share.mako:5 +msgid "Share Histories" +msgstr "" + +#: templates/history/share.mako:8 +msgid "Share Link" +msgstr "" + +#: templates/history/share.mako:2 +msgid "Share histories" +msgstr "" + +#: templates/history/share.mako:14 +msgid "This history contains no data." +msgstr "" + +#: templates/root/index.mako:5 +msgid "Tools" +msgstr "" + +#: templates/user/index.mako:17 +msgid "Update your email address" +msgstr "" + +#: templates/root/tool_menu.mako:95 +msgid "Workflow" +msgstr "" + +#: templates/user/index.mako:14 +#, python-format +msgid "You are currently logged in as %s." +msgstr "" + +#: templates/user/index.mako:21 +msgid "You are currently not logged in." +msgstr "" + +#: templates/root/history.mako:223 +msgid "You are currently viewing a deleted history!" +msgstr "" + +#: templates/history/options.mako:8 +msgid "You must be " +msgstr "" + +#: templates/root/history.mako:252 +msgid "Your history is empty. Click 'Get Data' on the left pane to start" +msgstr "" + +#: templates/root/masthead.mako:28 +msgid "blog" +msgstr "" + +#: templates/history/share.mako:20 +msgid "copy link to share" +msgstr "" + +#: templates/root/masthead.mako:39 +msgid "create" +msgstr "" + +#: templates/root/history_common.mako:50 +msgid "database: " +msgstr "" + +#: templates/root/history_common.mako:49 +msgid "format: " +msgstr "" + +#: templates/history/options.mako:8 +msgid "logged in" +msgstr "" + +#: templates/root/masthead.mako:40 +msgid "login" +msgstr "" + +#: templates/root/masthead.mako:37 +msgid "logout" +msgstr "" + +#: templates/root/masthead.mako:36 +msgid "manage" +msgstr "" + +#: templates/root/history.mako:218 +msgid "refresh" +msgstr "" + +#: templates/root/masthead.mako:25 +msgid "report bugs" +msgstr "" + +#: templates/root/history_common.mako:42 +msgid "report this error" +msgstr "" + +#: templates/root/masthead.mako:27 +msgid "screencasts" +msgstr "" + +#: templates/root/masthead.mako:26 +msgid "wiki" +msgstr "" + +#: templates/root/tool_menu.mako:100 +msgid "workflows" +msgstr "" diff -r ab1b5bd846bc -r dc62ee52012e locale/ja/LC_MESSAGES/ginga.mo Binary file locale/ja/LC_MESSAGES/ginga.mo has changed diff -r ab1b5bd846bc -r dc62ee52012e locale/ja/LC_MESSAGES/ginga.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/ja/LC_MESSAGES/ginga.po Tue Mar 17 22:46:47 2009 -0400 @@ -0,0 +1,518 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: ginga 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-09-15 13:58+0900\n" +"PO-Revision-Date: 2008-09-21 19:13+0900\n" +"Last-Translator: Mitsuteru Nakao <mn(a)kazusa.or.jp>\n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: +msgid "iso-8859-1" +msgstr "utf-8" + +#: +msgid "lang=\"en\"" +msgstr "lang=\"ja\"" + + +#: templates/base_panels.mako:5 +msgid "Galaxy" +msgstr "Galaxy" + +#: templates/history/options.mako:24 +msgid "Are you sure you want to delete the current history?" +msgstr "現在のヒストリーを消すことに同意しますか？" + +#: templates/root/history.mako:38 +msgid "collapse all" +msgstr "すべてをおりたたむ" + +#: templates/root/index.mako:5 +msgid "Tools" +msgstr "ツール" + + + +#: tools/**.xml +msgid "Get Data" +msgstr "データ取得" + +msgid "Get ENCODE Data" +msgstr "ENCODEデータ取得" + +msgid "ENCODE Tools" +msgstr "ENCODEツール" + +msgid "Lift-Over" +msgstr "" + +msgid "Text Manipulation" +msgstr "テキスト操作" + +msgid "Filter and Sort" +msgstr "フィルターとソート" + +msgid "Join, Subtract and Group" +msgstr "結合、差分、集合演算" + +msgid "Convert Formats" +msgstr "フォーマット変換" + +msgid "Extract Features" +msgstr "Features抽出" + +msgid "Fetch Sequences" +msgstr "配列の取得" + +msgid "Fetch Alignments" +msgstr "アラインメントの取得" + +msgid "Get Genomic Scores" +msgstr "ゲノムスコア取得" + +msgid "Operate on Genomic Intervals" +msgstr "ゲノム間隔での操作" + +msgid "Statistics" +msgstr "統計量" + +msgid "Graph/Display Data" +msgstr "グラフ／データ表示" + +msgid "Regional Variation" +msgstr "領域的多型" + +msgid "Evolution: HyPhy" +msgstr "進化: HyPhy" + +msgid "Taxonomy manipulation" +msgstr "系統学的操作" + +msgid "Solexa tools" +msgstr "Solexaツールス" + +msgid "FASTA manipulation" +msgstr "FASTA操作" + +msgid "Short Read QC and Manipulation" +msgstr "Short Read QCと操作" + +msgid "Short Read Mapping" +msgstr "Short Readマッピング" + + + + + +#: templates/admin_main.mako:3 templates/admin_main.mako:8 +msgid "Galaxy Administration" +msgstr "Galaxy 管理" + +#: templates/admin_main.mako:17 +msgid "Admin password: " +msgstr "管理者パスワード: " + +#: templates/admin_main.mako:19 +msgid "Reload tool: " +msgstr "" + +#: templates/admin_main.mako:35 +msgid "Reload" +msgstr "再読込する" + +#: templates/dataset/edit_attributes.mako:2 +msgid "History Item Attributes" +msgstr "ヒストリーアイテム変数" + +#: templates/dataset/edit_attributes.mako:19 +msgid "Edit Attributes" +msgstr "変数を編集する" + +#: templates/dataset/edit_attributes.mako:64 +msgid "" +"This will inspect the dataset and attempt to correct the above column values " +"if they are not accurate." +msgstr "これはデータセットを調査して上記のカラムの値を修正することを試みます。" + +#: templates/dataset/edit_attributes.mako:68 +msgid "" +"Required metadata values are missing. Some of these values may not be " +"editable by the user. Selecting \"Auto-detect\" will attempt to fix these " +"values." +msgstr "必要なメタデータの値が不明です。それらのいくつかの値はユーザによって編集可能にはなっていません。「自動判定」を選択するとそれらの値をただしくできるかもしれません。" + +#: templates/dataset/edit_attributes.mako:78 +msgid "Convert to new format" +msgstr "新しいフォーマットに変換する" + +#: templates/dataset/edit_attributes.mako:84 +msgid "Convert to" +msgstr "変換する" + +#: templates/dataset/edit_attributes.mako:95 +msgid "" +"This will create a new dataset with the contents of this dataset converted " +"to a new format." +msgstr "新しいフォーマットに変換したデータセットを新規作成します。" + +#: templates/dataset/edit_attributes.mako:111 +msgid "Change data type" +msgstr "データタイプを変更する" + +#: templates/dataset/edit_attributes.mako:117 +msgid "New Type" +msgstr "新しいタイプ" + +#: templates/dataset/edit_attributes.mako:124 +msgid "" +"This will change the datatype of the existing dataset but <i>not</i> modify " +"its contents. Use this if Galaxy has incorrectly guessed the type of your " +"dataset." +msgstr "これは既存のデータセットのデータタイプを変更します。しかしデータセットの中身は変更しません。データセットのタイプの誤判定があったときに使用します。" + +#: templates/dataset/edit_attributes.mako:137 +msgid "Copy History Item" +msgstr "ヒストリーアイテムをコピーする" + +#: templates/history/list.mako:3 +msgid "Your saved histories" +msgstr "保存したヒストリー" + +#: templates/history/list.mako:19 +msgid "Stored Histories" +msgstr "格納してあるヒストリー" + +#: templates/history/list.mako:21 templates/root/history.mako:239 +msgid "hide deleted" +msgstr "削除したヒストリーを隠す" + +#: templates/history/list.mako:23 +msgid "show deleted" +msgstr "削除したヒストリーを表示する" + +#: templates/history/list.mako:27 +msgid "Name" +msgstr "名前" + +#: templates/history/list.mako:27 +msgid "Size" +msgstr "サイズ" + +#: templates/history/list.mako:27 +msgid "Last modified" +msgstr "最終更新日" + +#: templates/history/list.mako:27 +msgid "Actions" +msgstr "操作" + +#: templates/history/list.mako:45 +msgid "rename" +msgstr "名称変更する" + +#: templates/history/list.mako:46 +msgid "switch to" +msgstr "変更する" + +#: templates/history/list.mako:47 +msgid "delete" +msgstr "削除する" + +#: templates/history/list.mako:49 +msgid "undelete" +msgstr "削除から戻す" + +#: templates/history/list.mako:55 +msgid "Action" +msgstr "操作" + +#: templates/history/list.mako:56 templates/history/options.mako:21 +msgid "Share" +msgstr "共有" + +#: templates/history/list.mako:56 templates/history/options.mako:15 +msgid "Rename" +msgstr "名称変更する" + +#: templates/history/list.mako:56 templates/history/options.mako:24 +msgid "Delete" +msgstr "削除する" + +#: templates/history/list.mako:58 +msgid "Undelete" +msgstr "削除から戻す" + +#: templates/history/list.mako:65 +msgid "You have no stored histories" +msgstr "保管してあるヒストリーはありません" + +#: templates/history/options.mako:5 +msgid "History Options" +msgstr "ヒストリーオプション" + +#: templates/history/options.mako:9 +msgid "You must be " +msgstr "あなたは" + +#: templates/history/options.mako:9 +msgid "logged in" +msgstr "ログイン" + +#: templates/history/options.mako:9 +msgid " to store or switch histories." +msgstr "しないとヒストリーの保管や変更ができません。" + +#: templates/history/options.mako:15 +#, python-format +msgid " current history (stored as \"%s\")" +msgstr " 現在のヒストリー（\"%s\" として保管されています）" + +#: templates/history/options.mako:16 +msgid "List" +msgstr "リストする" + +#: templates/history/options.mako:16 +msgid " previously stored histories" +msgstr " 以前に保管したヒストリー" + +#: templates/history/options.mako:18 +msgid "Create" +msgstr "作成する" + +#: templates/history/options.mako:18 +msgid " a new empty history" +msgstr " 新規ヒストリー" + +#: templates/history/options.mako:20 +msgid "Construct workflow" +msgstr "ワークフローを構築する" + +#: templates/history/options.mako:20 +msgid " from the current history" +msgstr " 現在のヒストリーから" + +#: templates/history/options.mako:21 templates/history/options.mako:24 +msgid " current history" +msgstr " 現在のヒストリー" + +#: templates/history/options.mako:23 +msgid "Show deleted" +msgstr "削除したヒストリーを表示する" + +#: templates/history/options.mako:23 +msgid " datasets in history" +msgstr " ヒストリーのデータセット" + +#: templates/history/rename.mako:3 templates/history/rename.mako:6 +msgid "Rename History" +msgstr "ヒストリーの名称変更をする" + + +msgid "Rename Histories" +msgstr "名称変更する" + +msgid "Perform Action" +msgstr "操作を実行する" + +msgid "Submit" +msgstr "登録する" + + + +#: templates/history/rename.mako:10 +msgid "Current Name" +msgstr "現在の名称" + +#: templates/history/rename.mako:10 +msgid "New Name" +msgstr "新しい名称" + +#: templates/history/share.mako:3 +msgid "Share histories" +msgstr "ヒストリーを共有する" + +#: templates/history/share.mako:6 +msgid "Share Histories" +msgstr "ヒストリーを共有する" + +#: templates/history/share.mako:9 +msgid "History Name:" +msgstr "ヒストリー名" + +#: templates/history/share.mako:9 +msgid "Number of Datasets:" +msgstr "データセット数" + +#: templates/history/share.mako:9 +msgid "Share Link" +msgstr "共有リンク" + +#: templates/history/share.mako:15 +msgid "This history contains no data." +msgstr "このヒストリーにはデータがありません。" + +#: templates/history/share.mako:21 +msgid "copy link to share" +msgstr "共有リンクをコピーする" + +#: templates/history/share.mako:24 +msgid "Email of User to share with:" +msgstr "共有したいユーザのEメール:" +#msgstr "つぎのヒストリーを共有するユーザのEメールアドレス:" + +#: templates/root/history.mako:7 +msgid "Galaxy History" +msgstr "Galaxy ヒストリー" + +#: templates/root/history.mako:237 +msgid "refresh" +msgstr "リフレッシュ" + +#: templates/root/history.mako:245 +msgid "You are currently viewing a deleted history!" +msgstr "消去したヒストリーをみています。" + +#: templates/root/history.mako:289 +msgid "Your history is empty. Click 'Get Data' on the left pane to start" +msgstr "ヒストリーは空です。解析をはじめるには、左パネルの 'データ取得' をクリック" + +#: templates/root/history_common.mako:41 +msgid "Job is waiting to run" +msgstr "ジョブは実行待ちです" + +#: templates/root/history_common.mako:43 +msgid "Job is currently running" +msgstr "ジョブは実行中です" + +#: templates/root/history_common.mako:46 +msgid "An error occurred running this job: " +msgstr "このジョブの実行中に発生したエラー: " + +#: templates/root/history_common.mako:47 +msgid "report this error" +msgstr "このエラーを報告する" + +#: templates/root/history_common.mako:54 +msgid "No data: " +msgstr "データ無し: " + +#: templates/root/history_common.mako:58 +msgid "format: " +msgstr "フォーマット: " + +#: templates/root/history_common.mako:59 +msgid "database: " +msgstr "データベース: " + +#: templates/root/history_common.mako:66 templates/root/masthead.mako:20 +msgid "Info: " +msgstr "情報: " + +#: templates/root/history_common.mako:85 +#, python-format +msgid "Error: unknown dataset state \"%s\"." +msgstr "エラー: 不明なデータ状態 \"%s\"。" + +#: templates/root/index.mako:32 +msgid "Options" +msgstr "オプション" + +#: templates/root/index.mako:34 +msgid "History" +msgstr "ヒストリー" + +#: templates/root/masthead.mako:20 +msgid "report bugs" +msgstr "バグを報告する" + +#: templates/root/masthead.mako:21 +msgid "wiki" +msgstr "wiki" + +#: templates/root/masthead.mako:22 +msgid "screencasts" +msgstr "スクリーンキャスト" + +#: templates/root/masthead.mako:23 +msgid "blog" +msgstr "ブログ" + +#: templates/root/masthead.mako:31 +#, python-format +msgid "Logged in as %s: " +msgstr "%s としてログイン中: " + +#: templates/root/masthead.mako:31 +msgid "manage" +msgstr "管理" + +#: templates/root/masthead.mako:32 +msgid "logout" +msgstr "ログアウト" + +#: templates/root/masthead.mako:34 +msgid "Account: " +msgstr "アカウント: " + +#: templates/root/masthead.mako:34 +msgid "create" +msgstr "作成" + +#: templates/root/masthead.mako:35 +msgid "login" +msgstr "ログイン" + +#: templates/root/tool_menu.mako:52 +msgid "Galaxy Tools" +msgstr "Galaxy ツール群" + +#: templates/root/tool_menu.mako:129 +msgid "Workflow" +msgstr "ワークフロー" + +#: templates/root/tool_menu.mako:134 +msgid "Manage" +msgstr "管理" + +#: templates/root/tool_menu.mako:134 +msgid "workflows" +msgstr "ワークフロー" + +#: templates/user/index.mako:2 templates/user/index.mako:4 +msgid "Account settings" +msgstr "アカウント設定" + +#: templates/user/index.mako:7 +#, python-format +msgid "You are currently logged in as %s." +msgstr "%s としてログイン中。" + +#: templates/user/index.mako:9 +msgid "Change your password" +msgstr "パスワード変更" + +#: templates/user/index.mako:10 +msgid "Update your email address" +msgstr "メールアドレス変更" + +#: templates/user/index.mako:11 +msgid "Logout" +msgstr "ログアウト" + +#: templates/user/index.mako:16 +msgid "Login" +msgstr "ログイン" + +#: templates/user/index.mako:17 +msgid "Create new account" +msgstr "新規アカウントを作成する" diff -r ab1b5bd846bc -r dc62ee52012e locale/ja/LC_MESSAGES/tools.mo Binary file locale/ja/LC_MESSAGES/tools.mo has changed diff -r ab1b5bd846bc -r dc62ee52012e locale/ja/LC_MESSAGES/tools.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/ja/LC_MESSAGES/tools.po Tue Mar 17 22:46:47 2009 -0400 @@ -0,0 +1,85 @@ +# Japanese translations for PROJECT. +# Copyright (C) 2009 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2009-03-17 04:06-0400\n" +"PO-Revision-Date: 2009-03-17 04:06-0400\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: ja <LL(a)li.org>\n" +"Plural-Forms: nplurals=1; plural=0\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.4\n" + +msgid "Get Data" +msgstr "" + +msgid "Get ENCODE Data" +msgstr "" + +msgid "ENCODE Tools" +msgstr "" + +msgid "Lift-Over" +msgstr "" + +msgid "Text Manipulation" +msgstr "" + +msgid "Filter and Sort" +msgstr "" + +msgid "Join, Subtract and Group" +msgstr "" + +msgid "Convert Formats" +msgstr "" + +msgid "Extract Features" +msgstr "" + +msgid "Fetch Sequences" +msgstr "" + +msgid "Fetch Alignments" +msgstr "" + +msgid "Get Genomic Scores" +msgstr "" + +msgid "Operate on Genomic Intervals" +msgstr "" + +msgid "Statistics" +msgstr "" + +msgid "Graph/Display Data" +msgstr "" + +msgid "Regional Variation" +msgstr "" + +msgid "Evolution: HyPhy" +msgstr "" + +msgid "Taxonomy manipulation" +msgstr "" + +msgid "Solexa tools" +msgstr "" + +msgid "FASTA manipulation" +msgstr "" + +msgid "Short Read QC and Manipulation" +msgstr "" + +msgid "Short Read Mapping" +msgstr "" + diff -r ab1b5bd846bc -r dc62ee52012e locale/tools.pot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locale/tools.pot Tue Mar 17 22:46:47 2009 -0400 @@ -0,0 +1,66 @@ +#: tools/**.xml +msgid "Get Data" +msgstr "" + +msgid "Get ENCODE Data" +msgstr "" + +msgid "ENCODE Tools" +msgstr "" + +msgid "Lift-Over" +msgstr "" + +msgid "Text Manipulation" +msgstr "" + +msgid "Filter and Sort" +msgstr "" + +msgid "Join, Subtract and Group" +msgstr "" + +msgid "Convert Formats" +msgstr "" + +msgid "Extract Features" +msgstr "" + +msgid "Fetch Sequences" +msgstr "" + +msgid "Fetch Alignments" +msgstr "" + +msgid "Get Genomic Scores" +msgstr "" + +msgid "Operate on Genomic Intervals" +msgstr "" + +msgid "Statistics" +msgstr "" + +msgid "Graph/Display Data" +msgstr "" + +msgid "Regional Variation" +msgstr "" + +msgid "Evolution: HyPhy" +msgstr "" + +msgid "Taxonomy manipulation" +msgstr "" + +msgid "Solexa tools" +msgstr "" + +msgid "FASTA manipulation" +msgstr "" + +msgid "Short Read QC and Manipulation" +msgstr "" + +msgid "Short Read Mapping" +msgstr "" diff -r ab1b5bd846bc -r dc62ee52012e scripts/paster.py --- a/scripts/paster.py Sun Mar 08 14:25:19 2009 -0400 +++ b/scripts/paster.py Tue Mar 17 22:46:47 2009 -0400 @@ -7,6 +7,7 @@ import os, sys +sys.setdefaultencoding( 'utf_8' ) assert sys.version_info[:2] >= ( 2, 4 ) new_path = [ os.path.join( os.getcwd(), "lib" ) ] diff -r ab1b5bd846bc -r dc62ee52012e templates/admin_main.mako --- a/templates/admin_main.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/admin_main.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,37 +1,38 @@ +<% _=n_ %> <%inherit file="/base.mako"/> -<%def name="title()">Galaxy Administration</%def> +<%def name="title()">${_('Galaxy Administration')}</%def> <table align="center" width="70%" class="border" cellpadding="5" cellspacing="5"> <tr> <td> - <h3 align="center">Galaxy Administration</h3> + <h3 align="center">${_('Galaxy Administration')}</h3> %if msg: - <p class="ok_bgr">${msg}</p> + <p class="ok_bgr">${_(msg)}</p> %endif </td> </tr> <tr> <td> <form method="post" action="admin"> - <p>Admin password: <input type="password" name="passwd" size="8"></p> + <p>${_('Admin password: ')}<input type="password" name="passwd" size="8"></p> <p> - Reload tool: + ${_('Reload tool: ')} <select name="tool_id"> %for key, val in toolbox.tool_panel.items(): %if key.startswith( 'tool' ): - <option value="${val.id}">${val.name}</option> + <option value="${val.id}">${_(val.name)}</option> %elif key.startswith( 'section' ): <optgroup label="${val.name}"> <% section = val %> %for section_key, section_val in section.elems.items(): %if section_key.startswith( 'tool' ): - <option value="${section_val.id}">${section_val.name}</option> + <option value="${section_val.id}">${_(section_val.name)}</option> %endif %endfor %endif %endfor </select> - <button name="action" value="tool_reload">Reload</button> + <button name="action" value="tool_reload">${_('Reload')}</button> </p> </form> </td> diff -r ab1b5bd846bc -r dc62ee52012e templates/base.mako --- a/templates/base.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/base.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,9 +1,10 @@ +<% _=n_ %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> -<title>${self.title()}</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<title>a ${self.title()}</title> +<meta http-equiv="Content-Type" content="text/html; charset=${_('iso-8859-1')}" /> ${self.stylesheets()} ${self.javascripts()} </head> @@ -28,4 +29,4 @@ ## <![endif]--> <script type="text/javascript" src="${h.url_for('/static/scripts/jquery.js')}"></script> <script type="text/javascript" src="${h.url_for('/static/scripts/galaxy.base.js')}"></script> -</%def> \ No newline at end of file +</%def> diff -r ab1b5bd846bc -r dc62ee52012e templates/base_panels.mako --- a/templates/base_panels.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/base_panels.mako Tue Mar 17 22:46:47 2009 -0400 @@ -39,33 +39,34 @@ </%def> ## Document -<html lang="en"> +<html> <head> - <title>${self.title()}</title> - ${self.javascripts()} - ${self.stylesheets()} + <title>${self.title()}</title> + <meta http-equiv="Content-Type" content="text/html; charset=${_('iso-8859-1')}" /> + ${self.javascripts()} + ${self.stylesheets()} </head> <body scroll="no"> - ## Background displays first - <div id="background"></div> - ## Layer iframes over backgrounds - <div id="masthead"> - ${self.masthead()} - </div> - <div id="left"> - ${self.left_panel()} - </div> - <div id="left-border"><div id="left-border-inner" style="display: none;"></div></div> - <div id="center"> - ${self.center_panel()} - </div> - <div id="right-border"><div id="right-border-inner" style="display: none;"></div></div> - <div id="right"> - ${self.right_panel()} - </div> + ## Background displays first + <div id="background"></div> + ## Layer iframes over backgrounds + <div id="masthead"> + ${self.masthead()} + </div> + <div id="left"> + ${self.left_panel()} + </div> + <div id="left-border"><div id="left-border-inner" style="display: none;"></div></div> + <div id="center"> + ${self.center_panel()} + </div> + <div id="right-border"><div id="right-border-inner" style="display: none;"></div></div> + <div id="right"> + ${self.right_panel()} + </div> ## Allow other body level elements - ${next.body()} + ${next.body()} </body> ## Scripts can be loaded later since they progressively add features to ## the panels, but do not change layout diff -r ab1b5bd846bc -r dc62ee52012e templates/dataset/edit_attributes.mako --- a/templates/dataset/edit_attributes.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/dataset/edit_attributes.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,5 +1,5 @@ <%inherit file="/base.mako"/> -<%def name="title()">History Item Attributes</%def> +<%def name="title()">${_('History Item Attributes')}</%def> <%def name="datatype( dataset, datatypes )"> @@ -7,16 +7,16 @@ ## $datatypes.sort() %for ext in datatypes: %if dataset.ext == ext: - <option value="${ext}" selected="yes">${ext}</option> + <option value="${ext}" selected="yes">${_(ext)}}</option> %else: - <option value="${ext}">${ext}</option> + <option value="${ext}">${_(ext)}</option> %endif %endfor </select> </%def> <div class="toolForm"> - <div class="toolFormTitle">Edit Attributes</div> + <div class="toolFormTitle">${_('Edit Attributes')}</div> <div class="toolFormBody"> <form name="edit_attributes" action="${h.url_for( action='edit' )}" method="post"> <input type="hidden" name="id" value="${data.id}"> @@ -52,21 +52,20 @@ %endif %endfor <div class="form-row"> - <input type="submit" name="save" value="Save"> + <input type="submit" name="save" value="${_('Save')}"> </div> </form> <form name="auto_detect" action="${h.url_for( action='edit' )}" method="post"> <input type="hidden" name="id" value="${data.id}"> <div style="float: left; width: 250px; margin-right: 10px;"> - <input type="submit" name="detect" value="Auto-detect"> + <input type="submit" name="detect" value="${_('Auto-detect')}"> </div> <div class="toolParamHelp" style="clear: both;"> - This will inspect the dataset and attempt to correct the above column values - if they are not accurate. + ${_('This will inspect the dataset and attempt to correct the above column values if they are not accurate.')} </div> </form> %if data.missing_meta(): - <div class="errormessagesmall">Required metadata values are missing. Some of these values may not be editable by the user. Selecting "Auto-detect" will attempt to fix these values.</div> + <div class="errormessagesmall">${_('Required metadata values are missing. Some of these values may not be editable by the user. Selecting "Auto-detect" will attempt to fix these values.')}</div> %endif </div> </div> @@ -76,13 +75,13 @@ <% converters = data.get_converter_types() %> %if len( converters ) > 0: <div class="toolForm"> - <div class="toolFormTitle">Convert to new format</div> + <div class="toolFormTitle">${_('Convert to new format')}</div> <div class="toolFormBody"> <form name="convert_data" action="${h.url_for( action='edit' )}" method="post"> <input type="hidden" name="id" value="${data.id}"> <div class="form-row"> <label> - Convert to: + ${_('Convert to')}: </label> <div style="float: left; width: 250px; margin-right: 10px;"> <select name="target_type"> @@ -93,13 +92,12 @@ </div> <div class="toolParamHelp" style="clear: both;"> - This will create a new dataset with the contents of this - dataset converted to a new format. + ${_('This will create a new dataset with the contents of this dataset converted to a new format.')} </div> <div style="clear: both"></div> </div> <div class="form-row"> - <input type="submit" name="convert_data" value="Convert"> + <input type="submit" name="convert_data" value="${_('Convert')}"> </div> </form> </div> @@ -110,27 +108,25 @@ <div class="toolForm"> - <div class="toolFormTitle">Change data type</div> + <div class="toolFormTitle">${_('Change data type')}</div> <div class="toolFormBody"> <form name="change_datatype" action="${h.url_for( action='edit' )}" method="post"> <input type="hidden" name="id" value="${data.id}"> <div class="form-row"> <label> - New Type: + ${_('New Type')}: </label> <div style="float: left; width: 250px; margin-right: 10px;"> ${datatype( data, datatypes )} </div> <div class="toolParamHelp" style="clear: both;"> - This will change the datatype of the existing dataset - but <i>not</i> modify its contents. Use this if Galaxy - has incorrectly guessed the type of your dataset. + ${_('This will change the datatype of the existing dataset but <i>not</i> modify its contents. Use this if Galaxy has incorrectly guessed the type of your dataset.')} </div> <div style="clear: both"></div> </div> <div class="form-row"> - <input type="submit" name="change" value="Save"> + <input type="submit" name="change" value="${_('Save')}"> </div> </form> </div> @@ -138,7 +134,7 @@ <p> <div class="toolForm"> - <div class="toolFormTitle">Copy History Item</div> + <div class="toolFormTitle">${_('Copy History Item')}</div> <div class="toolFormBody"> Click <a href="${h.url_for( controller='dataset', action='copy_datasets', source_dataset_ids=data.id, target_history_ids=data.history_id )}" target="galaxy_main">here</a> to make a copy of this history item. </div> diff -r ab1b5bd846bc -r dc62ee52012e templates/form.mako --- a/templates/form.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/form.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,3 +1,4 @@ +<% _=n_ %> <%inherit file="/base.mako"/> <%def name="title()">${form.title}</%def> @@ -22,7 +23,7 @@ %> <div class="${cls}"> <label> - ${input.label}: + ${_(input.label)}: </label> <div style="float: left; width: 250px; margin-right: 10px;"> <input type="${input.type}" name="${input.name}" value="${input.value}" size="40"> diff -r ab1b5bd846bc -r dc62ee52012e templates/history/list.mako --- a/templates/history/list.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/history/list.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,5 +1,6 @@ +<% _=n_ %> <%inherit file="/base.mako"/> -<%def name="title()">Your saved histories</%def> +<%def name="title()">${_('Your saved histories')}</%def> %if error_msg: <p> @@ -15,15 +16,15 @@ %endif %if user.histories: - <h1 style="margin-bottom:0px;">Stored Histories</h1> + <h1 style="margin-bottom:0px;">${_('Stored Histories')}</h1> %if show_deleted: - <div><a href="${h.url_for( action='history_available', id=','.join( ids ), show_deleted=False )}">hide deleted</a></div> + <div><a href="${h.url_for( action='history_available', id=','.join( ids ), show_deleted=False )}">${_('hide deleted')}</a></div> %else: - <div><a href="${h.url_for( action='history_available', id=','.join( ids ), show_deleted=True )}">show deleted</a></div> + <div><a href="${h.url_for( action='history_available', id=','.join( ids ), show_deleted=True )}">${_('show deleted')}</a></div> %endif <form name="history_actions" action="${h.url_for( action='history_available')}" method="post" > <table class="colored" border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr class="header" align="center"><td>Name</td><td>Size</td><td>Last modified</td><td>Actions</td></tr> + <tr class="header" align="center"><td>${_('Name')}</td><td>${_('Size')}</td><td>${_('Last modified')}</td><td>${_('Actions')}</td></tr> %for history in user.histories: %if ( show_deleted and not history.purged ) or not( history.deleted ): <tr> @@ -41,25 +42,25 @@ <td>${str(history.update_time)[:19]}</td> <td> %if not history.deleted: - <a href="${h.url_for( action='history_rename', id=history.id )}">rename</a><br /> - <a href="${h.url_for( action='history_switch', id=history.id )}">switch to</a><br /> - <a href="${h.url_for( action='history_delete', id=history.id )}" confirm="Are you sure you want to delete this history?">delete</a><br /> + <a href="${h.url_for( action='history_rename', id=history.id )}">${_('rename')}</a><br /> + <a href="${h.url_for( action='history_switch', id=history.id )}">${_('switch to')}</a><br /> + <a href="${h.url_for( action='history_delete', id=history.id )}" confirm="Are you sure you want to delete this history?">${_('delete')}</a><br /> %else: - <a href="${h.url_for( action='history_undelete', id=history.id )}">undelete</a><br /> + <a href="${h.url_for( action='history_undelete', id=history.id )}">${_('undelete')}</a><br /> %endif </td> </tr> %endif %endfor - <tr><th colspan="100%">Action</th></tr> - <tr><td colspan="100%" align="center"><input type="radio" name="do_operation" value="share" checked>Share <input type="radio" name="do_operation" value="rename">Rename <input type="radio" name="do_operation" value="delete">Delete + <tr><th colspan="100%">${_('Action')}</th></tr> + <tr><td colspan="100%" align="center"><input type="radio" name="do_operation" value="share" checked>${_('Share')} <input type="radio" name="do_operation" value="rename">${_('Rename')} <input type="radio" name="do_operation" value="delete">${_('Delete')} %if show_deleted: - <input type="radio" name="do_operation" value="undelete">Undelete + <input type="radio" name="do_operation" value="undelete">${_('Undelete')} %endif </td></tr> - <tr><td colspan="100%" align="center"><input type="submit" name="submit" value="Perform Action"></td></tr> + <tr><td colspan="100%" align="center"><input type="submit" name="submit" value="${_('Perform Action')}"></td></tr> </table> </form> %else: - You have no stored histories + ${_('You have no stored histories')} %endif diff -r ab1b5bd846bc -r dc62ee52012e templates/history/options.mako --- a/templates/history/options.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/history/options.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,25 +1,26 @@ +<% _=n_ %> <%inherit file="/base.mako"/> <%def name="title()">Your saved histories</%def> -<h1>History Options</h1> +<h1>${_('History Options')}</h1> %if not user: <div class="infomessage"> - <div>You must be <a target="galaxy_main" href="${h.url_for( controller='user', action='login' )}">logged in</a> to store or switch histories.</div> + <div>${_('You must be ')}<a target="galaxy_main" href="${h.url_for( controller='user', action='login' )}">${_('logged in')}</a>${_(' to store or switch histories.')}</div> </div> %endif <ul> %if user: - <li><a href="${h.url_for( controller='root', action='history_rename', id=history.id )}" target="galaxy_main">Rename</a> current history (stored as "${history.name}")</li> - <li><a href="${h.url_for( controller='root', action='history_available')}" target="galaxy_main">List</a> previously stored histories</li> + <li><a href="${h.url_for( controller='root', action='history_rename', id=history.id )}" target="galaxy_main">${_('Rename')}</a>${_(' current history (stored as "%s")') % history.name}</li> + <li><a href="${h.url_for( controller='root', action='history_available')}" target="galaxy_main">${_('List')}</a>${_(' previously stored histories')}</li> %if len( history.active_datasets ) > 0: - <li><a href="${h.url_for( controller='root', action='history_new' )}">Create</a> a new empty history</li> + <li><a href="${h.url_for( controller='root', action='history_new' )}">${_('Create')}</a>${_(' a new empty history')}</li> %endif - <li><a href="${h.url_for( controller='workflow', action='build_from_current_history' )}">Construct workflow</a> from the current history</li> - <li><a href="${h.url_for( controller='root', action='history_share' )}" target="galaxy_main">Share</a> current history</div> + <li><a href="${h.url_for( controller='workflow', action='build_from_current_history' )}">${_('Construct workflow')}</a>${_(' from the current history')}</li> + <li><a href="${h.url_for( controller='root', action='history_share' )}" target="galaxy_main">${_('Share')}</a>${_(' current history')}</div> %endif - <li><a href="${h.url_for( controller='root', action='history', show_deleted=True)}" target="galaxy_history">Show deleted</a> datasets in history</li> - <li><a href="${h.url_for( controller='root', action='history_delete', id=history.id )}" confirm="Are you sure you want to delete the current history?">Delete</a> current history</div> + <li><a href="${h.url_for( controller='root', action='history', show_deleted=True)}" target="galaxy_history">${_('Show deleted')}</a>${_(' datasets in history')}</li> + <li><a href="${h.url_for( controller='root', action='history_delete', id=history.id )}" confirm="${_('Are you sure you want to delete the current history?')}">${_('Delete')}</a>${_(' current history')}</div> </ul> diff -r ab1b5bd846bc -r dc62ee52012e templates/history/rename.mako --- a/templates/history/rename.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/history/rename.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,16 +1,17 @@ +<% _=n_ %> <%inherit file="/base.mako"/> -<%def name="title()">Rename History</%def> +<%def name="title()">${_('Rename History')}</%def> <div class="toolForm"> - <div class="toolFormTitle">Rename History</div> + <div class="toolFormTitle">${_('Rename History')}</div> <div class="toolFormBody"> <form action="${h.url_for( action='history_rename' )}" method="post" > <table> - <tr><th>Current Name</th><th>New Name</th></tr> + <tr><th>${_('Current Name')}</th><th>${_('New Name')}</th></tr> %for history in histories: <tr><td>${history.name}<input type="hidden" name="id" value="${history.id}"></td><td><input type="text" name="name" value="${history.name}" size="40"></td></tr> %endfor - <tr><td colspan="2"><input type="submit" name="history_rename_btn" value="Rename Histories"></td></tr> + <tr><td colspan="2"><input type="submit" name="history_rename_btn" value="${_('Rename Histories')}"></td></tr> </table> </form> </div> diff -r ab1b5bd846bc -r dc62ee52012e templates/history/share.mako --- a/templates/history/share.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/history/share.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,26 +1,27 @@ +<% _=n_ %> <%inherit file="/base.mako"/> -<%def name="title()">Share histories</%def> +<%def name="title()">${_('Share histories')}</%def> <div class="toolForm"> -<div class="toolFormTitle">Share Histories</div> +<div class="toolFormTitle">${_('Share Histories')}</div> <table> <form action="${h.url_for( action='history_share' )}" method="post" > - <tr><th>History Name:</td><th>Number of Datasets:</th><th>Share Link</th></tr> + <tr><th>${_('History Name:')}</td><th>${_('Number of Datasets:')}</th><th>${_('Share Link')}</th></tr> %for history in histories: <tr><td align="center">${history.name}<input type="hidden" name="id" value="${history.id}"></td><td align="center"> %if len(history.datasets) < 1: <div class="warningmark"> - This history contains no data. + ${_('This history contains no data.')} </div> %else: ${len(history.datasets)} %endif </td> - <td align="center"><a href="${h.url_for( action='history_import', id=history.id )}">copy link to share</a></td> + <td align="center"><a href="${h.url_for( action='history_import', id=history.id )}">${_('copy link to share')}</a></td> </tr> %endfor - <tr><td>Email of User to share with:</td><td><input type="text" name="email" value="${email}" size="40"></td></tr> + <tr><td>${_('Email of User to share with:')}</td><td><input type="text" name="email" value="${email}" size="40"></td></tr> %if send_to_err: <tr><td colspan="100%"><div class="errormessage">${send_to_err}</div></td></tr> %endif diff -r ab1b5bd846bc -r dc62ee52012e templates/message.mako --- a/templates/message.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/message.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,3 +1,4 @@ +<% _=n_ %> <%inherit file="/base.mako"/> <%def name="javascripts()"> @@ -29,4 +30,4 @@ </script> </%def> -<div class="${message_type}message">${message}</div> +<div class="${message_type}message">${_(message)}</div> diff -r ab1b5bd846bc -r dc62ee52012e templates/root/history.mako --- a/templates/root/history.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/root/history.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,16 +1,17 @@ +<% _=n_ %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> -<title>Galaxy History</title> +<title>${_('Galaxy History')}</title> ## This is now only necessary for tests %if bool( [ data for data in history.active_datasets if data.state in ['running', 'queued', '', None ] ] ):  %endif -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<meta http-equiv="Content-Type" content="text/html; charset=${_('iso-8859-1')}" /> <meta http-equiv="Pragma" content="no-cache"> <link href="${h.url_for('/static/style/base.css')}" rel="stylesheet" type="text/css" /> <link href="${h.url_for('/static/style/history.css')}" rel="stylesheet" type="text/css" /> @@ -29,7 +30,7 @@ initShowHide(); setupHistoryItem( q("div.historyItemWrapper") ); // Collapse all - q("#top-links").append( "| " ).append( q("<a href='#'>collapse all</a>").click( function() { + q("#top-links").append( "| " ).append( q("<a href='#'>${_('collapse all')}</a>").click( function() { q( "div.historyItemBody:visible" ).each( function() { if ( q.browser.mozilla ) { @@ -39,16 +40,16 @@ }) var state = new CookieSet( "galaxy.history.expand_state" ); state.removeAll().save(); - return false; + return false; })); }) - // Functionized so AJAX'd datasets can call them + //' Functionized so AJAX'd datasets can call them // Get shown/hidden state from cookie function initShowHide() { q( "div.historyItemBody" ).hide(); // Load saved state and show as neccesary var state = new CookieSet( "galaxy.history.expand_state" ); - for ( id in state.store ) { q( "#" + id ).children( "div.historyItemBody" ).show(); } + for ( id in state.store ) { q( "#" + id ).children( "div.historyItemBody" ).show(); } // If Mozilla, hide scrollbars in hidden items since they cause animation bugs if ( q.browser.mozilla ) { q( "div.historyItemBody" ).each( function() { @@ -80,51 +81,51 @@ state.add( id ); state.save(); delete state; } - return false; + return false; }); // Delete link q(this).find( "a.historyItemDelete" ).each( function() { - var data_id = this.id.split( "-" )[1]; - q(this).click( function() { - q( '#progress-' + data_id ).show(); - q.ajax({ - url: "${h.url_for( action='delete_async', id='XXX' )}".replace( 'XXX', data_id ), - error: function() { alert( "Delete failed" ) }, - success: function() { - %if show_deleted: - var to_update = {}; - to_update[data_id] = "none"; - updater( to_update ); - %else: - q( "#historyItem-" + data_id ).fadeOut( "fast", function() { - q( "div#historyItemContainer-" + data_id ).remove(); - if ( q( "div.historyItemContainer" ).length < 1 ) { - q ( "div#emptyHistoryMessage" ).show(); - } - }); - %endif - } - }); - return false; - }); - }); + var data_id = this.id.split( "-" )[1]; + q(this).click( function() { + q( '#progress-' + data_id ).show(); + q.ajax({ + url: "${h.url_for( action='delete_async', id='XXX' )}".replace( 'XXX', data_id ), + error: function() { alert( "Delete failed" ) }, + success: function() { + %if show_deleted: + var to_update = {}; + to_update[data_id] = "none"; + updater( to_update ); + %else: + q( "#historyItem-" + data_id ).fadeOut( "fast", function() { + q( "div#historyItemContainer-" + data_id ).remove(); + if ( q( "div.historyItemContainer" ).length < 1 ) { + q ( "div#emptyHistoryMessage" ).show(); + } + }); + %endif + } + }); + return false; + }); + }); // Undelete link q(this).find( "a.historyItemUndelete" ).each( function() { - var data_id = this.id.split( "-" )[1]; - q(this).click( function() { - q( '#progress-' + data_id ).show(); - q.ajax({ - url: "${h.url_for( controller='dataset', action='undelete_async', id='XXX' )}".replace( 'XXX', data_id ), - error: function() { alert( "Undelete failed" ) }, - success: function() { - var to_update = {}; - to_update[data_id] = "none"; - updater( to_update ); - } - }); - return false; - }); - }); + var data_id = this.id.split( "-" )[1]; + q(this).click( function() { + q( '#progress-' + data_id ).show(); + q.ajax({ + url: "${h.url_for( controller='dataset', action='undelete_async', id='XXX' )}".replace( 'XXX', data_id ), + error: function() { alert( "Undelete failed" ) }, + success: function() { + var to_update = {}; + to_update[data_id] = "none"; + updater( to_update ); + } + }); + return false; + }); + }); }); }; // Looks for changes in dataset state using an async request. Keeps @@ -233,15 +234,15 @@ <div id="top-links" class="historyLinks"> - <a href="${h.url_for('history', show_deleted=show_deleted)}">refresh</a> + <a href="${h.url_for('history', show_deleted=show_deleted)}">${_('refresh')}</a> %if show_deleted: - | <a href="${h.url_for('history', show_deleted=False)}">hide deleted</a> + | <a href="${h.url_for('history', show_deleted=False)}">${_('hide deleted')}</a> %endif </div> %if history.deleted: <div class="warningmessagesmall"> - You are currently viewing a deleted history! + ${_('You are currently viewing a deleted history!')} </div> <p></p> %endif @@ -285,7 +286,7 @@ </script> <div class="infomessagesmall" id="emptyHistoryMessage" style="display:none;"> %endif - Your history is empty. Click 'Get Data' on the left pane to start + ${_("Your history is empty. Click 'Get Data' on the left pane to start")} </div> </body> diff -r ab1b5bd846bc -r dc62ee52012e templates/root/history_as_xml.mako --- a/templates/root/history_as_xml.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/root/history_as_xml.mako Tue Mar 17 22:46:47 2009 -0400 @@ -2,7 +2,7 @@ <history> %for data in history.active_datasets: <data id="${data.id}" hid="${data.hid}" name="${data.name}" state="${data.state}" dbkey="${data.dbkey}"> - ${data.blurb} + ${_(data.blurb)} </data> %endfor </history> diff -r ab1b5bd846bc -r dc62ee52012e templates/root/history_common.mako --- a/templates/root/history_common.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/root/history_common.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,10 +1,11 @@ +<% _=n_ %> ## Render the dataset `data` as history item, using `hid` as the displayed id <%def name="render_dataset( data, hid, show_deleted_on_refresh = False )"> <% - if data.state in ['no state','',None]: - data_state = "queued" - else: - data_state = data.state + if data.state in ['no state','',None]: + data_state = "queued" + else: + data_state = data.state %> <div class="historyItemWrapper historyItem historyItem-${data_state}" id="historyItem-${data.id}"> @@ -14,55 +15,55 @@ </div> %endif ## Header row for history items (name, state, action buttons) - <div style="overflow: hidden;" class="historyItemTitleBar"> - <div style="float: left; padding-right: 3px;"> - <div style='display: none;' id="progress-${data.id}"> - <img src="${h.url_for('/static/style/data_running.gif')}" border="0" align="middle" > - </div> - %if data_state == 'running': - <div><img src="${h.url_for('/static/style/data_running.gif')}" border="0" align="middle"></div> - %elif data_state != 'ok': - <div><img src="${h.url_for( "/static/style/data_%s.png" % data_state )}" border="0" align="middle"></div> - %endif - </div> - <div style="float: right;"> - <a href="${h.url_for( controller='dataset', dataset_id=data.id, action='display', filename='index')}" target="galaxy_main"><img src="${h.url_for('/static/images/eye_icon.png')}" rollover="${h.url_for('/static/images/eye_icon_dark.png')}" width='16' height='16' alt='display data' title='display data' class='displayButton' border='0'></a> - <a href="${h.url_for( action='edit', id=data.id )}" target="galaxy_main"><img src="${h.url_for('/static/images/pencil_icon.png')}" rollover="${h.url_for('/static/images/pencil_icon_dark.png')}" width='16' height='16' alt='edit attributes' title='edit attributes' class='editButton' border='0'></a> - <a href="${h.url_for( action='delete', id=data.id, show_deleted_on_refresh=show_deleted_on_refresh )}" class="historyItemDelete" id="historyItemDeleter-${data.id}"><img src="${h.url_for('/static/images/delete_icon.png')}" rollover="${h.url_for('/static/images/delete_icon_dark.png')}" width='16' height='16' alt='delete' class='deleteButton' border='0'></a> - </div> - <span class="historyItemTitle"><b>${hid}: ${data.display_name()}</b></span> - </div> + <div style="overflow: hidden;" class="historyItemTitleBar"> + <div style="float: left; padding-right: 3px;"> + <div style='display: none;' id="progress-${data.id}"> + <img src="${h.url_for('/static/style/data_running.gif')}" border="0" align="middle" > + </div> + %if data_state == 'running': + <div><img src="${h.url_for('/static/style/data_running.gif')}" border="0" align="middle"></div> + %elif data_state != 'ok': + <div><img src="${h.url_for( "/static/style/data_%s.png" % data_state )}" border="0" align="middle"></div> + %endif + </div> + <div style="float: right;"> + <a href="${h.url_for( controller='dataset', dataset_id=data.id, action='display', filename='index')}" target="galaxy_main"><img src="${h.url_for('/static/images/eye_icon.png')}" rollover="${h.url_for('/static/images/eye_icon_dark.png')}" width='16' height='16' alt='display data' title='display data' class='displayButton' border='0'></a> + <a href="${h.url_for( action='edit', id=data.id )}" target="galaxy_main"><img src="${h.url_for('/static/images/pencil_icon.png')}" rollover="${h.url_for('/static/images/pencil_icon_dark.png')}" width='16' height='16' alt='edit attributes' title='edit attributes' class='editButton' border='0'></a> + <a href="${h.url_for( action='delete', id=data.id, show_deleted_on_refresh=show_deleted_on_refresh )}" class="historyItemDelete" id="historyItemDeleter-${data.id}"><img src="${h.url_for('/static/images/delete_icon.png')}" rollover="${h.url_for('/static/images/delete_icon_dark.png')}" width='16' height='16' alt='delete' class='deleteButton' border='0'></a> + </div> + <span class="historyItemTitle"><b>${hid}: ${data.display_name()}</b></span> + </div> ## Body for history items, extra info and actions, data "peek" <div id="info${data.id}" class="historyItemBody"> %if data_state == "queued": - <div>Job is waiting to run</div> + <div>${_('Job is waiting to run')}</div> %elif data_state == "running": - <div>Job is currently running</div> + <div>${_('Job is currently running')}</div> %elif data_state == "error": <div> - An error occurred running this job: <i>${data.display_info().strip()}</i>, - <a href="${h.url_for( controller='dataset', action='errors', id=data.id )}" target="galaxy_main">report this error</a> + ${_('An error occurred running this job: ')}<i>${data.display_info().strip()}</i>, + <a href="${h.url_for( controller='dataset', action='errors', id=data.id )}" target="galaxy_main">${_('report this error')}</a> </div> %elif data_state == "discarded": <div> The job creating this dataset was cancelled before completion. </div> %elif data_state == "empty": - <div>No data: <i>${data.display_info()}</i></div> + <div>${_('No data: ')}<i>${_(data.display_info())}</i></div> %elif data_state == "ok": <div> ${data.blurb}, - format: <span class="${data.ext}">${data.ext}</span>, - database: + ${_('format: ')}<span class="${data.ext}">${_(data.ext)}</span>, + ${_('database: ')} %if data.dbkey == '?': - <a href="${h.url_for( action='edit', id=data.id )}" target="galaxy_main">${data.dbkey}</a> + <a href="${h.url_for( action='edit', id=data.id )}" target="galaxy_main">${_(data.dbkey)}</a> %else: - <span class="${data.dbkey}">${data.dbkey}</span> + <span class="${data.dbkey}">${_(data.dbkey)}</span> %endif </div> - <div class="info">Info: ${data.display_info()} </div> + <div class="info">${_('Info: ')}${_(data.display_info())} </div> <div> %if data.has_data: <a href="${h.url_for( action='display', id=data.id, tofile='yes', toext=data.ext )}" target="_blank">save</a> @@ -70,30 +71,29 @@ <% display_links = data.datatype.get_display_links( data, display_app, app, request.base ) %> %if len( display_links ) > 0: | ${data.datatype.get_display_label(display_app)} - %for display_name, display_link in display_links: - <a target="_blank" href="${display_link}">${display_name}</a> - %endfor + %for display_name, display_link in display_links: + <a target="_blank" href="${display_link}">${_(display_name)}</a> + %endfor %endif %endfor %endif </div> %if data.peek != "no peek": - <div><pre id="peek${data.id}" class="peek">${data.display_peek()}</pre></div> + <div><pre id="peek${data.id}" class="peek">${_(data.display_peek())}</pre></div> %endif - %else: - <div>Error: unknown dataset state "${data_state}".</div> + %else: + <div>${_('Error: unknown dataset state "%s".') % data_state}</div> %endif - ## Recurse for child datasets - + ## Recurse for child datasets %if len( data.children ) > 0: - ## FIXME: This should not be in the template, there should - ## be a 'visible_children' method on dataset. + ## FIXME: This should not be in the template, there should + ## be a 'visible_children' method on dataset. <% - children = [] - for child in data.children: - if child.visible: - children.append( child ) + children = [] + for child in data.children: + if child.visible: + children.append( child ) %> %if len( children ) > 0: <div> @@ -104,8 +104,6 @@ </div> %endif %endif - </div> </div> - </%def> diff -r ab1b5bd846bc -r dc62ee52012e templates/root/index.mako --- a/templates/root/index.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/root/index.mako Tue Mar 17 22:46:47 2009 -0400 @@ -2,7 +2,7 @@ <%def name="left_panel()"> <div class="unified-panel-header" unselectable="on"> - <div class='unified-panel-header-inner'>Tools</div> + <div class='unified-panel-header-inner'>${n_('Tools')}</div> </div> <div class="unified-panel-body" style="overflow: hidden;"> <iframe name="galaxy_tools" src="${h.url_for( 'tool_menu' )}" frameborder="0" style="position: absolute; margin: 0; border: 0 none; height: 100%; width: 100%;"> </iframe> @@ -29,9 +29,9 @@ <div class="unified-panel-header" unselectable="on"> <div class="unified-panel-header-inner"> <div style="float: right"> - <a class='panel-header-button' href="${h.url_for( action='history_options' )}" target="galaxy_main"><span>Options</span></a> + <a class='panel-header-button' href="${h.url_for( action='history_options' )}" target="galaxy_main"><span>${_('Options')}</span></a> </div> - <div class="panel-header-text">History</div> + <div class="panel-header-text">${_('History')}</div> </div> </div> <div class="unified-panel-body" style="overflow: hidden;"> diff -r ab1b5bd846bc -r dc62ee52012e templates/root/masthead.mako --- a/templates/root/masthead.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/root/masthead.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,10 +1,11 @@ +<% _=n_ %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <title>Galaxy</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<meta http-equiv="Content-Type" content="text/html; charset=${_('iso-8859-1')}" /> <link href="${h.url_for('/static/style/base.css')}" rel="stylesheet" type="text/css" /> <link href="${h.url_for('/static/style/masthead.css')}" rel="stylesheet" type="text/css" /> </head> @@ -16,10 +17,10 @@ <td align="left" valign="middle"><div class="pageTitle">Galaxy${brand}</div></td> <td align="right" valign="middle"> - Info: <a href="${bugs_email}">report bugs</a> - | <a target="_blank" href="${wiki_url}">wiki</a> - | <a target="_blank" href="${screencasts_url}">screencasts</a> - | <a target="_blank" href="${blog_url}">blog</a> + ${_('Info: ')}<a href="${bugs_email}">${_('report bugs')}</a> + | <a target="_blank" href="${wiki_url}">${_('wiki')}</a> + | <a target="_blank" href="${screencasts_url}">${_('screencasts')}</a> + | <a target="_blank" href="${blog_url}">${_('blog')}</a>      @@ -27,11 +28,11 @@ Logged in as ${t.user.email} %else: %if t.user: - Logged in as ${t.user.email}: <a target="galaxy_main" href="${h.url_for( controller='user', action='index' )}">manage</a> - | <a target="galaxy_main" href="${h.url_for( controller='user', action='logout' )}">logout</a> + ${_('Logged in as %s: ') % t.user.email}<a target="galaxy_main" href="${h.url_for( controller='user', action='index' )}">${_('manage')}</a> + | <a target="galaxy_main" href="${h.url_for( controller='user', action='logout' )}">${_('logout')}</a> %else: - Account: <a target="galaxy_main" href="${h.url_for( controller='user', action='create' )}">create</a> - | <a target="galaxy_main" href="${h.url_for( controller='user', action='login' )}">login</a> + ${_('Account: ')}<a target="galaxy_main" href="${h.url_for( controller='user', action='create' )}">${_('create')}</a> + | <a target="galaxy_main" href="${h.url_for( controller='user', action='login' )}">${_('login')}</a> %endif %endif   diff -r ab1b5bd846bc -r dc62ee52012e templates/root/tool_menu.mako --- a/templates/root/tool_menu.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/root/tool_menu.mako Tue Mar 17 22:46:47 2009 -0400 @@ -16,7 +16,7 @@ ## %if "[[" in tool.description and "]]" in tool.description: ## ${tool.description.replace( '[[', '<a href="link" target="galaxy_main">' % $tool.id ).replace( "]]", "</a>" ) %if tool.name: - <a id="link-${tool.id}" href="${link}" target="galaxy_main" minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${tool.name}</a> ${tool.description} + <a id="link-${tool.id}" href="${link}" target="galaxy_main" minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${_(tool.name)}</a> ${tool.description} %else: <a id="link-${tool.id}" href="${link}" target="galaxy_main" minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${tool.description}</a> %endif @@ -32,7 +32,7 @@ <div class="toolTitleNoSection"> %endif <% encoded_id = key.lstrip( 'workflow_' ) %> - <a id="link-${workflow.id}" href="${ h.url_for( controller='workflow', action='run', id=encoded_id, check_user=False )}" target="galaxy_main"}">${workflow.name}</a> + <a id="link-${workflow.id}" href="${ h.url_for( controller='workflow', action='run', id=encoded_id, check_user=False )}" target="galaxy_main">${workflow.name}</a> </div> </%def> @@ -48,8 +48,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <title>Galaxy Tools</title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>${_('Galaxy Tools')}</title> + <meta http-equiv="Content-Type" content="text/html; charset=${_('iso-8859-1')}" /> <link href="${h.url_for('/static/style/base.css')}" rel="stylesheet" type="text/css" /> <link href="${h.url_for('/static/style/tool_menu.css')}" rel="stylesheet" type="text/css" /> @@ -125,17 +125,17 @@ <div class="toolSectionPad"></div> <div class="toolSectionPad"></div> <div class="toolSectionTitle" id="title_XXinternalXXworkflow"> - <span>Workflow <i>(beta)</i></span> + <span>${_('Workflow')} <i>(beta)</i></span> </div> <div id="XXinternalXXworkflow" class="toolSectionBody"> <div class="toolSectionBg"> <div class="toolTitle"> - <a href="${h.url_for( controller='workflow', action='index' )}" target="galaxy_main">Manage</a> workflows + <a href="${h.url_for( controller='workflow', action='index' )}" target="galaxy_main">${_('Manage')}</a> ${_('workflows')} </div> %if t.user: %for m in t.user.stored_workflow_menu_entries: <div class="toolTitle"> - <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(m.stored_workflow_id) )}" target="galaxy_main">${m.stored_workflow.name}</a> + <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(m.stored_workflow_id) )}" target="galaxy_main">${_(m.stored_workflow.name)}</a> </div> %endfor %endif diff -r ab1b5bd846bc -r dc62ee52012e templates/user/index.mako --- a/templates/user/index.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/user/index.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,19 +1,19 @@ <%inherit file="/base.mako"/> -<%def name="title()">Account settings</%def> +<%def name="title()">${_('Account settings')}</%def> -<h1>Account settings</h1> +<h1>${_('Account settings')}</h1> %if user: - <p>You are currently logged in as ${user.email}.</p> + <p>${_('You are currently logged in as %s.') % user.email}</p> <ul> - <li><a href="${h.url_for( action='change_password' )}">Change your password</a></li> - <li><a href="${h.url_for( action='change_email' )}">Update your email address</a></li> - <li><a href="${h.url_for( action='logout' )}">Logout</a></li> + <li><a href="${h.url_for( action='change_password' )}">${_('Change your password')}</a></li> + <li><a href="${h.url_for( action='change_email' )}">${_('Update your email address')}</a></li> + <li><a href="${h.url_for( action='logout' )}">${_('Logout')}</a></li> </ul> %else: - <p>You are currently not logged in.</p> + <p>${n_('You are currently not logged in.')}</p> <ul> - <li><a href="${h.url_for( action='login' )}">Login</li> - <li><a href="${h.url_for( action='create' )}">Create new account</a></li> + <li><a href="${h.url_for( action='login' )}">${_('Login')}</li> + <li><a href="${h.url_for( action='create' )}">${_('Create new account')}</a></li> </ul> %endif \ No newline at end of file diff -r ab1b5bd846bc -r dc62ee52012e templates/workflow/build_from_current_history.mako --- a/templates/workflow/build_from_current_history.mako Sun Mar 08 14:25:19 2009 -0400 +++ b/templates/workflow/build_from_current_history.mako Tue Mar 17 22:46:47 2009 -0400 @@ -1,3 +1,4 @@ +<% _ = t.gettext %>  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -49,7 +50,7 @@ </table> %if disabled: <hr> - <div><input type="checkbox" name="dataset_ids" value="${data.hid}" checked="true" />Treat as input dataset</div> + <div><input type="checkbox" name="dataset_ids" value="${data.hid}" checked="true" />${_('Treat as input dataset')}</div> %endif </div> </%def> @@ -67,17 +68,17 @@ <form method="post" action="${h.url_for()}"> <div class='form-row'> - <label>Workflow name</label> + <label>${_('Workflow name')}</label> <input name="workflow_name" type="text" value="Workflow constructed from history '${history.name}'" size="60"/> </div> -<p><input type="submit" value="Create Workflow" /></p> +<p><input type="submit" value="${_('Create Workflow')}" /></p> <table border="0" cellspacing="0"> <tr> - <th style="width: 47.5%">Tool</th> + <th style="width: 47.5%">${_('Tool')}</th> <th style="width: 5%"></th> - <th style="width: 47.5%">History items created</th> + <th style="width: 47.5%">${_('History items created')}</th> </tr> %for job, datasets in jobs.iteritems(): diff -r ab1b5bd846bc -r dc62ee52012e test/functional/__init__.py --- a/test/functional/__init__.py Sun Mar 08 14:25:19 2009 -0400 +++ b/test/functional/__init__.py Tue Mar 17 22:46:47 2009 -0400 @@ -25,6 +25,7 @@ default_galaxy_test_host = "localhost" default_galaxy_test_port = "9999" +default_galaxy_locales = 'en' galaxy_test_file_dir = "test-data" server = None app = None @@ -35,6 +36,8 @@ galaxy_test_host = os.environ.get( 'GALAXY_TEST_HOST', default_galaxy_test_host ) galaxy_test_port = os.environ.get( 'GALAXY_TEST_PORT', default_galaxy_test_port ) + if 'HTTP_ACCEPT_LANGUAGE' not in os.environ: + os.environ['HTTP_ACCEPT_LANGUAGE'] = default_galaxy_locales start_server = 'GALAXY_TEST_EXTERNAL' not in os.environ

1 0

[hg] galaxy 1738: Modified help for \"get Indels\" tool, and mad...
by Greg Von Kuster 08 Mar '09

08 Mar '09

details: http://www.bx.psu.edu/hg/galaxy/rev/ab1b5bd846bc changeset: 1738:ab1b5bd846bc user: guru date: Sun Mar 08 14:25:19 2009 -0400 description: Modified help for \"get Indels\" tool, and made some small changes to the perl script. 2 file(s) affected in this change: tools/regVariation/getIndels_3way.xml tools/regVariation/parseMAF_smallIndels.pl diffs (312 lines): diff -r 0c77238cb1ba -r ab1b5bd846bc tools/regVariation/getIndels_3way.xml --- a/tools/regVariation/getIndels_3way.xml Thu Mar 05 13:02:17 2009 -0500 +++ b/tools/regVariation/getIndels_3way.xml Sun Mar 08 14:25:19 2009 -0400 @@ -1,4 +1,4 @@ -<tool id="indels_3way" name="Fetch Indels" version="1.0.1"> +<tool id="indels_3way" name="Fetch Indels" version="1.0.2"> <description> from 3-way alignments</description> <command interpreter="perl"> parseMAF_smallIndels.pl $input1 $out_file1 $outgroup @@ -30,7 +30,14 @@ **What it does** -This tool estimates the indel type and length for each of the 3-way alignments in the input MAF file. +This tool consists of the first module from the computational pipeline to identify indels as described in Kvikstad et al., 2007. Note that the generated output does not include subsequent filtering steps. + +Deletions in a particular species are identified as one or more consecutive gap columns within an alignment block, given that the orthologous positions in the other two species contain nucleotides of +equal length. +Similarly, insertions in a particular species are identified as one or more consecutive nucleotide columns within an alignment block, given that the orthologous positions in the other two +species contain gaps. + +*Kvikstad E. M. et al. (2007). A Macaques-Eye View of Human Insertions and Deletions: Differences in Mechanisms. PLoS Computational Biology 3(9):e176* ----- diff -r 0c77238cb1ba -r ab1b5bd846bc tools/regVariation/parseMAF_smallIndels.pl --- a/tools/regVariation/parseMAF_smallIndels.pl Thu Mar 05 13:02:17 2009 -0500 +++ b/tools/regVariation/parseMAF_smallIndels.pl Sun Mar 08 14:25:19 2009 -0400 @@ -163,7 +163,7 @@ sub get_indels_within_block{ my (@sequences) = @_; my $line1 = my $line2 = my $line3 = ""; - my @line1 = my @line2 = my @line3 = (); + my @line1 = my @line2 = my @line3 = (); my $score = 0; my $start1 = my $align_length1 = my $end1 = my $seq_length1 = 0; my $start2 = my $align_length2 = my $end2 = my $seq_length2 = 0; @@ -182,7 +182,7 @@ my @array_return = (); my $test1 = 0; my $line1_stat = my $line2_stat = my $line3_stat = ""; - + # process 3-way blocks only if (scalar(@sequences) == 3){ $line1 = $sequences[0]; @@ -194,143 +194,128 @@ # check order of sequences and assign uniformly seq1= human, seq2 = chimp, seq3 = macaque if ($line1 =~ m/$outgroup/){ $line1_stat = "out"; - $line2_stat = "in"; - $line3_stat = "in";} + $line2=~ s/^\s*//; + $line2 =~ s/\s+/\t/g; + @line2 = split(/\t/, $line2); + if (($ingroup1 eq "") || ($line2[1] =~ m/$ingroup1/)){ + $line2_stat = "in1"; + $line3_stat = "in2"; + } + else{ + $line3_stat = "in1"; + $line2_stat = "in2"; } + } elsif ($line2 =~ m/$outgroup/){ $line2_stat = "out"; - $line1_stat = "in"; - $line3_stat = "in";} + $line1=~ s/^\s*//; + $line1 =~ s/\s+/\t/g; + @line1 = split(/\t/, $line1); + if (($ingroup1 eq "") || ($line1[1] =~ m/$ingroup1/)){ + $line1_stat = "in1"; + $line3_stat = "in2"; + } + else{ + $line3_stat = "in1"; + $line1_stat = "in2"; } + } elsif ($line3 =~ m/$outgroup/){ $line3_stat = "out"; - $line1_stat = "in"; - $line2_stat = "in";} + $line1=~ s/^\s*//; + $line1 =~ s/\s+/\t/g; + @line1 = split(/\t/, $line1); + if (($ingroup1 eq "") || ($line1[1] =~ m/$ingroup1/)){ + $line1_stat = "in1"; + $line2_stat = "in2"; + } + else{ + $line2_stat = "in1"; + $line1_stat = "in2"; } + } #print "# l1 = $line1_stat\n"; #print "# l2 = $line2_stat\n"; #print "# l3 = $line3_stat\n"; - - if ($line1_stat eq "in"){ - $line1=~ s/^\s*//; - $line1 =~ s/\s+/\t/g; - @line1 = split(/\t/, $line1); - $end1 =($line1[2]+$line1[3]-1); - $seq1 = $line1[1].":".$line1[3]; - $ingroup1 = (split(/\./, $seq1))[0]; - $start1 = $line1[2]; - $align_length1 = $line1[3]; - $orient1 = $line1[4]; - $seq_length1 = $line1[5]; - $sequence1 = $line1[6]; - $test1 = length($sequence1); - my $total_length1 = $test1+$start1; - my @array1 = ($start1,$end1,$orient1,$seq_length1); - ($start1_plus, $end1_plus) = convert_coords(@array1); - } - elsif ($line1_stat eq "out"){ - $line1=~ s/^\s*//; - $line1 =~ s/\s+/\t/g; - @line1 = split(/\t/, $line1); - $end3 =($line1[2]+$line1[3]-1); - $seq3 = $line1[1].":".$line1[3]; - $start3 = $line1[2]; - $align_length3 = $line1[3]; - $orient3 = $line1[4]; - $seq_length3 = $line1[5]; - $sequence3 = $line1[6]; - my $test3 = length($sequence3); - my $total_length3 = $test3+$start3; - my @array3 = ($start3,$end3,$orient3,$seq_length3); - ($start3_plus, $end3_plus) = convert_coords(@array3); - } - - if (($line1_stat eq "in") && ($line2_stat eq "in")){ - $line2=~ s/^\s*//; - $line2 =~ s/\s+/\t/g; - @line2 = split(/\t/, $line2); - $end2 =($line2[2]+$line2[3]-1); - $seq2 = $line2[1].":".$line2[3]; - $ingroup2 = (split(/\./, $seq2))[0]; - $start2 = $line2[2]; - $align_length2 = $line2[3]; - $orient2 = $line2[4]; - $seq_length2 = $line2[5]; - $sequence2 = $line2[6]; - my $test2 = length($sequence2); - my $total_length2 = $test2+$start2; - my @array2 = ($start2,$end2,$orient2,$seq_length2); - ($start2_plus, $end2_plus) = convert_coords(@array2); - } - elsif (($line1_stat eq "in") && ($line2_stat eq "out")){ - $line2=~ s/^\s*//; - $line2 =~ s/\s+/\t/g; - @line2 = split(/\t/, $line2); - $end3 =($line2[2]+$line2[3]-1); - $seq3 = $line2[1].":".$line2[3]; - $start3 = $line2[2]; - $align_length3 = $line2[3]; - $orient3 = $line2[4]; - $seq_length3 = $line2[5]; - $sequence3 = $line2[6]; - my $test3 = length($sequence3); - my $total_length3 = $test3+$start3; - my @array3 = ($start3,$end3,$orient3,$seq_length3); - ($start3_plus, $end3_plus) = convert_coords(@array3); - } - elsif ($line1_stat eq "out"){ - $line2=~ s/^\s*//; - $line2 =~ s/\s+/\t/g; - @line2 = split(/\t/, $line2); - $end1 =($line2[2]+$line2[3]-1); - $seq1 = $line2[1].":".$line2[3]; - $ingroup1 = (split(/\./, $seq1))[0]; - $start1 = $line2[2]; - $align_length1 = $line2[3]; - $orient1 = $line2[4]; - $seq_length1 = $line2[5]; - $sequence1 = $line2[6]; - $test1 = length($sequence1); - my $total_length1 = $test1+$start1; - my @array1 = ($start1,$end1,$orient1,$seq_length1); - ($start1_plus, $end1_plus) = convert_coords(@array1); - } + my $linei1 = my $linei2 = my $lineo = ""; + my @linei1 = my @linei2 = my @lineo = (); - if ((($line1_stat eq "in") or ($line2_stat eq "in")) && ($line3_stat eq "in")){ - $line3=~ s/^\s*//; - $line3 =~ s/\s+/\t/g; - @line3 = split(/\t/, $line3); - $end2 =($line3[2]+$line3[3]-1); - $seq2 = $line3[1].":".$line3[3]; - $ingroup2 = (split(/\./, $seq2))[0]; - $start2 = $line3[2]; - $align_length2 = $line3[3]; - $orient2 = $line3[4]; - $seq_length2 = $line3[5]; - $sequence2 = $line3[6]; - my $test2 = length($sequence2); - my $total_length2 = $test2+$start2; - my @array2 = ($start2,$end2,$orient2,$seq_length2); - ($start2_plus, $end2_plus) = convert_coords(@array2); - } - elsif ($line3_stat eq "out"){ - $line3=~ s/^\s*//; - $line3 =~ s/\s+/\t/g; - @line3 = split(/\t/, $line3); - $end3 =($line3[2]+$line3[3]-1); - $seq3 = $line3[1].":".$line3[3]; - $start3 = $line3[2]; - $align_length3 = $line3[3]; - $orient3 = $line3[4]; - $seq_length3 = $line3[5]; - $sequence3 = $line3[6]; - my $test3 = length($sequence3); - my $total_length3 = $test3+$start3; - my @array3 = ($start3,$end3,$orient3,$seq_length3); - ($start3_plus, $end3_plus) = convert_coords(@array3); - } - - - - #print "# l1 = $ingroup1\n"; + if ($line1_stat eq "out"){ + $lineo = $line1; + } + elsif ($line1_stat eq "in1"){ + $linei1 = $line1; + } + else{ + $linei2 = $line1; + } + + if ($line2_stat eq "out"){ + $lineo = $line2; + } + elsif ($line2_stat eq "in1"){ + $linei1 = $line2; + } + else{ + $linei2 = $line2; + } + + if ($line3_stat eq "out"){ + $lineo = $line3; + } + elsif ($line3_stat eq "in1"){ + $linei1 = $line3; + } + else{ + $linei2 = $line3; + } + + $linei1=~ s/^\s*//; + $linei1 =~ s/\s+/\t/g; + @linei1 = split(/\t/, $linei1); + $end1 =($linei1[2]+$linei1[3]-1); + $seq1 = $linei1[1].":".$linei1[3]; + $ingroup1 = (split(/\./, $seq1))[0]; + $start1 = $linei1[2]; + $align_length1 = $linei1[3]; + $orient1 = $linei1[4]; + $seq_length1 = $linei1[5]; + $sequence1 = $linei1[6]; + $test1 = length($sequence1); + my $total_length1 = $test1+$start1; + my @array1 = ($start1,$end1,$orient1,$seq_length1); + ($start1_plus, $end1_plus) = convert_coords(@array1); + + $linei2=~ s/^\s*//; + $linei2 =~ s/\s+/\t/g; + @linei2 = split(/\t/, $linei2); + $end2 =($linei2[2]+$linei2[3]-1); + $seq2 = $linei2[1].":".$linei2[3]; + $ingroup2 = (split(/\./, $seq2))[0]; + $start2 = $linei2[2]; + $align_length2 = $linei2[3]; + $orient2 = $linei2[4]; + $seq_length2 = $linei2[5]; + $sequence2 = $linei2[6]; + my $test2 = length($sequence2); + my $total_length2 = $test2+$start2; + my @array2 = ($start2,$end2,$orient2,$seq_length2); + ($start2_plus, $end2_plus) = convert_coords(@array2); + + $lineo=~ s/^\s*//; + $lineo =~ s/\s+/\t/g; + @lineo = split(/\t/, $lineo); + $end3 =($lineo[2]+$lineo[3]-1); + $seq3 = $lineo[1].":".$lineo[3]; + $start3 = $lineo[2]; + $align_length3 = $lineo[3]; + $orient3 = $lineo[4]; + $seq_length3 = $lineo[5]; + $sequence3 = $lineo[6]; + my $test3 = length($sequence3); + my $total_length3 = $test3+$start3; + my @array3 = ($start3,$end3,$orient3,$seq_length3); + ($start3_plus, $end3_plus) = convert_coords(@array3); + + #print "# l1 = $ingroup1\n"; #print "# l2 = $ingroup2\n"; #print "# l3 = $outgroup\n"; @@ -592,7 +577,7 @@ } for ($counter3 = 0; $counter3 < @seq2_insert_startOnly; $counter3++){ - $final_line3 = join("\t",($seq2_insert_startOnly[$counter3],$seq2_insert_lengths[$counter3])); + $final_line3 = join("\t",($seq2_insert_startOnly[$counter3],$seq2_insert_lengths[$counter3])); push(@final3,$final_line3); }

1 0

[hg] galaxy 1736: Quick fix for Wiggle.set_meta(). No longer sca...
by Greg Von Kuster 08 Mar '09

08 Mar '09

details: http://www.bx.psu.edu/hg/galaxy/rev/082c6cf528bf changeset: 1736:082c6cf528bf user: Dan Blankenberg <dan(a)bx.psu.edu> date: Wed Mar 04 11:57:20 2009 -0500 description: Quick fix for Wiggle.set_meta(). No longer scans the entire file when using floating point data values or when contents are BED or variableStep. 1 file(s) affected in this change: lib/galaxy/datatypes/interval.py diffs (21 lines): diff -r 9fb93cfc2449 -r 082c6cf528bf lib/galaxy/datatypes/interval.py --- a/lib/galaxy/datatypes/interval.py Thu Feb 19 16:25:05 2009 -0500 +++ b/lib/galaxy/datatypes/interval.py Wed Mar 04 11:57:20 2009 -0500 @@ -715,12 +715,16 @@ if line and not line.startswith( '#' ): elems = line.split( '\t' ) try: - int( elems[0] ) + float( elems[0] ) #"Wiggle track data values can be integer or real, positive or negative values" break except: + do_break = False for str in data.col1_startswith: if elems[0].lower().startswith(str): + do_break = True break + if do_break: + break Tabular.set_meta( self, dataset, overwrite = overwrite, skip = i ) def sniff( self, filename ):

1 0

[hg] galaxy 1737: Adding a tiny fix to scatter plot tool.
by Greg Von Kuster 08 Mar '09

08 Mar '09

details: http://www.bx.psu.edu/hg/galaxy/rev/0c77238cb1ba changeset: 1737:0c77238cb1ba user: guru date: Thu Mar 05 13:02:17 2009 -0500 description: Adding a tiny fix to scatter plot tool. 1 file(s) affected in this change: tools/plotting/scatterplot.py diffs (21 lines): diff -r 082c6cf528bf -r 0c77238cb1ba tools/plotting/scatterplot.py --- a/tools/plotting/scatterplot.py Wed Mar 04 11:57:20 2009 -0500 +++ b/tools/plotting/scatterplot.py Thu Mar 05 13:02:17 2009 -0500 @@ -25,7 +25,7 @@ first_invalid_line = 0 invalid_value = '' invalid_column = 0 - + i = 0 for i, line in enumerate( file( in_fname ) ): valid = True line = line.rstrip( '\r\n' ) @@ -67,7 +67,7 @@ except Exception, exc: stop_err( "%s" %str( exc ) ) else: - stop_err( "All values in both columns %s and %s are non-numeric." % ( sys.argv[3], sys.argv[4] ) ) + stop_err( "All values in both columns %s and %s are non-numeric or empty." % ( sys.argv[3], sys.argv[4] ) ) print "Scatter plot on columns %s, %s. " % ( sys.argv[3], sys.argv[4] ) if skipped_lines > 0:

1 0

[hg] galaxy 1735: Fix for displaying a history's activatable dat...
by Greg Von Kuster 19 Feb '09

19 Feb '09

details: http://www.bx.psu.edu/hg/galaxy/rev/9fb93cfc2449 changeset: 1735:9fb93cfc2449 user: Greg Von Kuster <greg(a)bx.psu.edu> date: Thu Feb 19 16:25:05 2009 -0500 description: Fix for displaying a history's activatable datasets. 1 file(s) affected in this change: templates/root/history.mako diffs (26 lines): diff -r dc753c56c745 -r 9fb93cfc2449 templates/root/history.mako --- a/templates/root/history.mako Fri Feb 06 13:32:44 2009 -0500 +++ b/templates/root/history.mako Thu Feb 19 16:25:05 2009 -0500 @@ -248,13 +248,20 @@ <%namespace file="history_common.mako" import="render_dataset" /> -%if ( show_deleted and not history.activatable_datasets ) or ( not show_deleted and not history.active_datasets ): +<% + activatable_datasets = [] + for hda in history.datasets: + if not hda.dataset.purged: + activatable_datasets.append( hda ) +%> + +%if ( show_deleted and not activatable_datasets ) or ( not show_deleted and not history.active_datasets ): <div class="infomessagesmall" id="emptyHistoryMessage"> %else: <% if show_deleted: #all datasets - datasets_to_show = history.activatable_datasets + datasets_to_show = activatable_datasets else: #active (not deleted) datasets_to_show = history.active_datasets

1 0

[hg] galaxy 1734: Have DataMetaFilter in dynamic_options.py retu...
by Greg Von Kuster 19 Feb '09

19 Feb '09

details: http://www.bx.psu.edu/hg/galaxy/rev/dc753c56c745 changeset: 1734:dc753c56c745 user: Dan Blankenberg <dan(a)bx.psu.edu> date: Fri Feb 06 13:32:44 2009 -0500 description: Have DataMetaFilter in dynamic_options.py return a list of UnvalidatedValues when the referenced metadata value is not set. 2 file(s) affected in this change: lib/galaxy/tools/parameters/basic.py lib/galaxy/tools/parameters/dynamic_options.py diffs (40 lines): diff -r a4214de3752e -r dc753c56c745 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py Tue Feb 03 18:34:27 2009 -0500 +++ b/lib/galaxy/tools/parameters/basic.py Fri Feb 06 13:32:44 2009 -0500 @@ -485,8 +485,12 @@ else: return self.static_options def get_legal_values( self, trans, other_values ): + def _get_UnvalidatedValue_value( value ): + if isinstance( value, UnvalidatedValue ): + return value.value + return value if self.options: - return set( v for _, v, _ in self.options.get_options( trans, other_values ) ) + return map( _get_UnvalidatedValue_value, set( v for _, v, _ in self.options.get_options( trans, other_values ) ) ) elif self.dynamic_options: return set( v for _, v, _ in eval( self.dynamic_options, self.tool.code_namespace, other_values ) ) else: @@ -511,6 +515,9 @@ field = form_builder.SelectField( self.name, self.multiple, self.display, self.refresh_on_change ) options = self.get_options( trans, other_values ) for text, optval, selected in options: + if isinstance( optval, UnvalidatedValue ): + optval = optval.value + text = "%s (unvalidated)" % text if value: selected = ( optval in value ) field.add_option( text, optval, selected ) diff -r a4214de3752e -r dc753c56c745 lib/galaxy/tools/parameters/dynamic_options.py --- a/lib/galaxy/tools/parameters/dynamic_options.py Tue Feb 03 18:34:27 2009 -0500 +++ b/lib/galaxy/tools/parameters/dynamic_options.py Fri Feb 06 13:32:44 2009 -0500 @@ -108,7 +108,8 @@ if not isinstance( ref, self.dynamic_option.tool_param.tool.app.model.HistoryDatasetAssociation ): return [] #not a valid dataset meta_value = ref.metadata.get( self.key, None ) - assert meta_value is not None, "Required metadata value '%s' not found in referenced dataset" % self.key + if meta_value is None: #assert meta_value is not None, "Required metadata value '%s' not found in referenced dataset" % self.key + return [ ( disp_name, basic.UnvalidatedValue( optval ), selected ) for disp_name, optval, selected in options ] if self.column is not None: rval = []

1 0

[svn] [2778] Typo
by nate＠bx.psu.edu 18 Feb '09

18 Feb '09

Revision: 2778 Author: nate Date: 2009-02-18 16:19:31 -0500 (Wed, 18 Feb 2009) Log Message: ----------- Typo Modified Paths: -------------- dependencies/taxonomy2tree/taxonomy2tree.c dependencies/tree2PS-fast/tree2ps.c Modified: dependencies/taxonomy2tree/taxonomy2tree.c =================================================================== --- dependencies/taxonomy2tree/taxonomy2tree.c 2009-02-18 21:12:38 UTC (rev 2777) +++ dependencies/taxonomy2tree/taxonomy2tree.c 2009-02-18 21:19:31 UTC (rev 2778) @@ -8,7 +8,7 @@ #include <ctype.h> #ifndef __APPLE__ -#define isnumber (c) ( (c>='0') && (c<='9')) +#define isnumber(c) ( (c>='0') && (c<='9')) #endif #define DEFAULT_STRING_ALLOC 16L Modified: dependencies/tree2PS-fast/tree2ps.c =================================================================== --- dependencies/tree2PS-fast/tree2ps.c 2009-02-18 21:12:38 UTC (rev 2777) +++ dependencies/tree2PS-fast/tree2ps.c 2009-02-18 21:19:31 UTC (rev 2778) @@ -8,7 +8,7 @@ #include <ctype.h> #ifndef __APPLE__ -#define isnumber (c) ( (c>='0') && (c<='9')) +#define isnumber(c) ( (c>='0') && (c<='9')) #endif #define DEFAULT_STRING_ALLOC 16L

1 0

[svn] [2777] Make taxonomy tools compile without changing the source
by nate＠bx.psu.edu 18 Feb '09

18 Feb '09

Revision: 2777 Author: nate Date: 2009-02-18 16:12:38 -0500 (Wed, 18 Feb 2009) Log Message: ----------- Make taxonomy tools compile without changing the source Modified Paths: -------------- dependencies/taxBuilder/tb.readme dependencies/taxonomy2tree/t2t.readme dependencies/taxonomy2tree/taxonomy2tree.c dependencies/tree2PS-fast/t2ps.readme dependencies/tree2PS-fast/tree2ps.c Modified: dependencies/taxBuilder/tb.readme =================================================================== --- dependencies/taxBuilder/tb.readme 2009-02-05 15:19:08 UTC (rev 2776) +++ dependencies/taxBuilder/tb.readme 2009-02-18 21:12:38 UTC (rev 2777) @@ -5,17 +5,9 @@ $gcc -o taxBuilder -fast avl.c main.c On Linux: +$gcc -o taxBuilder -O3 avl.c main.c -Insert the following near the top of main.c - - #define isnumber (c) ( (c>='0') && (c<='9')) - -Replace -fast with -O3 (the letter 'O'): - - $gcc -o taxBuilder -O3 avl.c main.c - INSTALL ======= -Place the binary into a directory that is listed in setup_paths.sh script located in the root of Galaxy installation - +Place the binary into a directory that is in your Galaxy user's $PATH. Modified: dependencies/taxonomy2tree/t2t.readme =================================================================== --- dependencies/taxonomy2tree/t2t.readme 2009-02-05 15:19:08 UTC (rev 2776) +++ dependencies/taxonomy2tree/t2t.readme 2009-02-18 21:12:38 UTC (rev 2777) @@ -5,18 +5,9 @@ $gcc -o taxonomy2tree -fast avl.c taxonomy2tree.c On Linux: +$gcc -o taxonomy2tree -O3 avl.c taxonomy2tree.c -Insert the following near the top of taxonomy2tree.c - - #define isnumber (c) ( (c>='0') && (c<='9')) - -Replace -fast with -O3 (the letter 'O'): - - $gcc -o taxonomy2tree -O3 avl.c taxonomy2tree.c - INSTALL ======= -Place the binary into a directory that is listed in setup_paths.sh script located in the root of Galaxy installation - - +Place the binary into a directory that is in your Galaxy user's $PATH. Modified: dependencies/taxonomy2tree/taxonomy2tree.c =================================================================== --- dependencies/taxonomy2tree/taxonomy2tree.c 2009-02-05 15:19:08 UTC (rev 2776) +++ dependencies/taxonomy2tree/taxonomy2tree.c 2009-02-18 21:12:38 UTC (rev 2777) @@ -7,6 +7,10 @@ #include <time.h> #include <ctype.h> +#ifndef __APPLE__ +#define isnumber (c) ( (c>='0') && (c<='9')) +#endif + #define DEFAULT_STRING_ALLOC 16L #define NUMBER_OF_FIELDS 24 #define NUMBER_OF_TAX_FIELDS 22 Modified: dependencies/tree2PS-fast/t2ps.readme =================================================================== --- dependencies/tree2PS-fast/t2ps.readme 2009-02-05 15:19:08 UTC (rev 2776) +++ dependencies/tree2PS-fast/t2ps.readme 2009-02-18 21:12:38 UTC (rev 2777) @@ -5,18 +5,9 @@ $gcc -o tree2PS-fast -fast avl.c tree2ps.c On Linux: +$gcc -o tree2PS-fast -O3 avl.c tree2ps.c -Insert the following near the top of tree2ps.c - - #define isnumber (c) ( (c>='0') && (c<='9')) - -Replace -fast with -O3 (the letter 'O'): - - $gcc -o tree2PS-fast -O3 avl.c tree2ps.c - INSTALL ======= -Place the binary into a directory that is listed in setup_paths.sh script located in the root of Galaxy installation - - +Place the binary into a directory that is in your Galaxy user's $PATH. Modified: dependencies/tree2PS-fast/tree2ps.c =================================================================== --- dependencies/tree2PS-fast/tree2ps.c 2009-02-05 15:19:08 UTC (rev 2776) +++ dependencies/tree2PS-fast/tree2ps.c 2009-02-18 21:12:38 UTC (rev 2777) @@ -7,6 +7,10 @@ #include <time.h> #include <ctype.h> +#ifndef __APPLE__ +#define isnumber (c) ( (c>='0') && (c<='9')) +#endif + #define DEFAULT_STRING_ALLOC 16L static char *const Usage = "tree2ps newick_file ps_output_file max_tree_level (<=0 to show all levels) font_size (in 2-255, 8 is a good default) \nmax_leaves (<=0 to show all) count_duplicate_tax_id (0 or 1; with 0 multiple copies of the same taxid count as 1)\n";

1 0

Project structure
by Ayton Meintjes 16 Feb '09

16 Feb '09

Hi all I'd be interested to hear comments/advice on how to best deploy Galaxy locally with the following requirements: 1) Need to keep it in sync with central source repository. Or are there "stable releases" I should be using? I'm just updating from the svn tree. 2) Need to add own tools, data formats, tests etc. I have currently created my own repository which mirrors the galaxy structure. I then link to these files from the Galaxy folders. Tedious. Even just descriptions of your own setups (and problems) would help. thanks in advance!

2 1