diff --git a/dist/lang/pt.js b/dist/lang/pt.js
index 1cc25363..4972ca8a 100644
--- a/dist/lang/pt.js
+++ b/dist/lang/pt.js
@@ -25,8 +25,13 @@ window.SwaggerTranslator.learn({
"Show/Hide":"Mostrar/Esconder",
"List Operations":"Listar operações",
"Expand Operations":"Expandir operações",
+<<<<<<< HEAD
"Raw":"Cru",
"can't parse JSON. Raw result":"Falha ao analisar JSON. Resulto cru",
+=======
+ "Raw":"Raw",
+ "can't parse JSON. Raw result":"can't parse JSON. Raw result",
+>>>>>>> stable
"Model Schema":"Modelo esquema",
"Model":"Modelo",
"apply":"Aplicar",
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
index 5f586176..7d08a18c 100644
--- a/dist/swagger-ui.js
+++ b/dist/swagger-ui.js
@@ -2,7 +2,7 @@
* swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
* @version v2.1.0
* @link http://swagger.io
- * @license Apache 2.0
+ * @license Apache-2.0
*/
(function(){'use strict';
@@ -179,9 +179,13 @@ window.SwaggerUi = Backbone.Router.extend({
if (data === undefined) {
data = '';
}
- $('#message-bar').removeClass('message-fail');
- $('#message-bar').addClass('message-success');
- $('#message-bar').text(data);
+ var $msgbar = $('#message-bar');
+ $msgbar.removeClass('message-fail');
+ $msgbar.addClass('message-success');
+ $msgbar.html(data);
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate($msgbar);
+ }
},
// shows message in red
@@ -259,7 +263,7 @@ window.SwaggerUi.Views = {};
});
} else if (typeof exports === 'object') {
// Node. Does not work with strict CommonJS, but
- // only CommonJS-like enviroments that support module.exports,
+ // only CommonJS-like environments that support module.exports,
// like Node.
module.exports = factory(require('b'));
} else {
@@ -276,10 +280,10 @@ this["Handlebars"]["templates"]["apikey_button_view"] = Handlebars.template({"co
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return "\n
\n\n";
+ + "\n \n \n \n\n";
},"useData":true});
this["Handlebars"]["templates"]["basic_auth_button_view"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
- return "\n\n\n";
+ return "\n\n\n";
},"useData":true});
this["Handlebars"]["templates"]["content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
@@ -519,6 +523,14 @@ Handlebars.registerHelper('renderTextParam', function(param) {
var isArray = param.type.toLowerCase() === 'array' || param.allowMultiple;
var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\n') : param.default;
+ var dataVendorExtensions = Object.keys(param).filter(function(property) {
+ // filter X-data- properties
+ return property.match(/^X-data-/i) !== null;
+ }).reduce(function(result, property) {
+ // remove X- from property name, so it results in html attributes like data-foo='bar'
+ return result += ' ' + property.substring(2, property.length) + '=\'' + param[property] + '\'';
+ }, '');
+
if (typeof defaultValue === 'undefined') {
defaultValue = '';
}
@@ -532,7 +544,7 @@ Handlebars.registerHelper('renderTextParam', function(param) {
}
if(isArray) {
- result = '';
} else {
@@ -541,7 +553,7 @@ Handlebars.registerHelper('renderTextParam', function(param) {
parameterClass += ' required';
}
result = '';
}
return new Handlebars.SafeString(result);
@@ -585,15 +597,15 @@ this["Handlebars"]["templates"]["main"] = Handlebars.template({"1":function(dept
var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
return "";
+ + "\" data-sw-translate>Terms of service";
},"6":function(depth0,helpers,partials,data) {
var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
- return "Created by "
+ return "
Created by "
+ escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1), depth0))
+ "
";
},"8":function(depth0,helpers,partials,data) {
var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
- return "
";
+ + "\" data-sw-translate>Contact the developer
";
},"12":function(depth0,helpers,partials,data) {
var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
return "\n";
},"16":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
- return " Response Class (Status "
+ return " Response Class (Status "
+ escapeExpression(((helper = (helper = helpers.successCode || (depth0 != null ? depth0.successCode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"successCode","hash":{},"data":data}) : helper)))
+ ")
\n
\n
\n \n";
},"18":function(depth0,helpers,partials,data) {
- return " Parameters
\n \n \n \n Parameter | \n Value | \n Description | \n Parameter Type | \n Data Type | \n
\n \n \n\n \n
\n";
+ return " Parameters
\n \n \n \n Parameter | \n Value | \n Description | \n Parameter Type | \n Data Type | \n
\n \n \n\n \n
\n";
},"20":function(depth0,helpers,partials,data) {
- return " \n Response Messages
\n \n \n \n HTTP Status Code | \n Reason | \n Response Model | \n Headers | \n
\n \n \n\n \n
\n";
+ return " \n Response Messages
\n \n \n \n HTTP Status Code | \n Reason | \n Response Model | \n Headers | \n
\n \n \n\n \n
\n";
},"22":function(depth0,helpers,partials,data) {
return "";
},"24":function(depth0,helpers,partials,data) {
- return " \n";
+ return " \n";
},"26":function(depth0,helpers,partials,data) {
- return " Request Headers
\n \n";
+ return " Request Headers
\n \n";
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
var stack1, helper, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, blockHelperMissing=helpers.blockHelperMissing, buffer = "\n \n - \n
\n
Curl
\n
\n
Request URL
\n
\n";
+ buffer += " \n
\n
Curl
\n
\n
Request URL
\n
\n";
stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.showRequestHeaders : depth0), {"name":"if","hash":{},"fn":this.program(26, data),"inverse":this.noop,"data":data});
if (stack1 != null) { buffer += stack1; }
- return buffer + "
Response Body
\n
\n
Response Code
\n
\n
Response Headers
\n \n
\n
\n \n
\n";
+ return buffer + " Response Body
\n \n Response Code
\n \n Response Headers
\n \n \n \n \n \n";
},"useData":true});
this["Handlebars"]["templates"]["param"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
var stack1, buffer = "";
@@ -852,7 +864,7 @@ this["Handlebars"]["templates"]["param_list"] = Handlebars.template({"1":functio
+ escapeExpression(((helper = (helper = helpers.valueId || (depth0 != null ? depth0.valueId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"valueId","hash":{},"data":data}) : helper)))
+ "'>"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
- + "\n\n | \n\n |