Skip to content

Commit

Permalink
Merge pull request #4372 from GeoNode/ISSUE_4369
Browse files Browse the repository at this point in the history 
[Closes #4369] List of strings without trans tags and not listed in .po file
  • Loading branch information
@t-book
t-book committed Apr 27, 2019
2 parents fbd216a + 83386a0 commit 8f83a4d
Show file tree
Hide file tree
Showing 84 changed files with 10,029 additions and 3,514 deletions.
4 changes: 2 additions & 2 deletions geonode/base/templates/base/_resourcebase_info_panel.html
View file
Expand Up @@ -21,7 +21,7 @@
{{ bullet }}<br/><br/>
{% endfor %}
{% if resource.license.url %}
+ For more info see <a href="{{ resource.license.url }}">{{ resource.license.url }}</a>.
+ {% trans "For more info see" %} <a href="{{ resource.license.url }}">{{ resource.license.url }}</a>.
{% endif %}
</dd>

Expand Down Expand Up @@ -118,7 +118,7 @@
{{ bullet }}<br/><br/>
{% endfor %}
{% if resource.license.url %}
+ For more info see <a href="{{ resource.license.url }}">{{ resource.license.url }}</a>.
+ {% trans "For more info see" %} <a href="{{ resource.license.url }}">{{ resource.license.url }}</a>.
{% endif %}
</dd>
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions geonode/base/templates/base/batch_edit.html
View file
Expand Up @@ -5,7 +5,7 @@

{% block title %} {% trans "Batch Edit" %} - {{ block.super }} {% endblock %}

{% block body_class %}batch edit{% endblock %}
{% block body_class %}{% trans "batch edit" %}{% endblock %}

{% block body %}
<div class="page-header">
Expand All @@ -15,8 +15,8 @@ <h2 class="page-title">{% trans "Batch Edit" %}</h2>
{% csrf_token %}
{{ form|as_bootstrap }}
<div>
<a href="" class="btn btn-default">Cancel</a>
<input class="btn btn-primary" type="submit" value="Submit" />
<a href="" class="btn btn-default">{% trans "Cancel" %}</a>
<input class="btn btn-primary" type="submit" value="{% trans "Submit" %}" />
</div>
</form>
{% endblock %}
20 changes: 9 additions & 11 deletions geonode/catalogue/templates/geonode_metadata_full.html
View file
Expand Up @@ -39,7 +39,7 @@
<div class="page-header">
<div class="row">
<div >
<h4 >Resource Metadata</h4>
<h4 >{% trans "Resource Metadata" %}</h4>
<h2 class="page-title">{{ resource.title }}</h2>
</div>
</div>
Expand All @@ -48,10 +48,10 @@ <h2 class="page-title">{{ resource.title }}</h2>
<div class="row">
<div class="col-md-8">
<dl>
<dt>Thumbnail</dt>
<dt>{% trans "Thumbnail" %}</dt>
<dd><img class='items-list thumb' style="border: 1px solid #ccc;margin-top:10px;" src='{{resource.thumbnail_url}}' alt="{{ resource.title }}"></dd>

<dt>Resource ID</dt>
<dt>{% trans "Resource ID" %}</dt>
<dd>{{resource.uuid}}</dd>

<dt>{% trans "Title" %}</dt>
Expand Down Expand Up @@ -104,13 +104,13 @@ <h2 class="page-title">{{ resource.title }}</h2>
<dd>{{resource.language}}</dd>

<dt>{% trans "Temporal Extent" %}</dt>
<dt>Start </dt>
<dt>{% trans "Start" %} </dt>
{% if resource.temporal_extent_start %}
<dd> {{resource.temporal_extent_start}} </dd>
{% else %}
<dd> -- </dd>
{% endif %}
<dt>End </dt>
<dt>{% trans "End" %} </dt>
{% if resource.temporal_extent_end %}
<dd> {{resource.temporal_extent_end}} </dd>
{% else %}
Expand All @@ -128,7 +128,7 @@ <h2 class="page-title">{{ resource.title }}</h2>
<dd> -- </dd>
{% endif %}

<dt>Extent</dt>
<dt>{% trans "Extent" %}</dt>
<dd>
<ul class="nop">
<li>x0: {{resource.bbox_x0}}</li>
Expand All @@ -138,7 +138,7 @@ <h2 class="page-title">{{ resource.title }}</h2>
</ul>
</dd>

<dt>Spatial Reference System Identifier</dt>
<dt>{% trans "Spatial Reference System Identifier" %}</dt>
<dd>{{resource.srid}}</dd>

<dt>{% trans "Keywords" %}</dt>
Expand All @@ -158,20 +158,18 @@ <h2 class="page-title">{{ resource.title }}</h2>
{% endif %}

{% if "layer" in request.META.HTTP_REFERER|stringformat:"s" %}
<dt>Attributes</dt>
<dt>{% trans "Attributes" %}</dt>
<dd>
<table id="attr_table" class="table table-striped table-bordered table-condensed" style="margin-top:10px;font-size:14px;">
</table>
</dd>
<script type="text/javascript">
var content="{{extra_res_md.atrributes}}";
content = content.replace(/\&lt;/gi,"<").replace(/\&gt;/gi,">");
var headertab="<thead><tr><th style='width:25%'>Attribute name</th><th>Label</th><th>Description</th></tr></thead>";
var headertab="<thead><tr><th style='width:25%'>{% trans "Attribute name" %}</th><th>Label</th><th>{% trans "Description" %}</th></tr></thead>";
document.getElementById("attr_table").innerHTML=headertab+content;
</script>

{% endif %}

</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion geonode/client/templates/leaflet/maps/map_edit.html
View file
Expand Up @@ -74,7 +74,7 @@ <h4>Background layers</h4>
</div>
<div class="buttons">
<form role="form" id="save-map-form" action="{% url 'map_json' map.id %}" method="post">
<button class="btn btn-info" type="submit">Update</button>
<button class="btn btn-info" type="submit">{% trans "Update" %}</button>
</form>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions geonode/client/templates/leaflet/maps/map_view.html
View file
Expand Up @@ -52,7 +52,7 @@
<div class="col-md-3 pad0">
<div class="options-panel newmap">
<div class="form-group">
<label for="add_layer_select">Available layers</label>
<label for="add_layer_select">{% trans "Available layers" %}</label>
<select class="form-control" id="add_layer_select">
{% for layer in layers %}
<option value="{{ layer.alternate }}"
Expand All @@ -73,9 +73,9 @@ <h4>Background layers</h4>
</ul>
</div>
<div class="buttons">
<button class="btn btn-info" data-toggle="modal" data-target="#save-map-modal">Save</button>
{# <button class="btn btn-info">Load</button>#}
{# <button class="btn btn-info">Publish</button>#}
<button class="btn btn-info" data-toggle="modal" data-target="#save-map-modal">{% trans "Save" %}</button>
{# <button class="btn btn-info">{% trans "Load" %}</button>#}
{# <button class="btn btn-info">{% trans "Publish" %}</button>#}
</div>
</div>
</div>
Expand All @@ -93,26 +93,26 @@ <h4>Background layers</h4>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Save Map</h4>
<h4 class="modal-title">{% trans "Save Map" %}</h4>
</div>
<div class="modal-body">
<form role="form" id="save-map-form" action="{% url 'new_map_json' %}" method="post">
<div class="form-group">
<label for="map-title-input">Title:</label>
<label for="map-title-input">{% trans "Title" %}:</label>
<input name="map-title" type="text" class="form-control" id="map-title-input"
placeholder="Enter map title">
</div>
<div class="form-group">
<label for="map-abstract-input">Abstract:</label>
<label for="map-abstract-input">{% trans "Abstract" %}:</label>
<textarea name="map-abstract" class="form-control" rows="5" id="map-abstract-input"
placeholder="Enter map abstract"></textarea>
</div>
<div class="alert alert-danger" id="error-message-modal" hidden>
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<span id="error-message-content"></span>
</div>
<button type="submit" class="btn btn-default">Save</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-default">{% trans "Save" %}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
</form>
</div>
</div>
Expand Down
51 changes: 26 additions & 25 deletions geonode/contrib/monitoring/frontend/index.html
View file
@@ -1,3 +1,4 @@
{% load i18n %}
{% load static from staticfiles %}

<!DOCTYPE html>
Expand Down Expand Up @@ -36,7 +37,7 @@
}
</style>
<![endif]-->
<link rel="search" type="application/opensearchdescription+xml" href="{{ SITEURL }}catalogue/opensearch" title="GeoNode Search"/>
<link rel="search" type="application/opensearchdescription+xml" href="{{ SITEURL }}catalogue/opensearch" title="{% trans "GeoNode Search" %}"/>
</head>

<body class="monitoring">
Expand All @@ -48,16 +49,16 @@
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<i class="fa fa-navicon fa-lg"></i>
</button>
<a class="navbar-brand" href="{{ SITEURL }}">GeoNode</a>
<a class="navbar-brand" href="{{ SITEURL }}">{% trans "GeoNode" %}</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav toolbar">

<li id="nav_layers">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Data<i class="fa fa-angle-down fa-lg"></i></a>
<ul class="dropdown-menu">
<li><a href="{{ SITEURL }}layers/">Layers</a></li>
<li><a href="{{ SITEURL }}documents/">Documents</a></li>
<li><a href="{{ SITEURL }}layers/">{% trans "Layers" %}</a></li>
<li><a href="{{ SITEURL }}documents/">{% trans "Documents" %}</a></li>
</ul>
</li>
<li id="nav_maps">
Expand All @@ -66,9 +67,9 @@
<li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About<i class="fa fa-angle-down fa-lg"></i></a>
<ul class="dropdown-menu">
<li><a href="{{ SITEURL }}people/">People</a></li>
<li><a href="{{ SITEURL }}groups/">Groups</a></li>
<li><a href="{{ SITEURL }}groups/categories/">Group Categories</a></li>
<li><a href="{{ SITEURL }}people/">{% trans "People" %}</a></li>
<li><a href="{{ SITEURL }}groups/">{% trans "Groups" %}</a></li>
<li><a href="{{ SITEURL }}groups/categories/">{% trans "Group Categories" %}</a></li>
</ul>
</li>
</ul>
Expand All @@ -89,15 +90,15 @@
<!-- End of Navbar -->
<div class="alert alert-danger alert-dismissible" role="alert" id="ieflag" style="display:none">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h1>You are using an outdated browser that is not supported by GeoNode.</h1>
<p>Please use a <strong>modern browser</strong> like Mozilla Firefox, Google Chrome or Safari.</p>
<h1>{% trans "You are using an outdated browser that is not supported by GeoNode." %}</h1>
<p>{% trans "Please use a <strong>modern browser</strong> like Mozilla Firefox, Google Chrome or Safari." %}</p>
</div>
<div id="wrap">
<div class="container">
<div class="alert alert-warn" id="status-message" hidden="hidden">
<a class="close" onclick="$('.alert').hide()">×</a>
<strong><p id="status-message-text">Placeholder for status-message</p></strong>
<p id="status-message-text-body">Placeholder for status-message-body</p>
<strong><p id="status-message-text">{% trans "Placeholder for status-message" %}</p></strong>
<p id="status-message-text-body">{% trans "Placeholder for status-message-body" %}</p>
</div>
<div class="row">
<div class="col-md-8">
Expand All @@ -117,31 +118,31 @@ <h1>You are using an outdated browser that is not supported by GeoNode.</h1>
<div class="col-md-2">
<ul class="list-unstyled">
<li>Data</li>
<li><a href="{{ SITEURL }}layers/">Layers</a></li>
<li><a href="{{ SITEURL }}documents/">Documents</a></li>
<li><a href="{{ SITEURL }}layers/">{% trans "Layers" %}</a></li>
<li><a href="{{ SITEURL }}documents/">{% trans "Documents" %}</a></li>
</ul>
</div>
<div class="col-md-2">
<ul class="list-unstyled">
<li>Maps</li>
<li><a href="{{ SITEURL }}maps/">Explore Maps</a></li>
<li><a href="{{ SITEURL }}maps/">{% trans "Explore Maps" %}</a></li>
</ul>
</div>
<div class="col-md-2">
<ul class="list-unstyled">
<li>About</li>
<li><a href="{{ SITEURL }}people/">People</a></li>
<li><a href="{{ SITEURL }}groups/">Groups</a></li>
<li><a href="{{ SITEURL }}people/">{% trans "People" %}</a></li>
<li><a href="{{ SITEURL }}groups/">{% trans "Groups" %}</a></li>


</ul>
</div>
<div class="col-md-6 text-right">
<ul class="list-unstyled">
<li>Powered by <a href="http://geonode.org">GeoNode</a> <em>version {{ VERSION }}</em></li>
<li><a href="{{ SITEURL }}developer/">Developers</a> | <a href="{{ SITEURL }}about/">About</a><li>
<li>{% trans "Powered by" %} <a href="http://geonode.org">{% trans "GeoNode" %}</a> <em>{% trans "version" %} {{ VERSION }}</em></li>
<li><a href="{{ SITEURL }}developer/">{% trans "Developers" %}</a> | <a href="{{ SITEURL }}about/">{% trans "About" %}</a><li>
</ul>
<label class="hidden">Language</label>
<label class="hidden">{% trans "Language" %}</label>
<form class="form-inline" action="/i18n/setlang/" method="post">
<input type='hidden' name='csrfmiddlewaretoken' value='RkQFJyyuw8Jre2PwWXQBk55C8otvt9wM' />
<select class="col-md-6 pull-right" name="language" onchange="javascript:form.submit()">
Expand Down Expand Up @@ -282,26 +283,26 @@ <h1>You are using an outdated browser that is not supported by GeoNode.</h1>
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="myModalLabel">Sign in</h4>
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% trans "Close" %}</span></button>
<h4 class="modal-title" id="myModalLabel">{% trans "Sign in" %}</h4>
</div>
<form class="form-signin" role="form" action="/account/login/?next=/monitoring/" method="post">
<div class="modal-body">
<input type='hidden' name='csrfmiddlewaretoken' value='RkQFJyyuw8Jre2PwWXQBk55C8otvt9wM' />
<div class="form-group">
<label for="id_username" class="sr-only">Username:</label>
<label for="id_username" class="sr-only">{% trans "Username" %}:</label>
<input id="id_username" class="form-control" name="username" placeholder="Username" type="text" />
</div>
<div class="form-group">
<label for="id_password" class="sr-only">Password:</label>
<label for="id_password" class="sr-only">{% trans "Password" %}:</label>
<input id="id_password" class="form-control" name="password" placeholder="Password" type="password" />
</div>
<label class="checkbox">
<input type="checkbox" /> Remember Me
<input type="checkbox" /> {% trans "Remember Me" %}
</label>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary btn-block">Sign in</button>
<button type="submit" class="btn btn-primary btn-block">{% trans "Sign in" %}</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion geonode/contrib/monitoring/templates/monitoring/non_superuser.html
View file
Expand Up @@ -7,5 +7,5 @@

{% block body %}
{{ block.super }}
<h2>Only superusers can monitor performance</h2>
<h2>{% trans "Only superusers can monitor performance" %}</h2>
{% endblock %}
14 changes: 7 additions & 7 deletions geonode/documents/templates/documents/document_detail.html
View file
Expand Up @@ -20,7 +20,7 @@
{{ block.super }}
{% endblock %}

{% block body_class %}documents{% endblock %}
{% block body_class %}{% trans "documents" %}{% endblock %}

{% block body_outer %}

Expand All @@ -38,9 +38,9 @@ <h2>{{ resource.title }}</h2>
</a>
</div>
{% elif resource.doc_file %}
<p><a href="{% url "document_download" resource.id %}" target="_blank">Download the {{ resource }} document</a></p>
<p><a href="{% url "document_download" resource.id %}" target="_blank">{% trans "Download the" %} {{ resource }} {% trans "document" %}</a></p>
{% elif resource.doc_url %}
<p><a href="{{ resource.doc_url }}" target="_blank">Download the {{ resource }} document.</a> <small>({% trans 'External Resource' %})</small></p>
<p><a href="{{ resource.doc_url }}" target="_blank">{% trans "Download the" %} {{ resource }} {% trans "document" %}.</a> <small>({% trans 'External Resource' %})</small></p>
{% endif %}
{% endif %}

Expand Down Expand Up @@ -178,15 +178,15 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Download Metadata" %}</h4>
<div class="modal-body">
<div style="margin-bottom:20px">
<h5 class="modal-title" id="myModalLabel">
Full metadata
{% trans "Full metadata" %}
</h5>
<ul style="list-style: outside none none;padding: 0;">
<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> Text format </a></li>
<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> HTML format </a></li>
<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.txt"> {% trans "Text format" %} </a></li>
<li><a target="_blank" href="../catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"> {% trans "HTML format" %} </a></li>
</ul>
</div>
<h5 class="modal-title" id="myModalLabel">
Standard Metadata - XML format
{% trans "Standard Metadata - XML format" %}
</h5>
<ul style="list-style: outside none none;padding: 0;">
{% for link in metadata %}
Expand Down

0 comments on commit 8f83a4d

Please sign in to comment.