Commit d6f5f859 authored by Dannon Baker's avatar Dannon Baker
Browse files

Strip _ translation (i18n) from old mako templates

parent dbf3d967

lib/tool_shed/webapp/templates/message.mako

+1 −1
Original line number Diff line number Diff line
@@ -63,5 +63,5 @@ 
        if status not in ("danger", "info", "success", "warning"):

            status = "info"

    %>

    <div class="message mt-2 alert alert-${status}">${_(sanitize_html(msg))}</div>

    <div class="message mt-2 alert alert-${status}">${sanitize_html(msg)}</div>

</%def>

lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako

+12 −12
Original line number Diff line number Diff line
@@ -139,24 +139,24 @@ 
                <%

                    menu_options = []

                    menu_options.extend( [

                        [_('About Tool Shed'), app.config.get( "wiki_url", "https://galaxyproject.org/toolshed" ), "_blank" ],

                        [_('Support'), app.config.get( "support_url", "https://galaxyproject.org/support" ), "_blank" ],

                        [_('Videos'), app.config.get( "screencasts_url", "https://vimeo.com/galaxyproject" ), "_blank" ],

                        [_('How to Cite Tool Shed'), app.config.get( "citation_url", "https://galaxyproject.org/citing-galaxy" ), "_blank" ]

                        ['About Tool Shed', app.config.get( "wiki_url", "https://galaxyproject.org/toolshed" ), "_blank" ],

                        ['Support', app.config.get( "support_url", "https://galaxyproject.org/support" ), "_blank" ],

                        ['Videos', app.config.get( "screencasts_url", "https://vimeo.com/galaxyproject" ), "_blank" ],

                        ['How to Cite Tool Shed', app.config.get( "citation_url", "https://galaxyproject.org/citing-galaxy" ), "_blank" ]

                    ] )

                    tab( "help", _("Help"), None, menu_options=menu_options )

                    tab( "help", "Help", None, menu_options=menu_options )

                %>



                ## User tabs.

                <%

                    from markupsafe import escape

                    # Menu for user who is not logged in.

                    menu_options = [ [ _("Login"), h.url_for( controller='/user', action='login' ), "galaxy_main" ] ]

                    menu_options = [ [ "Login", h.url_for( controller='/user', action='login' ), "galaxy_main" ] ]

                    if app.config.allow_user_creation:

                        menu_options.append( [ _("Register"), h.url_for( controller='/user', action='create', cntrller='user' ), "galaxy_main" ] )

                        menu_options.append( [ "Register", h.url_for( controller='/user', action='create', cntrller='user' ), "galaxy_main" ] )

                    extra_class = "loggedout-only"

                    visible = ( trans.user == None )

                    tab( "user", _("User"), None, visible=visible, menu_options=menu_options )

                    tab( "user", "User", None, visible=visible, menu_options=menu_options )

                    # Menu for user who is logged in.

                    if trans.user:

                        email = escape( trans.user.email )
@@ -165,14 +165,14 @@ 
                    menu_options = [ [ 'Logged in as <span id="user-email">%s</span>' %  email ] ]

                    if app.config.use_remote_user:

                        if app.config.remote_user_logout_href:

                            menu_options.append( [ _('Logout'), app.config.remote_user_logout_href, "_top" ] )

                            menu_options.append( [ 'Logout', app.config.remote_user_logout_href, "_top" ] )

                    else:

                        menu_options.append( [ _('Preferences'), h.url_for( controller='/user', action='index', cntrller='user' ), "galaxy_main" ] )

                        menu_options.append( [ _('API Keys'), h.url_for( controller='/user', action='api_keys', cntrller='user' ), "galaxy_main" ] )

                        menu_options.append( [ 'Preferences', h.url_for( controller='/user', action='index', cntrller='user' ), "galaxy_main" ] )

                        menu_options.append( [ 'API Keys', h.url_for( controller='/user', action='api_keys', cntrller='user' ), "galaxy_main" ] )

                        logout_url = h.url_for( controller='/user', action='logout' )

                        menu_options.append( [ 'Logout', logout_url, "_top" ] )

                    if app.config.use_remote_user:

                        menu_options.append( [ _('Public Name'), h.url_for( controller='/user', action='edit_username', cntrller='user' ), "galaxy_main" ] )

                        menu_options.append( [ 'Public Name', h.url_for( controller='/user', action='edit_username', cntrller='user' ), "galaxy_main" ] )



                    extra_class = "loggedin-only"

                    visible = ( trans.user != None )

lib/tool_shed/webapp/templates/webapps/tool_shed/user/index.mako

+9 −9
Original line number Diff line number Diff line 
<%inherit file="/base.mako"/>



%if trans.user:

    <h2>${_('User preferences')}</h2>

    <h2>User preferences</h2>

    <p>You are currently logged in as ${trans.user.email|h}.</p>

    <ul>

        <li><a href="${h.url_for( controller='user', action='manage_user_info', cntrller=cntrller )}">${_('Manage your information')}</a></li>

        <li><a href="${h.url_for( controller='user', action='change_password', id=trans.app.security.encode_id(trans.user.id) )}">${_('Change your password')}</a></li>

        <li><a href="${h.url_for( controller='user', action='api_keys', cntrller=cntrller )}">${_('Manage your API keys')}</a></li>

        <li><a href="${h.url_for( controller='repository', action='manage_email_alerts', cntrller=cntrller )}">${_('Manage your email alerts')}</a></li>

        <li><a href="${h.url_for( controller='user', action='logout', logout_all=True )}" target="_top">${_('Logout')}</a> ${_('of all user sessions')}</li>

        <li><a href="${h.url_for( controller='user', action='manage_user_info', cntrller=cntrller )}">Manage your information</a></li>

        <li><a href="${h.url_for( controller='user', action='change_password', id=trans.app.security.encode_id(trans.user.id) )}">Change your password</a></li>

        <li><a href="${h.url_for( controller='user', action='api_keys', cntrller=cntrller )}">Manage your API keys</a></li>

        <li><a href="${h.url_for( controller='repository', action='manage_email_alerts', cntrller=cntrller )}">Manage your email alerts</a></li>

        <li><a href="${h.url_for( controller='user', action='logout', logout_all=True )}" target="_top">Logout</a> of all user sessions</li>

    </ul>

%else:

    %if not message:

        <p>${n_('You are currently not logged in.')}</p>

        <p>You are currently not logged in.</p>

    %endif

    <ul>

        <li><a href="${h.url_for( controller='user', action='login' )}">${_('Login')}</li>

        <li><a href="${h.url_for( controller='user', action='create', cntrller='user' )}">${_('Register')}</a></li>

        <li><a href="${h.url_for( controller='user', action='login' )}">Login</li>

        <li><a href="${h.url_for( controller='user', action='create', cntrller='user' )}">Register</a></li>

    </ul>

%endif

templates/message.mako

+1 −1
Original line number Diff line number Diff line
@@ -63,5 +63,5 @@ 
        if status not in ("danger", "info", "success", "warning"):

            status = "info"

    %>

    <div class="message mt-2 alert alert-${status}">${_(sanitize_html(msg))}</div>

    <div class="message mt-2 alert alert-${status}">${sanitize_html(msg)}</div>

</%def>

templates/webapps/galaxy/history/as_xml.mako

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
    %if show_deleted:

        %for data in history.activatable_datasets:

            <data id="${data.id}" hid="${data.hid}" name="${data.name}" state="${data.state}" dbkey="${data.dbkey}">

                ${_(data.blurb)}

                ${data.blurb}

            </data>

        %endfor

    %else:

        %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

    %endif