Commit 2f7e698a authored by Kedar A.'s avatar Kedar A. 💻

conflicts with commit of template trans resolved

parents 5cf2f2e7 da2de24d
......@@ -42,7 +42,7 @@
}
else
{ $('.invalid-captcha').empty();
$('.invalid-captcha').append("<labe style = 'color:red;'> invalid captcha Try Again !! </label>")
$('.invalid-captcha').append("<labe style = 'color:red;'> {% trans 'invalid captcha Try Again' %} !! </label>")
}
}
});
......
......@@ -80,12 +80,12 @@
{% endcomment %}
{% if node_id %}
{% trans var_placeholder as content %}
<!-- <input type="hidden" value="{#% check_existence_textObj_mobwrite node_id %#}"> -->
<textarea id="{{node_id|mongo_id}}" class="small-12 columns" name="{{var_name}}" placeholder="{{var_placeholder}}" value="{{var_value}}">{{var_value}}</textarea>
<textarea id="{{node_id|mongo_id}}" class="small-12 columns" name="{{var_name}}" placeholder="{% blocktrans %} {{content}} {% endblocktrans %}" value="{{var_value}}">{{var_value}}</textarea>
{% else %}
<textarea id="orgitdown_{{var_name}}" class="small-12 columns orgedit" name="{{var_name}}" placeholder="{{var_placeholder}}" value="{{var_value}}">{{var_value}}</textarea>
<textarea id="orgitdown_{{var_name}}" class="small-12 columns orgedit" name="{{var_name}}" placeholder="{% blocktrans %} {{content}} {% endblocktrans %}" value="{{var_value}}">{{var_value}}</textarea>
{% endif %}
<script>
......@@ -171,7 +171,7 @@ function internalImg(){
success: function(data) {
data1 = JSON.parse(data);
temp1=''
temp1 +='<h3>Add Internal Image:</h3><div><label>Image Description</label><input type="text" id="image_des_int" placeholder="Some description ..."><label>Width</label><input type="text" id="image_width_int" placeholder="Enter width in pixel eg.600..."></div>';
temp1 +="<h3>{% trans 'Add Internal Image' %}:</h3><div><label>{% trans 'Image' %} {% trans 'Description' %}</label><input type='text' id='image_des_int' placeholder='{% trans 'Some description' %} ...'><label>{% trans 'Width' %}</label><input type='text' id='image_width_int' placeholder='{% trans 'Enter width in pixel eg.600' %}...'></div>";
temp1 +='<label>URL</label><select id="img-select">'
for(i=0; i<data1.length; i++)
{temp1 += '<option value="'+data1[i].fname+'" id="'+data1[i]._id+'" name="checkedpic">'+data1[i].name+''+'<img src="'+data1[i].name+'">'+'</option>'
......@@ -238,29 +238,30 @@ $(".orgitdownButton.orgitdownButton10 a").click(function(){
<a class="close-reveal-modal">&#215;</a>
</div>
<div id="alert" class="reveal-modal small" data-reveal>
<p> citation has been inserted </p>
<p> {% trans 'citation has been inserted' %} </p>
<a class="close-reveal-modal">&#215;</a>
</div>
<div id="insert-pic" class="small reveal-modal" data-reveal>
<a class="close-reveal-modal">&#215;</a>
<h3>Add Internal/External Images:</h3>
<h3> {% trans 'Add Internal/External Images' %}:</h3>
<div>
<input type="radio" id="extimage" name="imginsert" onclick="externalImg()"><label>External</label>
<input type="radio" id="intimage" name="imginsert" onclick="internalImg()"><label>Internal</label>
<input type="radio" id="extimage" name="imginsert" onclick="externalImg()"><label>{% trans 'External' %}</label>
<input type="radio" id="intimage" name="imginsert" onclick="internalImg()"><label>{% trans 'Internal' %}</label>
</div>
</div>
<div id="int-img" class="small reveal-modal" data-reveal>
<a class="close-reveal-modal">&#215;</a>
<h3>Add External Image:</h3>
<h3>{% trans 'Add External Image' %}:</h3>
<div>
<label>Image Description</label>
<input type="text" id="image_des" placeholder="Some description ...">
<label>{% trans 'Image' %} {% trans 'Description' %}</label>
<input type="text" id="image_des" placeholder="{% trans 'Some description' %} ...">
<label>Width</label>
<input type="text" id="image_width" placeholder="Enter width in pixel eg.600...">
<input type="text" id="image_width" placeholder="{% trans 'Enter width in pixel eg.600' %}...">
<label>URL</label>
<input type="text" id="image_url" placeholder="Enter Image path eg. http:filename.jpg...">
<input type="text" id="image_url" placeholder="{% trans 'Enter Image path' %} {% trans 'eg' %}. http:filename.jpg...">
<!-- <button type="submit" id="insertimage" onclick="insertImg()"> Add Image</button> -->
<input type="button" id="insertimage" onclick="insertImg()" value="Add Image" class="button">
......
......@@ -62,7 +62,7 @@
<div class="row">
<div class="large-2 medium-4 columns "><h5><b>{% trans "Forum name:" %} </b></h5></div>
<div class="large-pull-4 large-6 medium-8 columns">
<input type="text" placeholder="Enter the name of forum here"
<input type="text" placeholder=" {% trans 'Enter the name of forum here' %}"
name="forum_name" id="forum_name">
<label id="message" style="display:none; color:red"></label>
......@@ -92,7 +92,7 @@
style="padding:0 1.65em 0 1.4em;">
<textarea id="orgitdown" name="content_org"
placeholder="Some description about forum ..."></textarea>
placeholder="{% trans 'Some description about forum' %} ..."></textarea>
<!-- <input type="hidden" id="nodes_list" value="{{nodes_list}}"> -->
<!-- <input type="button" id="save_edit_cont" class="button" value="Save"> -->
</div>
......@@ -104,7 +104,7 @@
<!-- <input type="submit" id="forum" value="Create Forum" style="display:none">
<input type="button" id="save_form" class="button expand" value="Create forum" onclick="saveforum()"> -->
<input type="submit" id="forum" class="button expand" value="Create forum">
<input type="submit" id="forum" class="button expand" value="{% trans 'Create forum' %}">
</div>
</div>
......@@ -203,7 +203,7 @@
if (nodes.indexOf(name) != -1)
{
$("#message").css("display", "block");
$("#message").text("Forum '"+ name +"' already exist. Please choose another name");
$("#message").text("{% trans 'Forum with same name already exist. Please choose another name' %}");
event.preventDefault();
}
else
......@@ -213,7 +213,7 @@
}
else{
$("#message").css("display", "block");
$("#message").text("Forum name cannot be empty.");
$("#message").text("{% trans 'Forum name cannot be empty' %}.");
event.preventDefault();
}
});
......
......@@ -65,7 +65,7 @@
<!-- orgitdown container -->
<div id="org" style="" class="reveal-modal small" data-reveal>
<!-- Reply : -->
<textarea id="orgitdownreps" name="content_org" placeholder="Enter your reply text here."></textarea>
<textarea id="orgitdownreps" name="content_org" placeholder="{% trans 'Enter your reply text here.'%}"></textarea>
<input data-id="{{ node.pk }}" type="button" value="Post" class="button expand reply-button" onclick="addReply($(this))">
<input type="file" id="uploaded-files" style="" value="" multiple>
<input type="hidden" id="prior-node" style="visibility:hidden" value="">
......@@ -148,7 +148,7 @@
else
{
// alert("To start discussion you need to login and be the member of this group.");
alert("Login to start discussion");
alert("{% trans 'Login to start discussion' %}");
}
}
else{
......@@ -196,7 +196,7 @@
else
{
// alert("To start discussion you need to login and be the member of this group.");
alert("Login to start discussion.");
alert(" {% trans 'Login to start discussion.' %} ");
}
}
else{
......@@ -211,12 +211,12 @@
var totalReplies = $("#replies-area div.disc-replies:visible").length;
if(totalReplies == 0)
{
$(".view-discussion span").fadeOut().fadeIn().html("Begin Discussion");
$("#create-discussion").text("Comment " + $("h1 span.node[itemprop]").text().trim());
$(".view-discussion span").fadeOut().fadeIn().html(" {% trans 'Begin Discussion' %}");
$("#create-discussion").text("{% trans 'Comment' %}" + $("h1 span.node[itemprop]").text().trim());
}
else
{
$(".view-discussion span").fadeOut().fadeIn().html("Join Discussion ("+totalReplies+")");
$(".view-discussion span").fadeOut().fadeIn().html("{% trans 'Join Discussion' %}("+totalReplies+")");
}
}
......@@ -246,11 +246,11 @@
+ "<label>" + data[6] + "</label></a></div>"
+ "<div class='small-9 columns'>"+ data[3] + filesContent +"</div></div>"
+ "<div class='row'><div class='small-8 columns'><small>"+ data[7] +"</small></div>"
+ "<div class='reply-btn small-2 columns' data-userid='"+ data[5] +"' onclick='deleteReply($(this))'>delete</div>"
+ "<div class='row'><div class='small-8 columns'><small>"+ data[7] + "</small></div>"
+ "<div class='reply-btn small-2 columns' data-userid='"+ data[5] +"' onclick='deleteReply($(this))'>{% trans 'delete' %}</div>"
+ "<div data-org-content='"
+ data[4] + "' onclick='openOrgEditor($(this))' data-id='"
+ data[1] + "' class='reply-btn text-right small-2 columns'> reply </div></div></div>"
+ data[1] + "' class='reply-btn text-right small-2 columns'>{% trans 'reply' %} </div></div></div>"
return htmlReply;
}
......@@ -328,7 +328,7 @@
}
else if( data[0] == "no_content" ){
alert("Please provide the reply content.")
alert("{% trans 'Please provide the reply content.' %}")
}
else { alert(data) }
}
......@@ -336,7 +336,7 @@
}
else // content is not provided
{
alert("Please provide the reply content.")
alert(" {% trans 'Please provide the reply content.' %}")
} // --- END of IF-ELSE
} // --- END of addReply()
......@@ -356,11 +356,11 @@
if(nodesToDeleteArr.length > 1)
{
deleteConfirm = confirm("Along with this reply, total of: " + nodesToDeleteArr.length + " replies would get deleted.\nClick 'OK' to delete. Else click on 'Cancel'");
deleteConfirm = confirm("{% trans 'Along with this reply, total of' %}: " + nodesToDeleteArr.length + "{% trans 'replies would get deleted.\nClick 'OK' to delete. Else click on 'Cancel'' %} ");
}
else
{
deleteConfirm = confirm("Are you sure to delete this reply ?\nClick 'OK' to delete.");
deleteConfirm = confirm("{% trans 'Are you sure to delete this reply ?\nClick 'OK' to delete.' %} ");
}
if(deleteConfirm)
......@@ -391,7 +391,7 @@
}
else
{
alert("To delete this reply, you need to be login and author of this reply.");
alert("{% trans 'To delete this reply, you need to be login and author of this reply.' %}");
}
}
......
......@@ -43,7 +43,7 @@
{% if drawer1 != "None" %}
<li class="price">
<input type="text" class="margin-0 search_items" id="{{widget_for}}_search" placeholder="Type atleast 3 characters to search"/>
<input type="text" class="margin-0 search_items" id="{{widget_for}}_search" placeholder="{% trans 'Type atleast 3 characters to search' %}"/>
</li>
<div class="push-3 searching" style="display:none;"><progress></progress></div>
......@@ -130,7 +130,7 @@
<!-- for << previous text -->
<li class="arrow">
<a class="next_prev" name="{{page_info.previous_page}}">&laquo; Previous</a>
<a class="next_prev" name="{{page_info.previous_page}}">&laquo; {% trans 'Previous' %}</a>
</li>
<!-- for page 1, page 2 and ... -->
......@@ -187,7 +187,7 @@
<!-- for text Next >> -->
<li class="arrow">
<a class="next_prev" name="{{page_info.next_page}}">Next &raquo;</a>
<a class="next_prev" name="{{page_info.next_page}}">{% trans 'Next' %} &raquo;</a>
</li>
{% endif %}
......@@ -279,7 +279,7 @@
<!-- <div class="small-7 columns text-right"> -->
{% if "Author" not in value.member_of_names_list %}
<div class="small-12 columns text-left" style="padding-top:3px">
<i class="posted-by">{{ value.member_of_names_list|join:', ' }} by <a class="user" href="{% url 'dashboard' value.created_by %}" data-gnow="">{{value.user_details_dict.created_by}}</a> on {{value.created_at|date:"j F Y"}} </i>
<i class="posted-by">{{ value.member_of_names_list|join:', ' }} {% trans 'by' %} <a class="user" href="{% url 'dashboard' value.created_by %}" data-gnow="">{{value.user_details_dict.created_by}}</a> {% trans 'on' %} {{value.created_at|date:"j F Y"}} </i>
</div>
{% endif %}
</div>
......@@ -303,14 +303,14 @@
<!-- End of Collection created on RHS -->
{% if is_RT == "RelationType" %}
<div id="move_list" class="text-center">
<input type='button' id='{{widget_for}}_move_all_right' value='Move ALL to Right' class='button round small'>
<input type='button' id='{{widget_for}}_move_all_left' value='Move ALL to Left' class='button round small'>
<input type='button' id='{{widget_for}}_move_all_right' value="{% trans 'Move ALL to Right' %}" class='button round small'>
<input type='button' id='{{widget_for}}_move_all_left' value="{% trans 'Move ALL to Left' %}" class='button round small'>
</div>
{% endif %}
{% if widget_for == "Group" %}
<div class="text-right">
<input type='button' id='{{widget_for}}_button' value='Save' class='button round small'>
<input type='button' id='{{widget_for}}_button' value="{% trans 'Save' %}" class='button round small'>
</div>
{% endif %}
......@@ -383,7 +383,7 @@
$("#{{widget_for}}_drawer1 li.selected-resource").removeClass("selected-resource");
if (selectedOpts.length == 0) {
alert("Nothing to move.");
alert("{% trans 'Nothing to move.' %}");
}
// $("#{{widget_for}}_drawer2").append($(selectedOpts).clone(true));
......@@ -416,7 +416,7 @@
$("#{{widget_for}}_drawer2 li.selected-resource").removeClass("selected-resource");
if (selectedOpts.length == 0) {
alert("Nothing to move.");
alert("{% trans 'Nothing to move.' %}");
}
$("#{{widget_for}}_drawer1").append($(selectedOpts).clone(true));
......@@ -585,7 +585,7 @@
$("#{{widget_for}}_move_all_left").click(function(event) {
var all_li_ele = $("#{{widget_for}}_drawer2 li")
if (all_li_ele.length == 0) {
alert("Nothing to move.");
alert("{% trans 'Nothing to move.' %}");
return;
}
if($(all_li_ele).hasClass("selected-resource")){
......@@ -600,7 +600,7 @@
$("#{{widget_for}}_move_all_right").click(function(event) {
var all_li_ele = $("#{{widget_for}}_drawer1 li:not(:first-child)")
if (all_li_ele.length == 0) {
alert("Nothing to move.");
alert("{% trans 'Nothing to move.' %}");
return;
}
if($(all_li_ele).hasClass("selected-resource")){
......
......@@ -50,7 +50,7 @@
function cancel(){
if(confirm("Are you sure you want to cancel edit?"))
if(confirm("{% trans 'Are you sure you want to cancel edit'%}?"))
{
history.go(-1);
}
......@@ -86,7 +86,7 @@ function cancel(){
<div class="row">
<div class="large-2 medium-4 columns "><h5><b>{% trans "Forum name:" %} </b></h5></div>
<div class="large-pull-4 large-6 medium-8 columns">
<input type="text" placeholder="Forum Name "
<input type="text" placeholder="{% trans 'Forum Name' %} "
name="forum_name" id="forum_name" value="{{forum.name}}">
<label id="message" style="display:none; color:red"></label>
</div>
......@@ -123,8 +123,8 @@ function cancel(){
<!-- Final Create forum button -->
<div class="large-8 columns">
<!-- <input type="submit" id="forum" value="Edit Forum" style="display:none"> -->
<input type="submit" id="forum" class="button tiny" value="Save forum">
<input type="button" id="cancel_edit" class="button tiny" value="Cancel" onclick="cancel()">
<input type="submit" id="forum" class="button tiny" value="{% trans 'Save' %} {% trans 'Forum' %}">
<input type="button" id="cancel_edit" class="button tiny" value="{% trans 'Cancel' %}" onclick="cancel()">
</div>
</div>
......@@ -296,13 +296,13 @@ function cancel(){
if (nodes.indexOf(name) != -1)
{
$("#message").css("display", "block");
$("#message").text("Forum '"+ name +"' already exist. Please choose another name");
$("#message").text("{% trans 'Forum with same name already exist. Please choose another name' %}");
event.preventDefault();
}
}
else if (name == ""){
$("#message").css("display", "block");
$("#message").text("Forum name cannot be empty.");
$("#message").text("{% trans 'Forum name cannot be empty' %}.");
event.preventDefault();
}
else
......@@ -322,7 +322,7 @@ function cancel(){
var name=$("#forum_name").val();
if (name=="" )
{
alert("Please enter forum name");
alert("{% trans 'Please enter forum name' %}");
}
else
{
......
......@@ -54,9 +54,9 @@
<a href="{% url app_gst.name|lower group_name_tag %}">
<h2 class="subheader">
{% if app_gst.altnames and app_gst.altnames != "None" %}
{{app_gst.altnames}}
{% trans app_gst.altnames %}
{% else %}
{{app_gst.name}}
{% trans app_gst.name %}
{% endif%}
</h2>
{{app_gst.content|default_if_none:""|safe}}
......
......@@ -4,7 +4,7 @@
{% if searching and resource_type.count > 0 %}
<div class="row">
<div class="small-12 columns end">
<p>{% trans "Search Results:" %} <span class="label success round">Found {{resource_type.count}} {{title|lower}}{{resource_type.count|pluralize}}.</span></p>
<p>{% trans "Search Results:" %} <span class="label success round">{% trans 'Found' %} {{resource_type.count}} {{title|lower}}{{resource_type.count|pluralize}}.</span></p>
</div>
</div>
{% elif searching and resource_type.count == 0 %}
......@@ -89,9 +89,9 @@
</footer>
<footer>
<div class="age">
{{ each_res.member_of_names_list|join:', ' }} created {{each_res.created_at|timesince}} ago
{{ each_res.member_of_names_list|join:', ' }}{% trans 'created' %} {{each_res.created_at|timesince}} {% trans 'ago' %}
<br/>
<span><strong>{{each_res.contributors|length}}</strong> Contributor{{each_res.contributors|pluralize}} | </span>
<span><strong>{{each_res.contributors|length}}</strong> {% trans 'Contributor' %}{{each_res.contributors|pluralize}} | </span>
by <span class="user" href="{% url 'dashboard' each_res.created_by %}" data-gnow="">{{each_res.user_details_dict.created_by}}</span> &nbsp;&nbsp;&nbsp;
</div>
</footer>
......@@ -121,7 +121,7 @@
{% if res_type_name == "collection" %}
<h5> {% trans "This group doesn't have any collections." %}</h5>
{% elif filter_result == "False" %}
<h5> {% trans "Sorry, No resources found with selected filters :(" %}</h5>
<h5> {% trans "Sorry, No resources found with selected filters" %} :( </h5>
{% else %}
{% if not dont_show_error %}
{% if "CourseEventGroup" in node.member_of_names_list %}
......
{% load i18n %}
<style type="text/css">
#tooltip {
position: absolute;
......@@ -54,17 +55,17 @@
<h3>Statistics</h3>
<dl class="tabs" data-tab>
{% if not show_only_pie %}
<dd class="tab-title active"><a href="#bar_visual">Bar-Chart</a></dd>
<dd class="tab-title"><a href="#pie_visual">Pie</a></dd>
<dd class="tab-title active"><a href="#bar_visual">{% trans 'Bar-Chart' %}</a></dd>
<dd class="tab-title"><a href="#pie_visual">{% trans 'Pie' %}</a></dd>
{% else %}
<dd class="tab-title active"><a href="#pie_visual">Activity Ratings</a></dd>
<dd class="tab-title active"><a href="#pie_visual">{% trans 'Activity Ratings' %}</a></dd>
{% endif %}
</dl>
<!-- <p "font-family: tahoma">Hover over to view tooltip</p> -->
<br/>
<div class="tabs-content">
<div id="tooltip" class="hidden">
<h6>Details</h6>
<h6>{% trans 'Details' %}</h6>
<p><span id="tip-value">100</span></p>
</div>
{% if not show_only_pie %}
......@@ -183,7 +184,7 @@
</div>
{% endif %}
{% if show_only_pie %}
<label id="tot_rating">{{username}}'s Total Rating Score: {{total_activity_rating}}</label>
<label id="tot_rating">{{username}}'s{% trans 'Total Rating Score' %}: {{total_activity_rating}}</label>
<div class="content active" id="pie_visual">
{% else %}
<div class="content " id="pie_visual">
......
{% load i18n %}
<style type="text/css">
div#filter-area {
......@@ -87,10 +88,10 @@
-->
<div class="small-12 columns" id="create-filter">
<div class="row">
<div class="small-2 columns text-right"><h5>Select filter</h5></div>
<div class="small-2 columns text-right"><h5> {% trans 'Select filter' %}</h5></div>
<div class="small-4 columns">
<select name="filter-field-name">
<option value="initial-select"> -- Select -- </option>
<option value="initial-select"> -- {% trans 'Select' %} -- </option>
{% for key, val in filter_dict.items %}
<option value='{{val.value}}'
data-primary-type='{{val.data_type}}'
......@@ -103,7 +104,7 @@
</option>
{% endfor %}
<!-- generating <option>'s of following type
<option value='["abc1", "abc2", "abc3"]'>ABC</option>
<option value='["abc1", "abc2", "abc3"]'>ABC</option>
<option value='["lmn1", "lmn2", "lmn3"]'>LMN</option>
<option value=''>XYZ</option>
-->
......@@ -113,7 +114,7 @@
<select name="filter-field-value"
onblur="$(this).css('height', '')"
onfocus="$(this).css('height', '6em')" multiple>
<option value=""> -- Select -- </option>
<option value=""> -- {% trans 'Select' %} -- </option>
<!--
<option value="ABC">ABCABCABC</option>
<option value="LMN">LMNLMNLMN</option>
......@@ -122,7 +123,7 @@
</select>
</div>
<div class="small-1 small-pull-1 columns">
<input type="button" class="button tiny" value="Apply filter" id="filter-btn">
<input type="button" class="button tiny" value="{% trans 'Apply filter' %}" id="filter-btn">
</div>
</div>
</div>
......@@ -201,7 +202,7 @@
}
else if( !ffValues || ffValues == "[]" ) // handling key with no values
{
alert("No values for the key : " + ffName);
alert("{% trans 'No values for the key' %} : " + ffName);
}
})
......@@ -326,7 +327,7 @@
var closeBtn = document.createElement("i");
closeBtn.className = "fi-x-circle remove-filter";
closeBtn.title = "Remove this filter";
closeBtn.title = "{% trans 'Remove this filter' %}";
closeBtn.onclick = function(){
$(this).parent().fadeOut("slow", function(){
$(this).detach();
......@@ -361,7 +362,7 @@
}
else // handling selection of already existing filter
{
alert('Filter - [ "' + filterText + '" ] is already applied !');
alert('Filter - [ "' + filterText + '" ] {% trans 'is already applied' %} !');
}
// make the height of second select to initial
......@@ -411,7 +412,7 @@
}
else // handling no filter is selected
{
alert("Please select the proper filter first !");
alert("{% trans 'Please select the proper filter first' %} !");
}
})
......
......@@ -26,7 +26,7 @@
{% block help_content %}
<p>The Forum is a place for discussion. You can create a new one for your idea and build on it with the help of others.</p>
<p>{ % trans 'The Forum is a place for discussion. You can create a new one for your idea and build on it with the help of others' %}.</p>
{% endblock %}
......@@ -60,21 +60,21 @@
<header class="row">
<dl class="tabs" data-tab data-options="deep_linking:true">
<dd class="active"><a href="#panel2-1"><i class="fi-comment-quotes gray-text"></i> All Forums {% if existing_forums|length %}({{ existing_forums|length }}){% endif %}</a></dd>
<dd class="active"><a href="#panel2-1"><i class="fi-comment-quotes gray-text"></i> {% trans 'All Forums' %} {% if existing_forums|length %}({{ existing_forums|length }}){% endif %}</a></dd>
</dl>
</header>
{% if searching and existing_forums.count > 0 %}
<div class="row">
<div class="small-12 columns end">
<p>Search Results: <span class="label success round">Found {{existing_forums.count}} {{title|lower}}{{existing_forums.count|pluralize}}.</span></p>
<p>Search Results: <span class="label success round"> {% trans 'Found' %} {{existing_forums.count}} {{title|lower}}{{existing_forums.count|pluralize}}.</span></p>
</div>
</div>
{% elif searching and existing_forums.count == 0 %}
<div class="row">
<div class="small-12 columns">
<p>Search Results: <span class="label alert">No {{title|lower}}{{existing_forums.count|pluralize}} matched your search criteria!!!</span></p>
<p>{% trans 'Search Results' %}: <span class="label alert">No {{title|lower}}{{existing_forums.count|pluralize}} {%trans 'matched your search criteria' %}!!!</span></p>
</div>
</div>
......@@ -116,13 +116,13 @@
<footer>
<div class="age">
{{ each.member_of_names_list|join:', ' }} created {{each.created_at|timesince}} ago
by <span href="#" class="user" data-gnow="">{{ each.user_details_dict.created_by }}</span>
{{ each.member_of_names_list|join:', ' }} {% trans 'created' %} {{each.created_at|timesince}}{% trans 'ago' %}
{% trans by %} <span href="#" class="user" data-gnow="">{{ each.user_details_dict.created_by }}</span>
</div>
<span><i class="fi-torsos-all gray-text"> </i> <strong>{{each.contributors|length}}</strong> <span class="gray-text">Contributor{{each.contributors|pluralize}}</span></span>
<span class="right"><i class="fi-shuffle gray-text"> </i> <strong>{{each.threads}}</strong> <span class="gray-text">Thread{{each.threads|pluralize}}</span></span>
<span><i class="fi-torsos-all gray-text"> </i> <strong>{{each.contributors|length}}</strong> <span class="gray-text">{% trans 'Contributor' %}{{each.contributors|pluralize}}</span></span>
<span class="right"><i class="fi-shuffle gray-text"> </i> <strong>{{each.threads}}</strong> <span class="gray-text">{% trans Thread %}{{each.threads|pluralize}}</span></span>
</footer>
</a>
......
......@@ -41,7 +41,7 @@
{% block help_content %}
<p>Threads are new ideas on the topic</p>
<p> {% trans 'Threads are new ideas on the topic' %}</p>
{% endblock %}
......@@ -169,7 +169,7 @@
{{each.name}}
</a>
<br/>
<i class="gray-text">by {{user_obj.username}}</i>
<i class="gray-text"> {% trans 'by' %} {{user_obj.username}}</i>
</td>
<td class="org-content-style">
......@@ -203,7 +203,7 @@
{% else %}
<h2 ><small>&#8220;This forum dosen't have any threads. Be the first to create a thread!&#8221;</small></h2>
<h2 ><small>&#8220; {% trans 'This forum dosen&#39t have any threads. Be the first to create a thread' %}!&#8221;</small></h2>
{% endif %}
......@@ -271,7 +271,7 @@ if (!window.confirm("Are you sure you want to delete this ?"))
else
{
alert("This forum has "+th_count +" existing threads.Please remove them and try again.");
alert(" {% blocktrans %} This forum has {{thread_count}} existing threads.Please remove them and try again {% endblocktrans %}.");
$("edit-options").hide();
return false;
}
......
......@@ -61,7 +61,7 @@
{% get_group_name groupid as group_name_tag %}
<header class="row">
<dl class="tabs" data-tab data-options="deep_linking:true">
<dd class="active"><a href="#panel2-1"><i class="fi-eye"></i> All Groups {% if group_nodes_count %}({{ group_nodes_count }}){% endif %}</a></dd>
<dd class="active"><a href="#panel2-1"><i class="fi-eye"></i> {% trans 'All Groups' %} {% if group_nodes_count %}({{ group_nodes_count }}){% endif %}</a></dd>
<!--<dd><a href="#panel2-3"><i class="fi-trophy"></i> Popular Groups</a></dd>-->
</dl>
</header>
......@@ -71,12 +71,13 @@
{% if searching and group_nodes_count > 0 %}
<div class="small-12 columns end">
<p>{% trans "Search Results:" %} <span class="label success round">Found {{group_nodes_count}} {{title|lower}}{{group_nodes_count|pluralize}}.</span></p>
<p>{% trans "Search Results:" %} <span class="label success round">{% trans 'Found' %} {{group_nodes_count}} {{title|lower}}{{group_nodes_count|pluralize}}.</span></p>
</div>
{% elif searching and group_nodes_count == 0 %}
<div class="small-12 columns">
<p>{% trans "Search Results:" %} <span class="label alert">No {{title|lower}}{{group_nodes_count|pluralize}} matched your search criteria!!!</span></p>
<p>{% trans "Search Results:" %} <span class="label alert">
{% blocktrans %} No {{title|lower}}{{group_nodes_count|pluralize}} matched your search criteria {% endblocktrans %}!!!</span></p>
</div>
{% endif %}
......@@ -112,15 +113,15 @@
</div>
</div>
<hr/>
<span style="font-size:12px;">{{ node.html_content|default_if_none:"Add some description."|safe|striptags|truncatechars:75 }}</span><br/>
<span style="font-size:12px;">{{ node.html_content|default_if_none:"{ % trans 'Add some description.' %}"|safe|striptags|truncatechars:75 }}</span><br/>
<footer>
<div class="age">
{{ node.member_of_names_list|join:', ' }} created {{node.created_at|timesince}} ago by <span class="user" href="{% url 'dashboard' node.created_by %}" data-gnow="">{{node.user_details_dict.created_by}}</span>
{{ node.member_of_names_list|join:', ' }}{% trans 'created' %} {{node.created_at|timesince}} {% trans 'ago' %} {% trans 'by' %} <span class="user" href="{% url 'dashboard' node.created_by %}" data-gnow="">{{node.user_details_dict.created_by}}</span>
</div>
<span><strong>{{node.author_set|length}}</strong> Members</span>
<span><strong>{{node.author_set|length}}</strong> {% trans 'Members' %} </span>
{% get_group_resources node as obj_count %}
<span class="right"><strong>{{obj_count}}</strong> Objects</span>
<span class="right"><strong>{{obj_count}}</strong>{% trans 'Objects' %} </span>
</footer>
</a>
......
......@@ -130,16 +130,16 @@
{% if user_policy == "allow" %}
<input type="file" name="has_profile_pic" class="hide" />
<input type="hidden" name="type" value="profile_pic" />
<input type="hidden" name="type" value=" {% trans 'profile_pic' %}" />
<input type="hidden" name="user" value="{{usr}}" />
<div class="button expand tiny" id="group-img-edit-btn"> Edit </div>
<div class="button expand tiny" id="group-img-edit-btn">{% trans 'Edit' %} </div>
<input class="button expand tiny hide" id="group-img-browse-btn" accept="image/*" name="has_profile_pic" type="file">
<div class="row hide" id="group-img-save-cancel-btn">
<div class="small-6 columns">
<input type="submit" class="button tiny expand" value="Save">
<input type="submit" class="button tiny expand" value="{% trans 'Save' %}">
</div>
<div class="small-6 columns">
......@@ -164,10 +164,10 @@
<label id="alertModalLabel"></label>
<div class="row approval_modal hide">
<div class="small-3 small-offset-3 columns">
<input type="button" id="btnConfirmYes" class="button tiny expand" value="Yes">
<input type="button" id="btnConfirmYes" class="button tiny expand" value="{% trans 'Yes' %}">
</div>
<div class="small-3 columns end">
<input type="button" id="btnConfirmNo" class="button tiny expand " value="No">
<input type="button" id="btnConfirmNo" class="button tiny expand " value="{% trans 'No' %}">
</div>
</div>
<a class="close-reveal-modal">&#215;</a>
......@@ -196,7 +196,7 @@
<input type="hidden" name="type" value="banner_pic">
<input type="hidden" name="user" value="{{usr}}">
<p id="message" style="display:none">
{% trans "Please wait for uploading profile picture" %}
{% trans "Please wait while profile picture is uploading .." %}
</p>
</div>
</div>
......@@ -214,7 +214,7 @@
</a>
</div>
<div>
<input type="submit" id="submitpostid" value="Save" style="font-size:15px;" />
<input type="submit" id="submitpostid" value="{% trans 'Save' %}" style="font-size:15px;" />
</div>
</div>
{% endif %}
......@@ -241,11 +241,11 @@
{% endif %}