From 5ae4eb9b8f2b03baebbb9da1eb2a6bee642c610d Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Mon, 14 Feb 2022 02:56:05 -0800 Subject: [PATCH 01/49] Super messy initial working version. To clean up. --- bookwyrm/static/js/bookwyrm.js | 59 ++++++++++++++++++++ bookwyrm/static/js/vendor/quagga.min.js | 1 + bookwyrm/templates/layout.html | 7 +++ bookwyrm/templates/search/barcode_modal.html | 14 +++++ 4 files changed, 81 insertions(+) create mode 100644 bookwyrm/static/js/vendor/quagga.min.js create mode 100644 bookwyrm/templates/search/barcode_modal.html diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index cf3ce3032..b826a54e2 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -47,6 +47,10 @@ let BookWyrm = new (class { .forEach((node) => node.addEventListener("toggle", this.handleDetailsDropdown.bind(this)) ); + + document + .querySelector("#barcode_scanner_modal") + .addEventListener("open", this.openBarcodeScanner.bind(this)); } /** @@ -427,9 +431,11 @@ let BookWyrm = new (class { }); modalElement.addEventListener("keydown", handleFocusTrap); + modalElement.dispatchEvent(new Event('open')); } function handleModalClose(modalElement) { + modalElement.dispatchEvent(new Event('close')); modalElement.removeEventListener("keydown", handleFocusTrap); htmlElement.classList.remove("is-clipped"); modalElement.classList.remove("is-active"); @@ -632,4 +638,57 @@ let BookWyrm = new (class { } } } + + openBarcodeScanner(event) { + /*function onScanSuccess(decodedText, decodedResult) { + alert(`${decodedText}`, decodedResult); + } + + function onScanFailure(error) { + alert(error); + }*/ + + Quagga.init({ + inputStream : { + name: "Live", + type: "LiveStream", + target: "#barcode_scanner" + }, + decoder : { + readers: [ + "ean_reader", + { + format: "ean_reader", + config: { + supplements: [ "ean_2_reader", "ean_5_reader" ] + } + } + ], + debug: { + drawBoundingBox: true, + drawScanline: true, + showPattern: true, + }, + multiple: false + }, + debug: true + }, function(err) { + if (err) { + console.log(err); + return; + } + + console.log('started'); + Quagga.start(); + }); + + Quagga.onDetected(function(result) { + var code = result.codeResult.code; + + location.href = `search?q=${code}`; + Quagga.stop(); + + console.log(code); + }); + } })(); diff --git a/bookwyrm/static/js/vendor/quagga.min.js b/bookwyrm/static/js/vendor/quagga.min.js new file mode 100644 index 000000000..f7a30f41b --- /dev/null +++ b/bookwyrm/static/js/vendor/quagga.min.js @@ -0,0 +1 @@ +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(e.toString()).default:"object"==typeof exports?exports.Quagga=e(e.toString()).default:t.Quagga=e(e.toString()).default}(this,function(t){return function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="/",e(e.s=166)}([function(t,e){function n(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}t.exports=n},function(t,e,n){"use strict";function r(t,e){return this._row=[],this.config=t||{},this.supplements=e,this}var o=n(3);r.prototype._nextUnset=function(t,e){var n;for(void 0===e&&(e=0),n=e;nn)return Number.MAX_VALUE;u+=c}return u/f},r.prototype._nextSet=function(t,e){var n;for(e=e||0,n=e;n1&&(t[n[r]]=o)},r.prototype._matchTrace=function(t,e){var n,r,o=[],i=this,a=i._nextSet(i._row),u=!i._row[a],c=0,s={error:Number.MAX_VALUE,code:-1,start:0};if(t){for(n=0;n=0;r--)e=Math.floor(Math.random()*r),n=t[r],t[r]=t[e],t[e]=n;return t},toPointList:function(t){var e,n,r=[],o=[];for(e=0;e=e&&o.push(t[r]);return o},maxIndex:function(t){var e,n=0;for(e=0;et[n]&&(n=e);return n},max:function t(e){var n,t=0;for(n=0;nt&&(t=e[n]);return t},sum:function t(e){for(var n=e.length,t=0;n--;)t+=e[n];return t}}},function(t,e,n){"use strict";function r(t,e){t=a()(o(),t),u.a.call(this,t,e)}function o(){var t={};return Object.keys(r.CONFIG_KEYS).forEach(function(e){t[e]=r.CONFIG_KEYS[e].default}),t}var i=n(28),a=n.n(i),u=n(1),c=Object.assign||function(t){for(var e=1;ea.AVG_CODE_ERROR?null:f}s++,i[s]=1,c=!c}return null},r.prototype._findPattern=function(t,e,n,r,o){var i,a,u,c,s=[],f=this,l=0,d={error:Number.MAX_VALUE,code:-1,start:0,end:0};for(e||(e=f._nextSet(f._row)),void 0===n&&(n=!1),void 0===r&&(r=!0),void 0===o&&(o=f.AVG_CODE_ERROR),i=0;i=0&&n._matchRange(t,e.start,0))return e;r=e.end,e=null}},r.prototype._verifyTrailingWhitespace=function(t){var e,n=this;return e=t.end+(t.end-t.start),e=i.CODE_G_START?(t.code=t.code-i.CODE_G_START,a|=1<<5-r):a|=0<<5-r,e.push(t.code),n.push(t)}if(null===(o=i._calculateFirstDigit(a)))return null;if(e.unshift(o),null===(t=i._findPattern(i.MIDDLE_PATTERN,t.end,!0,!1)))return null;for(n.push(t),r=0;r<6;r++){if(!(t=i._decodeCode(t.end,i.CODE_G_START)))return null;n.push(t),e.push(t.code)}return t},r.prototype._decode=function(){var t,e,n=this,r=[],o=[],i={};if(!(t=n._findStart()))return null;if(e={code:t.code,start:t.start,end:t.end},o.push(e),!(e=n._decodePayload(e,r,o)))return null;if(!(e=n._findEnd(e.end,!1)))return null;if(o.push(e),!n._checksum(r))return null;if(this.supplements.length>0){var a=this._decodeExtensions(e.end);if(!a)return null;var u=a.decodedCodes[a.decodedCodes.length-1],s={start:u.start+((u.end-u.start)/2|0),end:u.end};if(!n._verifyTrailingWhitespace(s))return null;i={supplement:a,code:r.join("")+a.code}}return c({code:r.join(""),start:t.start,end:e.end,codeset:"",startInfo:t,decodedCodes:o},i)},r.prototype._decodeExtensions=function(t){var e,n,r=this._nextSet(this._row,t),o=this._findPattern(this.EXTENSION_START_PATTERN,r,!1,!1);if(null===o)return null;for(e=0;e=0;e-=2)n+=t[e];for(n*=3,e=t.length-1;e>=0;e-=2)n+=t[e];return n%10==0},r.CONFIG_KEYS={supplements:{type:"arrayOf(string)",default:[],description:"Allowed extensions to be decoded (2 and/or 5)"}},e.a=r},function(t,e,n){var r=n(38),o="object"==typeof self&&self&&self.Object===Object&&self,i=r||o||Function("return this")();t.exports=i},function(t,e){function n(t){return null!=t&&"object"==typeof t}t.exports=n},function(t,e){function n(t){var e=new Float32Array(2);return e[0]=t[0],e[1]=t[1],e}t.exports=n},function(t,e,n){function r(t){return null==t?void 0===t?c:u:s&&s in Object(t)?i(t):a(t)}var o=n(11),i=n(119),a=n(146),u="[object Null]",c="[object Undefined]",s=o?o.toStringTag:void 0;t.exports=r},function(t,e,n){"use strict";e.a={drawRect:function(t,e,n,r){n.strokeStyle=r.color,n.fillStyle=r.color,n.lineWidth=1,n.beginPath(),n.strokeRect(t.x,t.y,e.x,e.y)},drawPath:function(t,e,n,r){n.strokeStyle=r.color,n.fillStyle=r.color,n.lineWidth=r.lineWidth,n.beginPath(),n.moveTo(t[0][e.x],t[0][e.y]);for(var o=1;o-1&&t%1==0&&t0?Math.floor(this.x+.5):Math.floor(this.x-.5),this.y=this.y>0?Math.floor(this.y+.5):Math.floor(this.y-.5),this}}}function o(t,e,n){n||(n=t);for(var r=t.data,o=r.length,i=n.data;o--;)i[o]=r[o]>o]++;return a}function a(t,e){function n(t,e){var n,r=0;for(n=t;n<=e;n++)r+=a[n];return r}function r(t,e){var n,r=0;for(n=t;n<=e;n++)r+=n*a[n];return r}function o(){var o,u,c,s,f,l,d,h=[0],p=(1<c)for(i=s[u],i.score=o,i.item=t[r],c=Number.MAX_VALUE,a=0;ae[r]?r++:n++;return o}function _(t,e){function n(t){for(var e=0,n=t[Math.floor(t.length/2)];e0&&(n=Math.abs(t[e]-d)>Math.abs(t[e-1]-d)?t[e-1]:t[e]),d/nc[f-1]/c[f]?{x:n,y:n}:null}var r,o=p(e.x),i=p(e.y),a=Math.max(e.x,e.y),u=v(o,i),c=[8,10,15,20,32,60,80],s={"x-small":5,small:4,medium:3,large:2,"x-large":1},f=s[t]||s.medium,l=c[f],d=Math.floor(a/l);return r=n(u),r||(r=n(p(a)))||(r=n(p(d*l))),r}function g(t){return{value:parseFloat(t),unit:(t.indexOf("%"),t.length,"%")}}function y(t,e,n){var r={width:t,height:e},o=Object.keys(n).reduce(function(t,e){var o=n[e],i=g(o),a=C[e](i,r);return t[e]=a,t},{});return{sx:o.left,sy:o.top,sw:o.right-o.left,sh:o.bottom-o.top}}var m=n(50),x=n(3);e.b=r,e.f=u,e.g=c,e.h=s,e.c=f,e.d=l,e.i=d,e.a=h,e.e=_,e.j=y;var b={clone:n(7)},E={clone:n(83)},C={top:function(t,e){if("%"===t.unit)return Math.floor(e.height*(t.value/100))},right:function(t,e){if("%"===t.unit)return Math.floor(e.width-e.width*(t.value/100))},bottom:function(t,e){if("%"===t.unit)return Math.floor(e.height-e.height*(t.value/100))},left:function(t,e){if("%"===t.unit)return Math.floor(e.width*(t.value/100))}}},function(t,e,n){"use strict";function r(t,e,n,r){e?this.data=e:n?(this.data=new n(t.x*t.y),n===Array&&r&&a.a.init(this.data,0)):(this.data=new Uint8Array(t.x*t.y),Uint8Array===Array&&r&&a.a.init(this.data,0)),this.size=t}var o=n(53),i=n(19),a=n(3),u={clone:n(7)};r.prototype.inImageWithBorder=function(t,e){return t.x>=e&&t.y>=e&&t.x0&&(a=g[r-1],a.m00+=1,a.m01+=n,a.m10+=e,a.m11+=e*n,a.m02+=o,a.m20+=e*e);for(i=0;i=0?x:-x)+m,a.theta=(180*h/m+90)%180-90,a.theta<0&&(a.theta+=180),a.rad=h>m?h-m:h,a.vec=u.clone([Math.cos(h),Math.sin(h)]),y.push(a));return y},r.prototype.show=function(t,e){var n,r,o,i,a,u,c;for(e||(e=1),n=t.getContext("2d"),t.width=this.size.x,t.height=this.size.y,r=n.getImageData(0,0,t.width,t.height),o=r.data,i=0,c=0;c360)&&(e=360);for(var o=[0,1,1],a=[0,0,0],u=[255,255,255],c=[0,0,0],s=[],f=t.getContext("2d"),l=f.getImageData(r.x,r.y,this.size.x,this.size.y),d=l.data,h=this.data.length;h--;)o[0]=this.data[h]*e,s=o[0]<=0?u:o[0]>=360?c:n.i(i.a)(o,a),d[4*h+0]=s[0],d[4*h+1]=s[1],d[4*h+2]=s[2],d[4*h+3]=255;f.putImageData(l,r.x,r.y)},e.a=r},function(t,e,n){function r(t,e,n){"__proto__"==e&&o?o(t,e,{configurable:!0,enumerable:!0,value:n,writable:!0}):t[e]=n}var o=n(37);t.exports=r},function(t,e,n){function r(t,e){var n=i(t,e);return o(n)?n:void 0}var o=n(97),i=n(120);t.exports=r},function(t,e,n){function r(t){if("string"==typeof t||o(t))return t;var e=t+"";return"0"==e&&1/t==-i?"-0":e}var o=n(27),i=1/0;t.exports=r},function(t,e,n){function r(t){return null!=t&&i(t.length)&&!o(t)}var o=n(25),i=n(26);t.exports=r},function(t,e,n){function r(t){if(!i(t))return!1;var e=o(t);return e==u||e==c||e==a||e==s}var o=n(8),i=n(0),a="[object AsyncFunction]",u="[object Function]",c="[object GeneratorFunction]",s="[object Proxy]";t.exports=r},function(t,e){function n(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=r}var r=9007199254740991;t.exports=n},function(t,e,n){function r(t){return"symbol"==typeof t||i(t)&&o(t)==a}var o=n(8),i=n(6),a="[object Symbol]";t.exports=r},function(t,e,n){var r=n(100),o=n(116),i=o(function(t,e,n){r(t,e,n)});t.exports=i},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){"use strict";var r={searchDirections:[[0,1],[1,1],[1,0],[1,-1],[0,-1],[-1,-1],[-1,0],[-1,1]],create:function(t,e){function n(t,e,n,r){var o,f,l;for(o=0;o<7;o++){if(f=t.cy+c[t.dir][0],l=t.cx+c[t.dir][1],i=f*s+l,a[i]===e&&(0===u[i]||u[i]===n))return u[i]=n,t.cy=f,t.cx=l,!0;0===u[i]&&(u[i]=r),t.dir=(t.dir+1)%8}return!1}function r(t,e,n){return{dir:n,x:t,y:e,next:null,prev:null}}function o(t,e,o,i,a){var u,c,s,f=null,l={cx:e,cy:t,dir:0};if(n(l,i,o,a)){f=r(e,t,l.dir),u=f,s=l.dir,c=r(l.cx,l.cy,0),c.prev=u,u.next=c,c.next=null,u=c;do l.dir=(l.dir+6)%8,n(l,i,o,a),s!==l.dir?(u.dir=l.dir,c=r(l.cx,l.cy,0),c.prev=u,u.next=c,c.next=null,u=c):(u.dir=s,u.x=l.cx,u.y=l.cy),s=l.dir;while(l.cx!==e||l.cy!==t);f.prev=u.prev,u.prev.next=f}return f}var i,a=t.data,u=e.data,c=this.searchDirections,s=t.size.x;return{trace:function(t,e,r,o){return n(t,e,r,o)},contourTracing:function(t,e,n,r,i){return o(t,e,n,r,i)}}}};e.a=r},function(t,e,n){"use strict";function r(){o.a.call(this)}var o=n(1),i=n(3),a={ALPHABETH_STRING:{value:"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"},ALPHABET:{value:[48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,45,46,32,42,36,47,43,37]},CHARACTER_ENCODINGS:{value:[52,289,97,352,49,304,112,37,292,100,265,73,328,25,280,88,13,268,76,28,259,67,322,19,274,82,7,262,70,22,385,193,448,145,400,208,133,388,196,148,168,162,138,42]},ASTERISK:{value:148},FORMAT:{value:"code_39",writeable:!1}};r.prototype=Object.create(o.a.prototype,a),r.prototype.constructor=r,r.prototype._decode=function(){var t,e,n,r,o=this,a=[0,0,0,0,0,0,0,0,0],u=[],c=o._findStart();if(!c)return null;r=o._nextSet(o._row,c.end);do{if(a=o._toCounters(r,a),(n=o._toPattern(a))<0)return null;if((t=o._patternToChar(n))<0)return null;u.push(t),e=r,r+=i.a.sum(a),r=o._nextSet(o._row,r)}while("*"!==t);return u.pop(),u.length&&o._verifyTrailingWhitespace(e,r,a)?{code:u.join(""),start:c.start,end:r,startInfo:c,decodedCodes:u}:null},r.prototype._verifyTrailingWhitespace=function(t,e,n){var r=i.a.sum(n);return 3*(e-t-r)>=r},r.prototype._patternToChar=function(t){var e,n=this;for(e=0;ee&&(r=t[n]);return r},r.prototype._toPattern=function(t){for(var e,n,r=t.length,o=0,i=r,a=0,u=this;i>3;){for(o=u._findNextWidth(t,o),i=0,e=0,n=0;no&&(e|=1<0;n++)if(t[n]>o&&(i--,2*t[n]>=a))return-1;return e}}return-1},r.prototype._findStart=function(){var t,e,n,r=this,o=r._nextSet(r._row),i=o,a=[0,0,0,0,0,0,0,0,0],u=0,c=!1;for(t=o;t0)for(r=0;r0){if(!(t=Y.filter(function(t){return!t.busy})[0]))return;w.attachData(t.imageData)}else w.attachData(S.data);w.grab()&&(t?(t.busy=!0,t.worker.postMessage({cmd:"process",imageData:t.imageData},[t.imageData.buffer])):_())}else _()}function y(){var t=null,e=1e3/($.frequency||60);T=!1,function n(r){t=t||r,T||(r>=t&&(t+=e,g()),window.requestAnimFrame(n))}(performance.now())}function m(){Q&&"LiveStream"===$.inputStream.type?y():g()}function x(t){var e,n={worker:void 0,imageData:new Uint8Array(R.getWidth()*R.getHeight()),busy:!0};e=C(),n.worker=new Worker(e),n.worker.onmessage=function(r){if("initialized"===r.data.event)return URL.revokeObjectURL(e),n.busy=!1,n.imageData=new Uint8Array(r.data.imageData),t(n);"processed"===r.data.event?(n.imageData=new Uint8Array(r.data.imageData),n.busy=!1,v(r.data.result,n.imageData)):r.data.event},n.worker.postMessage({cmd:"init",size:{x:R.getWidth(),y:R.getHeight()},imageData:n.imageData,config:b($)},[n.imageData.buffer])}function b(t){return X({},t,{inputStream:X({},t.inputStream,{target:null})})}function E(t){function e(t){self.postMessage({event:"processed",imageData:o.data,result:t},[o.data.buffer])}function n(){self.postMessage({event:"initialized",imageData:o.data},[o.data.buffer])}if(t){var r=t().default;if(!r)return void self.postMessage({event:"error",message:"Quagga could not be created"})}var o;self.onmessage=function(t){if("init"===t.data.cmd){var i=t.data.config;i.numOfWorkers=0,o=new r.ImageWrapper({x:t.data.size.x,y:t.data.size.y},new Uint8Array(t.data.imageData)),r.init(i,n,o),r.onProcessed(e)}else"process"===t.data.cmd?(o.data=new Uint8Array(t.data.imageData),r.start()):"setReaders"===t.data.cmd&&r.setReaders(t.data.readers)}}function C(){var e,n;return void 0!==t&&(n=t),e=new Blob(["("+E.toString()+")("+n+");"],{type:"text/javascript"}),window.URL.createObjectURL(e)}function O(t){P?P.setReaders(t):Q&&Y.length>0&&Y.forEach(function(e){e.worker.postMessage({cmd:"setReaders",readers:t})})}function A(t,e){var n=t-Y.length;if(0===n)return e&&e();if(n<0){return Y.slice(n).forEach(function(t){t.worker.terminate()}),Y=Y.slice(0,n),e&&e()}for(var r=function(n){Y.push(n),Y.length>=t&&e&&e()},o=0;oe},getPoints:function(){return a},getCenter:function(){return u}}},createPoint:function(t,e,n){return{rad:t[n],point:t,id:e}}}},function(t,e,n){"use strict";e.a=function(){function t(t){return o[t]||(o[t]={subscribers:[]}),o[t]}function e(){o={}}function n(t,e){t.async?setTimeout(function(){t.callback(e)},4):t.callback(e)}function r(e,n,r){var o;if("function"==typeof n)o={callback:n,async:r};else if(o=n,!o.callback)throw"Callback was not specified on options";t(e).subscribers.push(o)}var o={};return{subscribe:function(t,e,n){return r(t,e,n)},publish:function(e,r){var o=t(e),i=o.subscribers;i.filter(function(t){return!!t.once}).forEach(function(t){n(t,r)}),o.subscribers=i.filter(function(t){return!t.once}),o.subscribers.forEach(function(t){n(t,r)})},once:function(t,e,n){r(t,{callback:e,async:n,once:!0})},unsubscribe:function(n,r){var o;n?(o=t(n),o.subscribers=o&&r?o.subscribers.filter(function(t){return t.callback!==r}):[]):e()}}}()},function(t,e,n){"use strict";function r(){return navigator.mediaDevices&&"function"==typeof navigator.mediaDevices.enumerateDevices?navigator.mediaDevices.enumerateDevices():Promise.reject(new Error("enumerateDevices is not defined"))}function o(t){return navigator.mediaDevices&&"function"==typeof navigator.mediaDevices.getUserMedia?navigator.mediaDevices.getUserMedia(t):Promise.reject(new Error("getUserMedia is not defined"))}e.b=r,e.a=o},function(t,e,n){"use strict";function r(t,e,n){n||(n={data:null,size:e}),this.data=n.data,this.originalSize=n.size,this.I=n,this.from=t,this.size=e}r.prototype.show=function(t,e){var n,r,o,i,a,u,c;for(e||(e=1),n=t.getContext("2d"),t.width=this.size.x,t.height=this.size.y,r=n.getImageData(0,0,t.width,t.height),o=r.data,i=0,a=0;a>>16&65535,r=65535&t,o=e>>>16&65535,i=65535&e;return r*i+(n*i+r*o<<16>>>0)|0},"function"!=typeof Object.assign&&(Object.assign=function(t){"use strict";if(null===t)throw new TypeError("Cannot convert undefined or null to object");for(var e=Object(t),n=1;n1&&(!e.inImageWithBorder(t[0],0)||!e.inImageWithBorder(t[1],0));)r-=Math.ceil(r/2),o(-r);return t}function u(t){return[{x:(t[1][0]-t[0][0])/2+t[0][0],y:(t[1][1]-t[0][1])/2+t[0][1]},{x:(t[3][0]-t[2][0])/2+t[2][0],y:(t[3][1]-t[2][1])/2+t[2][1]}]}function c(t){var n,o=null,i=r.a.getBarcodeLine(e,t[0],t[1]);for(r.a.toBinaryLine(i),n=0;nE?l:E,g.push(l)}var o,i,a,u,c,s,f,l,d=0|e.x,h=0|e.y,p=0|n.x,v=0|n.y,_=Math.abs(v-h)>Math.abs(p-d),g=[],y=t.data,m=t.size.x,x=0,b=255,E=0;for(_&&(s=d,d=h,h=s,s=p,p=v,v=s),d>p&&(s=d,d=p,p=s,s=h,h=v,v=s),o=p-d,i=Math.abs(v-h),a=o/2|0,c=h,u=hl?o.DIR.UP:o.DIR.DOWN,d.push({pos:0,val:f[0]}),a=0;ah&&f[a+1]>.5*l?o.DIR.UP:r,r!==i&&(d.push({pos:a,val:f[a]}),r=i);for(d.push({pos:f.length,val:f[f.length-1]}),u=d[0].pos;ul?0:1;for(a=1;ad[a].val?d[a].val+(d[a+1].val-d[a].val)/3*2|0:d[a+1].val+(d[a].val-d[a+1].val)/3|0,u=d[a].pos;uh?0:1;return{line:f,threshold:h}},r.debug={printFrequency:function(t,e){var n,r=e.getContext("2d");for(e.width=t.length,e.height=256,r.beginPath(),r.strokeStyle="blue",n=0;n0?t.videoWidth>10&&t.videoHeight>10?e():window.setTimeout(r,500):n("Unable to play video stream. Is webcam working?"),o--}var o=10;r()})}function o(t,e){return n.i(d.a)(e).then(function(e){return new Promise(function(n){s=e,t.setAttribute("autoplay",!0),t.setAttribute("muted",!0),t.setAttribute("playsinline",!0),t.srcObject=e,t.addEventListener("loadedmetadata",function(){t.play(),n()})})}).then(r.bind(null,t))}function i(t){var e=l()(t,["width","height","facingMode","aspectRatio","deviceId"]);return void 0!==t.minAspectRatio&&t.minAspectRatio>0&&(e.aspectRatio=t.minAspectRatio,console.log("WARNING: Constraint 'minAspectRatio' is deprecated; Use 'aspectRatio' instead")),void 0!==t.facing&&(e.facingMode=t.facing,console.log("WARNING: Constraint 'facing' is deprecated. Use 'facingMode' instead'")),e}function a(t){var e={audio:!1,video:i(t)};return e.video.deviceId&&e.video.facingMode&&delete e.video.facingMode,Promise.resolve(e)}function u(){return n.i(d.b)().then(function(t){return t.filter(function(t){return"videoinput"===t.kind})})}function c(){if(s){var t=s.getVideoTracks();if(t&&t.length)return t[0]}}var s,f=n(162),l=n.n(f),d=n(52);e.a={request:function(t,e){return a(e).then(o.bind(null,t))},release:function(){var t=s&&s.getVideoTracks();t&&t.length&&t[0].stop(),s=null},enumerateVideoDevices:u,getActiveStreamLabel:function(){var t=c();return t?t.label:""},getActiveTrack:c}},function(t,e,n){"use strict";function r(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:d;return/^blob\:/i.test(t)?i(t).then(o).then(function(t){return a(t,e)}):Promise.resolve(null)}function o(t){return new Promise(function(e){var n=new FileReader;n.onload=function(t){return e(t.target.result)},n.readAsArrayBuffer(t)})}function i(t){return new Promise(function(e,n){var r=new XMLHttpRequest;r.open("GET",t,!0),r.responseType="blob",r.onreadystatechange=function(){r.readyState!==XMLHttpRequest.DONE||200!==r.status&&0!==r.status||e(this.response)},r.onerror=n,r.send()})}function a(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:d,n=new DataView(t),r=t.byteLength,o=e.reduce(function(t,e){var n=Object.keys(l).filter(function(t){return l[t]===e})[0];return n&&(t[n]=e),t},{}),i=2;if(255!==n.getUint8(0)||216!==n.getUint8(1))return!1;for(;i1?i.size:Math.floor(e/o*i.size):e,r=i.size?e/o>1?Math.floor(o/e*i.size):i.size:o,s.x=n,s.y=r}var n,r,o={},i=null,a=["canrecord","ended"],u={},c={x:0,y:0},s={x:0,y:0};return o.getRealWidth=function(){return t.videoWidth},o.getRealHeight=function(){return t.videoHeight},o.getWidth=function(){return n},o.getHeight=function(){return r},o.setWidth=function(t){n=t},o.setHeight=function(t){r=t},o.setInputStream=function(e){i=e,t.src=void 0!==e.src?e.src:""},o.ended=function(){return t.ended},o.getConfig=function(){return i},o.setAttribute=function(e,n){t.setAttribute(e,n)},o.pause=function(){t.pause()},o.play=function(){t.play()},o.setCurrentTime=function(e){"LiveStream"!==i.type&&(t.currentTime=e)},o.addEventListener=function(e,n,r){a.indexOf(e)!==-1?(u[e]||(u[e]=[]),u[e].push(n)):t.addEventListener(e,n,r)},o.clearEventHandlers=function(){a.forEach(function(e){var n=u[e];n&&n.length>0&&n.forEach(function(n){t.removeEventListener(e,n)})})},o.trigger=function(t,n){var r,i=u[t];if("canrecord"===t&&e(),i&&i.length>0)for(r=0;r1?a.size:Math.floor(u/c*a.size):u,o=a.size?u/c>1?Math.floor(c/u*a.size):a.size:c,x.x=n,x.y=o,l=!0,s=0,setTimeout(function(){e("canrecord",[])},0)},p,h,a.sequence)}function e(t,e){var n,r=y[t];if(r&&r.length>0)for(n=0;nf&&(f=o.box[r][0]),o.box[r][1]l&&(l=o.box[r][1]);for(a=[[c,s],[f,s],[f,l],[c,l]],u=p.halfSample?2:1,i=M.invert(i,i),r=0;r<4;r++)I.transformMat2(a[r],a[r],i);for(r=0;r<4;r++)I.scale(a[r],a[r],u);return a}function a(){n.i(w.f)(v,E),E.zeroBorder()}function u(){var t,e,n,r,o,i,a,u=[];for(t=0;t0&&r[x.data[n]-1]++;return r=r.map(function(t,e){return{val:t,label:e+1}}),r.sort(function(t,e){return e.val-t.val}),r.filter(function(t){return t.val>=5})}function s(t,e){var n,r,o,a,u=[],c=[];for(n=0;n=2){for(o=0;ol&&c.push(t[o]);if(c.length>=2){for(a=f(c),i=0,o=0;o1&&a.length>=c.length/4*3&&a.length>t.length/4&&(i/=a.length,u={index:e[1]*z.x+e[0],pos:{x:n,y:r},box:[I.clone([n,r]),I.clone([n+g.size.x,r]),I.clone([n+g.size.x,r+g.size.y]),I.clone([n,r+g.size.y])],moments:a,rad:i,vec:I.clone([Math.cos(i),Math.sin(i)])},s.push(u))}}return s}function h(t){function e(){var t;for(t=0;ta&&n(u):x.data[u]=Number.MAX_VALUE}var r,o,i=0,a=.95,u=0;for(T.a.init(m.data,0),T.a.init(x.data,0),T.a.init(b.data,null),r=0;r0) {length=length - 1|0;images[outImagePtr+length|0]=(images[aImagePtr+length|0]|0) - (images[bImagePtr+length|0]|0)|0;}}function bitwiseOr(aImagePtr, bImagePtr, outImagePtr) {aImagePtr=aImagePtr|0;bImagePtr=bImagePtr|0;outImagePtr=outImagePtr|0;var length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;images[outImagePtr+length|0]=images[aImagePtr+length|0]|0|(images[bImagePtr+length|0]|0)|0;}}function countNonZero(imagePtr) {imagePtr=imagePtr|0;var sum=0,length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;sum=(sum|0)+(images[imagePtr+length|0]|0)|0;}return sum|0;}function init(imagePtr, value) {imagePtr=imagePtr|0;value=value|0;var length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;images[imagePtr+length|0]=value;}}function dilate(inImagePtr, outImagePtr) {inImagePtr=inImagePtr|0;outImagePtr=outImagePtr|0;var v=0,u=0,sum=0,yStart1=0,yStart2=0,xStart1=0,xStart2=0,offset=0;for (v=1; (v|0)<(size - 1|0); v=v+1|0) {offset=offset+size|0;for (u=1; (u|0)<(size - 1|0); u=u+1|0) {yStart1=offset - size|0;yStart2=offset+size|0;xStart1=u - 1|0;xStart2=u+1|0;sum=(images[inImagePtr+yStart1+xStart1|0]|0)+(images[inImagePtr+yStart1+xStart2|0]|0)+(images[inImagePtr+offset+u|0]|0)+(images[inImagePtr+yStart2+xStart1|0]|0)+(images[inImagePtr+yStart2+xStart2|0]|0)|0;if ((sum|0)>(0|0)) {images[outImagePtr+offset+u|0]=1;} else {images[outImagePtr+offset+u|0]=0;}}}return;}function memcpy(srcImagePtr, dstImagePtr) {srcImagePtr=srcImagePtr|0;dstImagePtr=dstImagePtr|0;var length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;images[dstImagePtr+length|0]=images[srcImagePtr+length|0]|0;}}function zeroBorder(imagePtr) {imagePtr=imagePtr|0;var x=0,y=0;for (x=0; (x|0)<(size - 1|0); x=x+1|0) {images[imagePtr+x|0]=0;images[imagePtr+y|0]=0;y=y+size - 1|0;images[imagePtr+y|0]=0;y=y+1|0;}for (x=0; (x|0)<(size|0); x=x+1|0) {images[imagePtr+y|0]=0;y=y+1|0;}}function skeletonize() {var subImagePtr=0,erodedImagePtr=0,tempImagePtr=0,skelImagePtr=0,sum=0,done=0;erodedImagePtr=imul(size, size)|0;tempImagePtr=erodedImagePtr+erodedImagePtr|0;skelImagePtr=tempImagePtr+erodedImagePtr|0;init(skelImagePtr, 0);zeroBorder(subImagePtr);do {erode(subImagePtr, erodedImagePtr);dilate(erodedImagePtr, tempImagePtr);subtract(subImagePtr, tempImagePtr, tempImagePtr);bitwiseOr(skelImagePtr, tempImagePtr, skelImagePtr);memcpy(erodedImagePtr, subImagePtr);sum=countNonZero(subImagePtr)|0;done=(sum|0) == 0|0;} while (!done);}return {skeletonize: skeletonize};} __webpack_exports__["a"]=Skeletonizer; },function(t,e,n){"use strict";function r(t){o.a.call(this,t),this.barSpaceRatio=[1,1]}var o=n(1),i=1,a=3,u={START_PATTERN:{value:[a,i,a,i,i,i]},STOP_PATTERN:{value:[a,i,i,i,a]},CODE_PATTERN:{value:[[i,i,a,a,i],[a,i,i,i,a],[i,a,i,i,a],[a,a,i,i,i],[i,i,a,i,a],[a,i,a,i,i],[i,a,a,i,i],[i,i,i,a,a],[a,i,i,a,i],[i,a,i,a,i]]},SINGLE_CODE_ERROR:{value:.78,writable:!0},AVG_CODE_ERROR:{value:.3,writable:!0},FORMAT:{value:"2of5"}},c=u.START_PATTERN.value.reduce(function(t,e){return t+e},0);r.prototype=Object.create(o.a.prototype,u),r.prototype.constructor=r,r.prototype._findPattern=function(t,e,n,r){var o,i,a,u,c=[],s=this,f=0,l={error:Number.MAX_VALUE,code:-1,start:0,end:0},d=s.AVG_CODE_ERROR;for(n=n||!1,r=r||!1,e||(e=s._nextSet(s._row)),o=0;o=0&&n._matchRange(t,e.start,0))return e;r=e.end,e=null}},r.prototype._verifyTrailingWhitespace=function(t){var e,n=this;return e=t.end+(t.end-t.start)/2,e1&&i._isStartEnd(n))break}while(ri._counters.length?i._counters.length:r,o=t.start+i._sumCounters(t.startCounter,r-8),{code:a.join(""),start:t.start,end:o,startInfo:t,decodedCodes:a}):null},r.prototype._verifyWhitespace=function(t,e){return(t-1<=0||this._counters[t-1]>=this._calculatePatternLength(t)/2)&&(e+8>=this._counters.length||this._counters[e+7]>=this._calculatePatternLength(e)/2)},r.prototype._calculatePatternLength=function(t){var e,n=0;for(e=t;e=0;i--)n=2==(1&i)?c.bar:c.space,r=1==(1&a)?n.wide:n.narrow,r.size+=u._counters[s+i],r.counts++,a>>=1;s+=8}return["space","bar"].forEach(function(t){var e=c[t];e.wide.min=Math.floor((e.narrow.size/e.narrow.counts+e.wide.size/e.wide.counts)/2),e.narrow.max=Math.ceil(e.wide.min),e.wide.max=Math.ceil((e.wide.size*u.MAX_ACCEPTABLE+u.PADDING)/e.wide.counts)}),c},r.prototype._charToPattern=function(t){var e,n=this,r=t.charCodeAt(0);for(e=0;e=0;r--){if(o=0==(1&r)?s.bar:s.space,i=1==(1&u)?o.wide:o.narrow,(a=c._counters[f+r])i.max)return!1;u>>=1}f+=8}return!0},r.prototype._patternToChar=function(t){var e,n=this;for(e=0;ei&&(i=r),rthis._counters.length)return-1;for(e=this._computeAlternatingThreshold(t,a),n=this._computeAlternatingThreshold(t+1,a),r=0;ro&&(c|=u),u>>=1;return c},r.prototype._isStartEnd=function(t){var e;for(e=0;eu.AVG_CODE_ERROR?null:(u.CODE_PATTERN[l.code]&&(l.correction.bar=o(u.CODE_PATTERN[l.code],a,this.MODULE_INDICES.bar),l.correction.space=o(u.CODE_PATTERN[l.code],a,this.MODULE_INDICES.space)),l)}f++,a[f]=1,s=!s}return null},r.prototype._correct=function(t,e){this._correctBars(t,e.bar,this.MODULE_INDICES.bar),this._correctBars(t,e.space,this.MODULE_INDICES.space)},r.prototype._findStart=function(){var t,e,n,r,i,a=[0,0,0,0,0,0],u=this,c=u._nextSet(u._row),s=!1,f=0,l={error:Number.MAX_VALUE,code:-1,start:0,end:0,correction:{bar:1,space:1}};for(t=c;t4)return-1;if(0==(1&i))for(var u=0;u="a"&&o<="d"){if(r>e-2)return null;var i=t[++r],a=i.charCodeAt(0),u=void 0;switch(o){case"a":if(!(i>="A"&&i<="Z"))return null;u=String.fromCharCode(a-64);break;case"b":if(i>="A"&&i<="E")u=String.fromCharCode(a-38);else if(i>="F"&&i<="J")u=String.fromCharCode(a-11);else if(i>="K"&&i<="O")u=String.fromCharCode(a+16);else if(i>="P"&&i<="S")u=String.fromCharCode(a+43);else{if(!(i>="T"&&i<="Z"))return null;u=String.fromCharCode(127)}break;case"c":if(i>="A"&&i<="O")u=String.fromCharCode(a-32);else{if("Z"!==i)return null;u=":"}break;case"d":if(!(i>="A"&&i<="Z"))return null;u=String.fromCharCode(a+32)}n.push(u)}else n.push(o)}return n},r.prototype._verifyChecksums=function(t){return this._matchCheckChar(t,t.length-2,20)&&this._matchCheckChar(t,t.length-1,15)},r.prototype._matchCheckChar=function(t,e,n){var r=this,o=t.slice(0,e),i=o.length,a=o.reduce(function(t,e,o){return t+((o*-1+(i-1))%n+1)*r.ALPHABET.indexOf(e.charCodeAt(0))},0);return this.ALPHABET[a%47]===t[e].charCodeAt(0)},e.a=r},function(t,e,n){"use strict";function r(){o.a.call(this)}var o=n(4),i={FORMAT:{value:"ean_2",writeable:!1}};r.prototype=Object.create(o.a.prototype,i),r.prototype.constructor=r,r.prototype.decode=function(t,e){this._row=t;var n,r=0,o=0,i=e,a=this._row.length,u=[],c=[];for(o=0;o<2&&i=this.CODE_G_START&&(r|=1<<1-o),1!=o&&(i=this._nextSet(this._row,n.end),i=this._nextUnset(this._row,i))}return 2!=u.length||parseInt(u.join(""))%4!==r?null:{code:u.join(""),decodedCodes:c,end:n.end}},e.a=r},function(t,e,n){"use strict";function r(){a.a.call(this)}function o(t){var e;for(e=0;e<10;e++)if(t===c[e])return e;return null}function i(t){var e,n=t.length,r=0;for(e=n-2;e>=0;e-=2)r+=t[e];for(r*=3,e=n-1;e>=0;e-=2)r+=t[e];return(r*=3)%10}var a=n(4),u={FORMAT:{value:"ean_5",writeable:!1}},c=[24,20,18,17,12,6,3,10,9,5];r.prototype=Object.create(a.a.prototype,u),r.prototype.constructor=r,r.prototype.decode=function(t,e){this._row=t;var n,r=0,a=0,u=e,c=this._row.length,s=[],f=[];for(a=0;a<5&&u=this.CODE_G_START&&(r|=1<<4-a),4!=a&&(u=this._nextSet(this._row,n.end),u=this._nextUnset(this._row,u))}return 5!=s.length?null:i(s)!==o(r)?null:{code:s.join(""),decodedCodes:f,end:n.end}},e.a=r},function(t,e,n){"use strict";function r(t,e){o.a.call(this,t,e)}var o=n(4),i={FORMAT:{value:"ean_8",writeable:!1}};r.prototype=Object.create(o.a.prototype,i),r.prototype.constructor=r,r.prototype._decodePayload=function(t,e,n){var r,o=this;for(r=0;r<4;r++){if(!(t=o._decodeCode(t.end,o.CODE_G_START)))return null;e.push(t.code),n.push(t)}if(null===(t=o._findPattern(o.MIDDLE_PATTERN,t.end,!0,!1)))return null;for(n.push(t),r=0;r<4;r++){if(!(t=o._decodeCode(t.end,o.CODE_G_START)))return null;n.push(t),e.push(t.code)}return t},e.a=r},function(t,e,n){"use strict";function r(t){t=a()(o(),t),u.a.call(this,t),this.barSpaceRatio=[1,1],t.normalizeBarSpaceWidth&&(this.SINGLE_CODE_ERROR=.38,this.AVG_CODE_ERROR=.09)}function o(){var t={};return Object.keys(r.CONFIG_KEYS).forEach(function(e){t[e]=r.CONFIG_KEYS[e].default}),t}var i=n(28),a=n.n(i),u=n(1),c=1,s=3,f={START_PATTERN:{value:[c,c,c,c]},STOP_PATTERN:{value:[c,c,s]},CODE_PATTERN:{value:[[c,c,s,s,c],[s,c,c,c,s],[c,s,c,c,s],[s,s,c,c,c],[c,c,s,c,s],[s,c,s,c,c],[c,s,s,c,c],[c,c,c,s,s],[s,c,c,s,c],[c,s,c,s,c]]},SINGLE_CODE_ERROR:{value:.78,writable:!0},AVG_CODE_ERROR:{value:.38,writable:!0},MAX_CORRECTION_FACTOR:{value:5},FORMAT:{value:"i2of5"}};r.prototype=Object.create(u.a.prototype,f),r.prototype.constructor=r,r.prototype._matchPattern=function(t,e){if(this.config.normalizeBarSpaceWidth){var n,r=[0,0],o=[0,0],i=[0,0],a=this.MAX_CORRECTION_FACTOR,c=1/a;for(n=0;n=0&&n._matchRange(t,e.start,0))return e;r=e.end,e=null}},r.prototype._verifyTrailingWhitespace=function(t){var e,n=this;return e=t.end+(t.end-t.start)/2,e=o.CODE_G_START&&(t.code=t.code-o.CODE_G_START,i|=1<<5-r),e.push(t.code),n.push(t)}return o._determineParity(i,e)?t:null},r.prototype._determineParity=function(t,e){var n,r;for(r=0;r0&&n(f)?e>1?r(f,e-1,n,a,u):o(u,f):a||(u[u.length]=f)}return u}var o=n(90),i=n(128);t.exports=r},function(t,e,n){var r=n(117),o=r();t.exports=o},function(t,e,n){function r(t,e){e=o(e,t);for(var n=0,r=e.length;null!=t&&n1?n[o-1]:void 0,u=o>2?n[2]:void 0;for(a=t.length>3&&"function"==typeof a?(o--,a):void 0,u&&i(n[0],n[1],u)&&(a=o<3?void 0:a,o=1),e=Object(e);++r-1}var o=n(12);t.exports=r},function(t,e,n){function r(t,e){var n=this.__data__,r=o(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this}var o=n(12);t.exports=r},function(t,e,n){function r(){this.size=0,this.__data__={hash:new o,map:new(a||i),string:new o}}var o=n(84),i=n(10),a=n(33);t.exports=r},function(t,e,n){function r(t){var e=o(this,t).delete(t);return this.size-=e?1:0,e}var o=n(14);t.exports=r},function(t,e,n){function r(t){return o(this,t).get(t)}var o=n(14);t.exports=r},function(t,e,n){function r(t){return o(this,t).has(t)}var o=n(14);t.exports=r},function(t,e,n){function r(t,e){var n=o(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this}var o=n(14);t.exports=r},function(t,e,n){function r(t){var e=o(t,function(t){return n.size===i&&n.clear(),t}),n=e.cache;return e}var o=n(161),i=500;t.exports=r},function(t,e){function n(t){var e=[];if(null!=t)for(var n in Object(t))e.push(n);return e}t.exports=n},function(t,e,n){(function(t){var r=n(38),o="object"==typeof e&&e&&!e.nodeType&&e,i=o&&"object"==typeof t&&t&&!t.nodeType&&t,a=i&&i.exports===o,u=a&&r.process,c=function(){try{return u&&u.binding&&u.binding("util")}catch(t){}}();t.exports=c}).call(e,n(29)(t))},function(t,e){function n(t){return o.call(t)}var r=Object.prototype,o=r.toString;t.exports=n},function(t,e){function n(t,e){return function(n){return t(e(n))}}t.exports=n},function(t,e){function n(t){var e=0,n=0;return function(){var a=i(),u=o-(a-n);if(n=a,u>0){if(++e>=r)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}var r=800,o=16,i=Date.now;t.exports=n},function(t,e,n){function r(){this.__data__=new o,this.size=0}var o=n(10);t.exports=r},function(t,e){function n(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n}t.exports=n},function(t,e){function n(t){return this.__data__.get(t)}t.exports=n},function(t,e){function n(t){return this.__data__.has(t)}t.exports=n},function(t,e,n){function r(t,e){var n=this.__data__;if(n instanceof o){var r=n.__data__;if(!i||r.length{% trans "Search" %} + + {% include "search/barcode_modal.html" with id="barcode_scanner_modal" %} - {% endblock %} From 82cb170a9112193ed8040f5f0a47bae63e7ffeff Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Tue, 15 Feb 2022 02:39:16 -0800 Subject: [PATCH 03/49] Switch version of quagga to new fork quagga2 --- bookwyrm/static/js/vendor/quagga.min.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/js/vendor/quagga.min.js b/bookwyrm/static/js/vendor/quagga.min.js index f7a30f41b..84ccb74fc 100644 --- a/bookwyrm/static/js/vendor/quagga.min.js +++ b/bookwyrm/static/js/vendor/quagga.min.js @@ -1 +1,3 @@ -!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(e.toString()).default:"object"==typeof exports?exports.Quagga=e(e.toString()).default:t.Quagga=e(e.toString()).default}(this,function(t){return function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="/",e(e.s=166)}([function(t,e){function n(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}t.exports=n},function(t,e,n){"use strict";function r(t,e){return this._row=[],this.config=t||{},this.supplements=e,this}var o=n(3);r.prototype._nextUnset=function(t,e){var n;for(void 0===e&&(e=0),n=e;nn)return Number.MAX_VALUE;u+=c}return u/f},r.prototype._nextSet=function(t,e){var n;for(e=e||0,n=e;n1&&(t[n[r]]=o)},r.prototype._matchTrace=function(t,e){var n,r,o=[],i=this,a=i._nextSet(i._row),u=!i._row[a],c=0,s={error:Number.MAX_VALUE,code:-1,start:0};if(t){for(n=0;n=0;r--)e=Math.floor(Math.random()*r),n=t[r],t[r]=t[e],t[e]=n;return t},toPointList:function(t){var e,n,r=[],o=[];for(e=0;e=e&&o.push(t[r]);return o},maxIndex:function(t){var e,n=0;for(e=0;et[n]&&(n=e);return n},max:function t(e){var n,t=0;for(n=0;nt&&(t=e[n]);return t},sum:function t(e){for(var n=e.length,t=0;n--;)t+=e[n];return t}}},function(t,e,n){"use strict";function r(t,e){t=a()(o(),t),u.a.call(this,t,e)}function o(){var t={};return Object.keys(r.CONFIG_KEYS).forEach(function(e){t[e]=r.CONFIG_KEYS[e].default}),t}var i=n(28),a=n.n(i),u=n(1),c=Object.assign||function(t){for(var e=1;ea.AVG_CODE_ERROR?null:f}s++,i[s]=1,c=!c}return null},r.prototype._findPattern=function(t,e,n,r,o){var i,a,u,c,s=[],f=this,l=0,d={error:Number.MAX_VALUE,code:-1,start:0,end:0};for(e||(e=f._nextSet(f._row)),void 0===n&&(n=!1),void 0===r&&(r=!0),void 0===o&&(o=f.AVG_CODE_ERROR),i=0;i=0&&n._matchRange(t,e.start,0))return e;r=e.end,e=null}},r.prototype._verifyTrailingWhitespace=function(t){var e,n=this;return e=t.end+(t.end-t.start),e=i.CODE_G_START?(t.code=t.code-i.CODE_G_START,a|=1<<5-r):a|=0<<5-r,e.push(t.code),n.push(t)}if(null===(o=i._calculateFirstDigit(a)))return null;if(e.unshift(o),null===(t=i._findPattern(i.MIDDLE_PATTERN,t.end,!0,!1)))return null;for(n.push(t),r=0;r<6;r++){if(!(t=i._decodeCode(t.end,i.CODE_G_START)))return null;n.push(t),e.push(t.code)}return t},r.prototype._decode=function(){var t,e,n=this,r=[],o=[],i={};if(!(t=n._findStart()))return null;if(e={code:t.code,start:t.start,end:t.end},o.push(e),!(e=n._decodePayload(e,r,o)))return null;if(!(e=n._findEnd(e.end,!1)))return null;if(o.push(e),!n._checksum(r))return null;if(this.supplements.length>0){var a=this._decodeExtensions(e.end);if(!a)return null;var u=a.decodedCodes[a.decodedCodes.length-1],s={start:u.start+((u.end-u.start)/2|0),end:u.end};if(!n._verifyTrailingWhitespace(s))return null;i={supplement:a,code:r.join("")+a.code}}return c({code:r.join(""),start:t.start,end:e.end,codeset:"",startInfo:t,decodedCodes:o},i)},r.prototype._decodeExtensions=function(t){var e,n,r=this._nextSet(this._row,t),o=this._findPattern(this.EXTENSION_START_PATTERN,r,!1,!1);if(null===o)return null;for(e=0;e=0;e-=2)n+=t[e];for(n*=3,e=t.length-1;e>=0;e-=2)n+=t[e];return n%10==0},r.CONFIG_KEYS={supplements:{type:"arrayOf(string)",default:[],description:"Allowed extensions to be decoded (2 and/or 5)"}},e.a=r},function(t,e,n){var r=n(38),o="object"==typeof self&&self&&self.Object===Object&&self,i=r||o||Function("return this")();t.exports=i},function(t,e){function n(t){return null!=t&&"object"==typeof t}t.exports=n},function(t,e){function n(t){var e=new Float32Array(2);return e[0]=t[0],e[1]=t[1],e}t.exports=n},function(t,e,n){function r(t){return null==t?void 0===t?c:u:s&&s in Object(t)?i(t):a(t)}var o=n(11),i=n(119),a=n(146),u="[object Null]",c="[object Undefined]",s=o?o.toStringTag:void 0;t.exports=r},function(t,e,n){"use strict";e.a={drawRect:function(t,e,n,r){n.strokeStyle=r.color,n.fillStyle=r.color,n.lineWidth=1,n.beginPath(),n.strokeRect(t.x,t.y,e.x,e.y)},drawPath:function(t,e,n,r){n.strokeStyle=r.color,n.fillStyle=r.color,n.lineWidth=r.lineWidth,n.beginPath(),n.moveTo(t[0][e.x],t[0][e.y]);for(var o=1;o-1&&t%1==0&&t0?Math.floor(this.x+.5):Math.floor(this.x-.5),this.y=this.y>0?Math.floor(this.y+.5):Math.floor(this.y-.5),this}}}function o(t,e,n){n||(n=t);for(var r=t.data,o=r.length,i=n.data;o--;)i[o]=r[o]>o]++;return a}function a(t,e){function n(t,e){var n,r=0;for(n=t;n<=e;n++)r+=a[n];return r}function r(t,e){var n,r=0;for(n=t;n<=e;n++)r+=n*a[n];return r}function o(){var o,u,c,s,f,l,d,h=[0],p=(1<c)for(i=s[u],i.score=o,i.item=t[r],c=Number.MAX_VALUE,a=0;ae[r]?r++:n++;return o}function _(t,e){function n(t){for(var e=0,n=t[Math.floor(t.length/2)];e0&&(n=Math.abs(t[e]-d)>Math.abs(t[e-1]-d)?t[e-1]:t[e]),d/nc[f-1]/c[f]?{x:n,y:n}:null}var r,o=p(e.x),i=p(e.y),a=Math.max(e.x,e.y),u=v(o,i),c=[8,10,15,20,32,60,80],s={"x-small":5,small:4,medium:3,large:2,"x-large":1},f=s[t]||s.medium,l=c[f],d=Math.floor(a/l);return r=n(u),r||(r=n(p(a)))||(r=n(p(d*l))),r}function g(t){return{value:parseFloat(t),unit:(t.indexOf("%"),t.length,"%")}}function y(t,e,n){var r={width:t,height:e},o=Object.keys(n).reduce(function(t,e){var o=n[e],i=g(o),a=C[e](i,r);return t[e]=a,t},{});return{sx:o.left,sy:o.top,sw:o.right-o.left,sh:o.bottom-o.top}}var m=n(50),x=n(3);e.b=r,e.f=u,e.g=c,e.h=s,e.c=f,e.d=l,e.i=d,e.a=h,e.e=_,e.j=y;var b={clone:n(7)},E={clone:n(83)},C={top:function(t,e){if("%"===t.unit)return Math.floor(e.height*(t.value/100))},right:function(t,e){if("%"===t.unit)return Math.floor(e.width-e.width*(t.value/100))},bottom:function(t,e){if("%"===t.unit)return Math.floor(e.height-e.height*(t.value/100))},left:function(t,e){if("%"===t.unit)return Math.floor(e.width*(t.value/100))}}},function(t,e,n){"use strict";function r(t,e,n,r){e?this.data=e:n?(this.data=new n(t.x*t.y),n===Array&&r&&a.a.init(this.data,0)):(this.data=new Uint8Array(t.x*t.y),Uint8Array===Array&&r&&a.a.init(this.data,0)),this.size=t}var o=n(53),i=n(19),a=n(3),u={clone:n(7)};r.prototype.inImageWithBorder=function(t,e){return t.x>=e&&t.y>=e&&t.x0&&(a=g[r-1],a.m00+=1,a.m01+=n,a.m10+=e,a.m11+=e*n,a.m02+=o,a.m20+=e*e);for(i=0;i=0?x:-x)+m,a.theta=(180*h/m+90)%180-90,a.theta<0&&(a.theta+=180),a.rad=h>m?h-m:h,a.vec=u.clone([Math.cos(h),Math.sin(h)]),y.push(a));return y},r.prototype.show=function(t,e){var n,r,o,i,a,u,c;for(e||(e=1),n=t.getContext("2d"),t.width=this.size.x,t.height=this.size.y,r=n.getImageData(0,0,t.width,t.height),o=r.data,i=0,c=0;c360)&&(e=360);for(var o=[0,1,1],a=[0,0,0],u=[255,255,255],c=[0,0,0],s=[],f=t.getContext("2d"),l=f.getImageData(r.x,r.y,this.size.x,this.size.y),d=l.data,h=this.data.length;h--;)o[0]=this.data[h]*e,s=o[0]<=0?u:o[0]>=360?c:n.i(i.a)(o,a),d[4*h+0]=s[0],d[4*h+1]=s[1],d[4*h+2]=s[2],d[4*h+3]=255;f.putImageData(l,r.x,r.y)},e.a=r},function(t,e,n){function r(t,e,n){"__proto__"==e&&o?o(t,e,{configurable:!0,enumerable:!0,value:n,writable:!0}):t[e]=n}var o=n(37);t.exports=r},function(t,e,n){function r(t,e){var n=i(t,e);return o(n)?n:void 0}var o=n(97),i=n(120);t.exports=r},function(t,e,n){function r(t){if("string"==typeof t||o(t))return t;var e=t+"";return"0"==e&&1/t==-i?"-0":e}var o=n(27),i=1/0;t.exports=r},function(t,e,n){function r(t){return null!=t&&i(t.length)&&!o(t)}var o=n(25),i=n(26);t.exports=r},function(t,e,n){function r(t){if(!i(t))return!1;var e=o(t);return e==u||e==c||e==a||e==s}var o=n(8),i=n(0),a="[object AsyncFunction]",u="[object Function]",c="[object GeneratorFunction]",s="[object Proxy]";t.exports=r},function(t,e){function n(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=r}var r=9007199254740991;t.exports=n},function(t,e,n){function r(t){return"symbol"==typeof t||i(t)&&o(t)==a}var o=n(8),i=n(6),a="[object Symbol]";t.exports=r},function(t,e,n){var r=n(100),o=n(116),i=o(function(t,e,n){r(t,e,n)});t.exports=i},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){"use strict";var r={searchDirections:[[0,1],[1,1],[1,0],[1,-1],[0,-1],[-1,-1],[-1,0],[-1,1]],create:function(t,e){function n(t,e,n,r){var o,f,l;for(o=0;o<7;o++){if(f=t.cy+c[t.dir][0],l=t.cx+c[t.dir][1],i=f*s+l,a[i]===e&&(0===u[i]||u[i]===n))return u[i]=n,t.cy=f,t.cx=l,!0;0===u[i]&&(u[i]=r),t.dir=(t.dir+1)%8}return!1}function r(t,e,n){return{dir:n,x:t,y:e,next:null,prev:null}}function o(t,e,o,i,a){var u,c,s,f=null,l={cx:e,cy:t,dir:0};if(n(l,i,o,a)){f=r(e,t,l.dir),u=f,s=l.dir,c=r(l.cx,l.cy,0),c.prev=u,u.next=c,c.next=null,u=c;do l.dir=(l.dir+6)%8,n(l,i,o,a),s!==l.dir?(u.dir=l.dir,c=r(l.cx,l.cy,0),c.prev=u,u.next=c,c.next=null,u=c):(u.dir=s,u.x=l.cx,u.y=l.cy),s=l.dir;while(l.cx!==e||l.cy!==t);f.prev=u.prev,u.prev.next=f}return f}var i,a=t.data,u=e.data,c=this.searchDirections,s=t.size.x;return{trace:function(t,e,r,o){return n(t,e,r,o)},contourTracing:function(t,e,n,r,i){return o(t,e,n,r,i)}}}};e.a=r},function(t,e,n){"use strict";function r(){o.a.call(this)}var o=n(1),i=n(3),a={ALPHABETH_STRING:{value:"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"},ALPHABET:{value:[48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,45,46,32,42,36,47,43,37]},CHARACTER_ENCODINGS:{value:[52,289,97,352,49,304,112,37,292,100,265,73,328,25,280,88,13,268,76,28,259,67,322,19,274,82,7,262,70,22,385,193,448,145,400,208,133,388,196,148,168,162,138,42]},ASTERISK:{value:148},FORMAT:{value:"code_39",writeable:!1}};r.prototype=Object.create(o.a.prototype,a),r.prototype.constructor=r,r.prototype._decode=function(){var t,e,n,r,o=this,a=[0,0,0,0,0,0,0,0,0],u=[],c=o._findStart();if(!c)return null;r=o._nextSet(o._row,c.end);do{if(a=o._toCounters(r,a),(n=o._toPattern(a))<0)return null;if((t=o._patternToChar(n))<0)return null;u.push(t),e=r,r+=i.a.sum(a),r=o._nextSet(o._row,r)}while("*"!==t);return u.pop(),u.length&&o._verifyTrailingWhitespace(e,r,a)?{code:u.join(""),start:c.start,end:r,startInfo:c,decodedCodes:u}:null},r.prototype._verifyTrailingWhitespace=function(t,e,n){var r=i.a.sum(n);return 3*(e-t-r)>=r},r.prototype._patternToChar=function(t){var e,n=this;for(e=0;ee&&(r=t[n]);return r},r.prototype._toPattern=function(t){for(var e,n,r=t.length,o=0,i=r,a=0,u=this;i>3;){for(o=u._findNextWidth(t,o),i=0,e=0,n=0;no&&(e|=1<0;n++)if(t[n]>o&&(i--,2*t[n]>=a))return-1;return e}}return-1},r.prototype._findStart=function(){var t,e,n,r=this,o=r._nextSet(r._row),i=o,a=[0,0,0,0,0,0,0,0,0],u=0,c=!1;for(t=o;t0)for(r=0;r0){if(!(t=Y.filter(function(t){return!t.busy})[0]))return;w.attachData(t.imageData)}else w.attachData(S.data);w.grab()&&(t?(t.busy=!0,t.worker.postMessage({cmd:"process",imageData:t.imageData},[t.imageData.buffer])):_())}else _()}function y(){var t=null,e=1e3/($.frequency||60);T=!1,function n(r){t=t||r,T||(r>=t&&(t+=e,g()),window.requestAnimFrame(n))}(performance.now())}function m(){Q&&"LiveStream"===$.inputStream.type?y():g()}function x(t){var e,n={worker:void 0,imageData:new Uint8Array(R.getWidth()*R.getHeight()),busy:!0};e=C(),n.worker=new Worker(e),n.worker.onmessage=function(r){if("initialized"===r.data.event)return URL.revokeObjectURL(e),n.busy=!1,n.imageData=new Uint8Array(r.data.imageData),t(n);"processed"===r.data.event?(n.imageData=new Uint8Array(r.data.imageData),n.busy=!1,v(r.data.result,n.imageData)):r.data.event},n.worker.postMessage({cmd:"init",size:{x:R.getWidth(),y:R.getHeight()},imageData:n.imageData,config:b($)},[n.imageData.buffer])}function b(t){return X({},t,{inputStream:X({},t.inputStream,{target:null})})}function E(t){function e(t){self.postMessage({event:"processed",imageData:o.data,result:t},[o.data.buffer])}function n(){self.postMessage({event:"initialized",imageData:o.data},[o.data.buffer])}if(t){var r=t().default;if(!r)return void self.postMessage({event:"error",message:"Quagga could not be created"})}var o;self.onmessage=function(t){if("init"===t.data.cmd){var i=t.data.config;i.numOfWorkers=0,o=new r.ImageWrapper({x:t.data.size.x,y:t.data.size.y},new Uint8Array(t.data.imageData)),r.init(i,n,o),r.onProcessed(e)}else"process"===t.data.cmd?(o.data=new Uint8Array(t.data.imageData),r.start()):"setReaders"===t.data.cmd&&r.setReaders(t.data.readers)}}function C(){var e,n;return void 0!==t&&(n=t),e=new Blob(["("+E.toString()+")("+n+");"],{type:"text/javascript"}),window.URL.createObjectURL(e)}function O(t){P?P.setReaders(t):Q&&Y.length>0&&Y.forEach(function(e){e.worker.postMessage({cmd:"setReaders",readers:t})})}function A(t,e){var n=t-Y.length;if(0===n)return e&&e();if(n<0){return Y.slice(n).forEach(function(t){t.worker.terminate()}),Y=Y.slice(0,n),e&&e()}for(var r=function(n){Y.push(n),Y.length>=t&&e&&e()},o=0;oe},getPoints:function(){return a},getCenter:function(){return u}}},createPoint:function(t,e,n){return{rad:t[n],point:t,id:e}}}},function(t,e,n){"use strict";e.a=function(){function t(t){return o[t]||(o[t]={subscribers:[]}),o[t]}function e(){o={}}function n(t,e){t.async?setTimeout(function(){t.callback(e)},4):t.callback(e)}function r(e,n,r){var o;if("function"==typeof n)o={callback:n,async:r};else if(o=n,!o.callback)throw"Callback was not specified on options";t(e).subscribers.push(o)}var o={};return{subscribe:function(t,e,n){return r(t,e,n)},publish:function(e,r){var o=t(e),i=o.subscribers;i.filter(function(t){return!!t.once}).forEach(function(t){n(t,r)}),o.subscribers=i.filter(function(t){return!t.once}),o.subscribers.forEach(function(t){n(t,r)})},once:function(t,e,n){r(t,{callback:e,async:n,once:!0})},unsubscribe:function(n,r){var o;n?(o=t(n),o.subscribers=o&&r?o.subscribers.filter(function(t){return t.callback!==r}):[]):e()}}}()},function(t,e,n){"use strict";function r(){return navigator.mediaDevices&&"function"==typeof navigator.mediaDevices.enumerateDevices?navigator.mediaDevices.enumerateDevices():Promise.reject(new Error("enumerateDevices is not defined"))}function o(t){return navigator.mediaDevices&&"function"==typeof navigator.mediaDevices.getUserMedia?navigator.mediaDevices.getUserMedia(t):Promise.reject(new Error("getUserMedia is not defined"))}e.b=r,e.a=o},function(t,e,n){"use strict";function r(t,e,n){n||(n={data:null,size:e}),this.data=n.data,this.originalSize=n.size,this.I=n,this.from=t,this.size=e}r.prototype.show=function(t,e){var n,r,o,i,a,u,c;for(e||(e=1),n=t.getContext("2d"),t.width=this.size.x,t.height=this.size.y,r=n.getImageData(0,0,t.width,t.height),o=r.data,i=0,a=0;a>>16&65535,r=65535&t,o=e>>>16&65535,i=65535&e;return r*i+(n*i+r*o<<16>>>0)|0},"function"!=typeof Object.assign&&(Object.assign=function(t){"use strict";if(null===t)throw new TypeError("Cannot convert undefined or null to object");for(var e=Object(t),n=1;n1&&(!e.inImageWithBorder(t[0],0)||!e.inImageWithBorder(t[1],0));)r-=Math.ceil(r/2),o(-r);return t}function u(t){return[{x:(t[1][0]-t[0][0])/2+t[0][0],y:(t[1][1]-t[0][1])/2+t[0][1]},{x:(t[3][0]-t[2][0])/2+t[2][0],y:(t[3][1]-t[2][1])/2+t[2][1]}]}function c(t){var n,o=null,i=r.a.getBarcodeLine(e,t[0],t[1]);for(r.a.toBinaryLine(i),n=0;nE?l:E,g.push(l)}var o,i,a,u,c,s,f,l,d=0|e.x,h=0|e.y,p=0|n.x,v=0|n.y,_=Math.abs(v-h)>Math.abs(p-d),g=[],y=t.data,m=t.size.x,x=0,b=255,E=0;for(_&&(s=d,d=h,h=s,s=p,p=v,v=s),d>p&&(s=d,d=p,p=s,s=h,h=v,v=s),o=p-d,i=Math.abs(v-h),a=o/2|0,c=h,u=hl?o.DIR.UP:o.DIR.DOWN,d.push({pos:0,val:f[0]}),a=0;ah&&f[a+1]>.5*l?o.DIR.UP:r,r!==i&&(d.push({pos:a,val:f[a]}),r=i);for(d.push({pos:f.length,val:f[f.length-1]}),u=d[0].pos;ul?0:1;for(a=1;ad[a].val?d[a].val+(d[a+1].val-d[a].val)/3*2|0:d[a+1].val+(d[a].val-d[a+1].val)/3|0,u=d[a].pos;uh?0:1;return{line:f,threshold:h}},r.debug={printFrequency:function(t,e){var n,r=e.getContext("2d");for(e.width=t.length,e.height=256,r.beginPath(),r.strokeStyle="blue",n=0;n0?t.videoWidth>10&&t.videoHeight>10?e():window.setTimeout(r,500):n("Unable to play video stream. Is webcam working?"),o--}var o=10;r()})}function o(t,e){return n.i(d.a)(e).then(function(e){return new Promise(function(n){s=e,t.setAttribute("autoplay",!0),t.setAttribute("muted",!0),t.setAttribute("playsinline",!0),t.srcObject=e,t.addEventListener("loadedmetadata",function(){t.play(),n()})})}).then(r.bind(null,t))}function i(t){var e=l()(t,["width","height","facingMode","aspectRatio","deviceId"]);return void 0!==t.minAspectRatio&&t.minAspectRatio>0&&(e.aspectRatio=t.minAspectRatio,console.log("WARNING: Constraint 'minAspectRatio' is deprecated; Use 'aspectRatio' instead")),void 0!==t.facing&&(e.facingMode=t.facing,console.log("WARNING: Constraint 'facing' is deprecated. Use 'facingMode' instead'")),e}function a(t){var e={audio:!1,video:i(t)};return e.video.deviceId&&e.video.facingMode&&delete e.video.facingMode,Promise.resolve(e)}function u(){return n.i(d.b)().then(function(t){return t.filter(function(t){return"videoinput"===t.kind})})}function c(){if(s){var t=s.getVideoTracks();if(t&&t.length)return t[0]}}var s,f=n(162),l=n.n(f),d=n(52);e.a={request:function(t,e){return a(e).then(o.bind(null,t))},release:function(){var t=s&&s.getVideoTracks();t&&t.length&&t[0].stop(),s=null},enumerateVideoDevices:u,getActiveStreamLabel:function(){var t=c();return t?t.label:""},getActiveTrack:c}},function(t,e,n){"use strict";function r(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:d;return/^blob\:/i.test(t)?i(t).then(o).then(function(t){return a(t,e)}):Promise.resolve(null)}function o(t){return new Promise(function(e){var n=new FileReader;n.onload=function(t){return e(t.target.result)},n.readAsArrayBuffer(t)})}function i(t){return new Promise(function(e,n){var r=new XMLHttpRequest;r.open("GET",t,!0),r.responseType="blob",r.onreadystatechange=function(){r.readyState!==XMLHttpRequest.DONE||200!==r.status&&0!==r.status||e(this.response)},r.onerror=n,r.send()})}function a(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:d,n=new DataView(t),r=t.byteLength,o=e.reduce(function(t,e){var n=Object.keys(l).filter(function(t){return l[t]===e})[0];return n&&(t[n]=e),t},{}),i=2;if(255!==n.getUint8(0)||216!==n.getUint8(1))return!1;for(;i1?i.size:Math.floor(e/o*i.size):e,r=i.size?e/o>1?Math.floor(o/e*i.size):i.size:o,s.x=n,s.y=r}var n,r,o={},i=null,a=["canrecord","ended"],u={},c={x:0,y:0},s={x:0,y:0};return o.getRealWidth=function(){return t.videoWidth},o.getRealHeight=function(){return t.videoHeight},o.getWidth=function(){return n},o.getHeight=function(){return r},o.setWidth=function(t){n=t},o.setHeight=function(t){r=t},o.setInputStream=function(e){i=e,t.src=void 0!==e.src?e.src:""},o.ended=function(){return t.ended},o.getConfig=function(){return i},o.setAttribute=function(e,n){t.setAttribute(e,n)},o.pause=function(){t.pause()},o.play=function(){t.play()},o.setCurrentTime=function(e){"LiveStream"!==i.type&&(t.currentTime=e)},o.addEventListener=function(e,n,r){a.indexOf(e)!==-1?(u[e]||(u[e]=[]),u[e].push(n)):t.addEventListener(e,n,r)},o.clearEventHandlers=function(){a.forEach(function(e){var n=u[e];n&&n.length>0&&n.forEach(function(n){t.removeEventListener(e,n)})})},o.trigger=function(t,n){var r,i=u[t];if("canrecord"===t&&e(),i&&i.length>0)for(r=0;r1?a.size:Math.floor(u/c*a.size):u,o=a.size?u/c>1?Math.floor(c/u*a.size):a.size:c,x.x=n,x.y=o,l=!0,s=0,setTimeout(function(){e("canrecord",[])},0)},p,h,a.sequence)}function e(t,e){var n,r=y[t];if(r&&r.length>0)for(n=0;nf&&(f=o.box[r][0]),o.box[r][1]l&&(l=o.box[r][1]);for(a=[[c,s],[f,s],[f,l],[c,l]],u=p.halfSample?2:1,i=M.invert(i,i),r=0;r<4;r++)I.transformMat2(a[r],a[r],i);for(r=0;r<4;r++)I.scale(a[r],a[r],u);return a}function a(){n.i(w.f)(v,E),E.zeroBorder()}function u(){var t,e,n,r,o,i,a,u=[];for(t=0;t0&&r[x.data[n]-1]++;return r=r.map(function(t,e){return{val:t,label:e+1}}),r.sort(function(t,e){return e.val-t.val}),r.filter(function(t){return t.val>=5})}function s(t,e){var n,r,o,a,u=[],c=[];for(n=0;n=2){for(o=0;ol&&c.push(t[o]);if(c.length>=2){for(a=f(c),i=0,o=0;o1&&a.length>=c.length/4*3&&a.length>t.length/4&&(i/=a.length,u={index:e[1]*z.x+e[0],pos:{x:n,y:r},box:[I.clone([n,r]),I.clone([n+g.size.x,r]),I.clone([n+g.size.x,r+g.size.y]),I.clone([n,r+g.size.y])],moments:a,rad:i,vec:I.clone([Math.cos(i),Math.sin(i)])},s.push(u))}}return s}function h(t){function e(){var t;for(t=0;ta&&n(u):x.data[u]=Number.MAX_VALUE}var r,o,i=0,a=.95,u=0;for(T.a.init(m.data,0),T.a.init(x.data,0),T.a.init(b.data,null),r=0;r0) {length=length - 1|0;images[outImagePtr+length|0]=(images[aImagePtr+length|0]|0) - (images[bImagePtr+length|0]|0)|0;}}function bitwiseOr(aImagePtr, bImagePtr, outImagePtr) {aImagePtr=aImagePtr|0;bImagePtr=bImagePtr|0;outImagePtr=outImagePtr|0;var length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;images[outImagePtr+length|0]=images[aImagePtr+length|0]|0|(images[bImagePtr+length|0]|0)|0;}}function countNonZero(imagePtr) {imagePtr=imagePtr|0;var sum=0,length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;sum=(sum|0)+(images[imagePtr+length|0]|0)|0;}return sum|0;}function init(imagePtr, value) {imagePtr=imagePtr|0;value=value|0;var length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;images[imagePtr+length|0]=value;}}function dilate(inImagePtr, outImagePtr) {inImagePtr=inImagePtr|0;outImagePtr=outImagePtr|0;var v=0,u=0,sum=0,yStart1=0,yStart2=0,xStart1=0,xStart2=0,offset=0;for (v=1; (v|0)<(size - 1|0); v=v+1|0) {offset=offset+size|0;for (u=1; (u|0)<(size - 1|0); u=u+1|0) {yStart1=offset - size|0;yStart2=offset+size|0;xStart1=u - 1|0;xStart2=u+1|0;sum=(images[inImagePtr+yStart1+xStart1|0]|0)+(images[inImagePtr+yStart1+xStart2|0]|0)+(images[inImagePtr+offset+u|0]|0)+(images[inImagePtr+yStart2+xStart1|0]|0)+(images[inImagePtr+yStart2+xStart2|0]|0)|0;if ((sum|0)>(0|0)) {images[outImagePtr+offset+u|0]=1;} else {images[outImagePtr+offset+u|0]=0;}}}return;}function memcpy(srcImagePtr, dstImagePtr) {srcImagePtr=srcImagePtr|0;dstImagePtr=dstImagePtr|0;var length=0;length=imul(size, size)|0;while ((length|0)>0) {length=length - 1|0;images[dstImagePtr+length|0]=images[srcImagePtr+length|0]|0;}}function zeroBorder(imagePtr) {imagePtr=imagePtr|0;var x=0,y=0;for (x=0; (x|0)<(size - 1|0); x=x+1|0) {images[imagePtr+x|0]=0;images[imagePtr+y|0]=0;y=y+size - 1|0;images[imagePtr+y|0]=0;y=y+1|0;}for (x=0; (x|0)<(size|0); x=x+1|0) {images[imagePtr+y|0]=0;y=y+1|0;}}function skeletonize() {var subImagePtr=0,erodedImagePtr=0,tempImagePtr=0,skelImagePtr=0,sum=0,done=0;erodedImagePtr=imul(size, size)|0;tempImagePtr=erodedImagePtr+erodedImagePtr|0;skelImagePtr=tempImagePtr+erodedImagePtr|0;init(skelImagePtr, 0);zeroBorder(subImagePtr);do {erode(subImagePtr, erodedImagePtr);dilate(erodedImagePtr, tempImagePtr);subtract(subImagePtr, tempImagePtr, tempImagePtr);bitwiseOr(skelImagePtr, tempImagePtr, skelImagePtr);memcpy(erodedImagePtr, subImagePtr);sum=countNonZero(subImagePtr)|0;done=(sum|0) == 0|0;} while (!done);}return {skeletonize: skeletonize};} __webpack_exports__["a"]=Skeletonizer; },function(t,e,n){"use strict";function r(t){o.a.call(this,t),this.barSpaceRatio=[1,1]}var o=n(1),i=1,a=3,u={START_PATTERN:{value:[a,i,a,i,i,i]},STOP_PATTERN:{value:[a,i,i,i,a]},CODE_PATTERN:{value:[[i,i,a,a,i],[a,i,i,i,a],[i,a,i,i,a],[a,a,i,i,i],[i,i,a,i,a],[a,i,a,i,i],[i,a,a,i,i],[i,i,i,a,a],[a,i,i,a,i],[i,a,i,a,i]]},SINGLE_CODE_ERROR:{value:.78,writable:!0},AVG_CODE_ERROR:{value:.3,writable:!0},FORMAT:{value:"2of5"}},c=u.START_PATTERN.value.reduce(function(t,e){return t+e},0);r.prototype=Object.create(o.a.prototype,u),r.prototype.constructor=r,r.prototype._findPattern=function(t,e,n,r){var o,i,a,u,c=[],s=this,f=0,l={error:Number.MAX_VALUE,code:-1,start:0,end:0},d=s.AVG_CODE_ERROR;for(n=n||!1,r=r||!1,e||(e=s._nextSet(s._row)),o=0;o=0&&n._matchRange(t,e.start,0))return e;r=e.end,e=null}},r.prototype._verifyTrailingWhitespace=function(t){var e,n=this;return e=t.end+(t.end-t.start)/2,e1&&i._isStartEnd(n))break}while(ri._counters.length?i._counters.length:r,o=t.start+i._sumCounters(t.startCounter,r-8),{code:a.join(""),start:t.start,end:o,startInfo:t,decodedCodes:a}):null},r.prototype._verifyWhitespace=function(t,e){return(t-1<=0||this._counters[t-1]>=this._calculatePatternLength(t)/2)&&(e+8>=this._counters.length||this._counters[e+7]>=this._calculatePatternLength(e)/2)},r.prototype._calculatePatternLength=function(t){var e,n=0;for(e=t;e=0;i--)n=2==(1&i)?c.bar:c.space,r=1==(1&a)?n.wide:n.narrow,r.size+=u._counters[s+i],r.counts++,a>>=1;s+=8}return["space","bar"].forEach(function(t){var e=c[t];e.wide.min=Math.floor((e.narrow.size/e.narrow.counts+e.wide.size/e.wide.counts)/2),e.narrow.max=Math.ceil(e.wide.min),e.wide.max=Math.ceil((e.wide.size*u.MAX_ACCEPTABLE+u.PADDING)/e.wide.counts)}),c},r.prototype._charToPattern=function(t){var e,n=this,r=t.charCodeAt(0);for(e=0;e=0;r--){if(o=0==(1&r)?s.bar:s.space,i=1==(1&u)?o.wide:o.narrow,(a=c._counters[f+r])i.max)return!1;u>>=1}f+=8}return!0},r.prototype._patternToChar=function(t){var e,n=this;for(e=0;ei&&(i=r),rthis._counters.length)return-1;for(e=this._computeAlternatingThreshold(t,a),n=this._computeAlternatingThreshold(t+1,a),r=0;ro&&(c|=u),u>>=1;return c},r.prototype._isStartEnd=function(t){var e;for(e=0;eu.AVG_CODE_ERROR?null:(u.CODE_PATTERN[l.code]&&(l.correction.bar=o(u.CODE_PATTERN[l.code],a,this.MODULE_INDICES.bar),l.correction.space=o(u.CODE_PATTERN[l.code],a,this.MODULE_INDICES.space)),l)}f++,a[f]=1,s=!s}return null},r.prototype._correct=function(t,e){this._correctBars(t,e.bar,this.MODULE_INDICES.bar),this._correctBars(t,e.space,this.MODULE_INDICES.space)},r.prototype._findStart=function(){var t,e,n,r,i,a=[0,0,0,0,0,0],u=this,c=u._nextSet(u._row),s=!1,f=0,l={error:Number.MAX_VALUE,code:-1,start:0,end:0,correction:{bar:1,space:1}};for(t=c;t4)return-1;if(0==(1&i))for(var u=0;u="a"&&o<="d"){if(r>e-2)return null;var i=t[++r],a=i.charCodeAt(0),u=void 0;switch(o){case"a":if(!(i>="A"&&i<="Z"))return null;u=String.fromCharCode(a-64);break;case"b":if(i>="A"&&i<="E")u=String.fromCharCode(a-38);else if(i>="F"&&i<="J")u=String.fromCharCode(a-11);else if(i>="K"&&i<="O")u=String.fromCharCode(a+16);else if(i>="P"&&i<="S")u=String.fromCharCode(a+43);else{if(!(i>="T"&&i<="Z"))return null;u=String.fromCharCode(127)}break;case"c":if(i>="A"&&i<="O")u=String.fromCharCode(a-32);else{if("Z"!==i)return null;u=":"}break;case"d":if(!(i>="A"&&i<="Z"))return null;u=String.fromCharCode(a+32)}n.push(u)}else n.push(o)}return n},r.prototype._verifyChecksums=function(t){return this._matchCheckChar(t,t.length-2,20)&&this._matchCheckChar(t,t.length-1,15)},r.prototype._matchCheckChar=function(t,e,n){var r=this,o=t.slice(0,e),i=o.length,a=o.reduce(function(t,e,o){return t+((o*-1+(i-1))%n+1)*r.ALPHABET.indexOf(e.charCodeAt(0))},0);return this.ALPHABET[a%47]===t[e].charCodeAt(0)},e.a=r},function(t,e,n){"use strict";function r(){o.a.call(this)}var o=n(4),i={FORMAT:{value:"ean_2",writeable:!1}};r.prototype=Object.create(o.a.prototype,i),r.prototype.constructor=r,r.prototype.decode=function(t,e){this._row=t;var n,r=0,o=0,i=e,a=this._row.length,u=[],c=[];for(o=0;o<2&&i=this.CODE_G_START&&(r|=1<<1-o),1!=o&&(i=this._nextSet(this._row,n.end),i=this._nextUnset(this._row,i))}return 2!=u.length||parseInt(u.join(""))%4!==r?null:{code:u.join(""),decodedCodes:c,end:n.end}},e.a=r},function(t,e,n){"use strict";function r(){a.a.call(this)}function o(t){var e;for(e=0;e<10;e++)if(t===c[e])return e;return null}function i(t){var e,n=t.length,r=0;for(e=n-2;e>=0;e-=2)r+=t[e];for(r*=3,e=n-1;e>=0;e-=2)r+=t[e];return(r*=3)%10}var a=n(4),u={FORMAT:{value:"ean_5",writeable:!1}},c=[24,20,18,17,12,6,3,10,9,5];r.prototype=Object.create(a.a.prototype,u),r.prototype.constructor=r,r.prototype.decode=function(t,e){this._row=t;var n,r=0,a=0,u=e,c=this._row.length,s=[],f=[];for(a=0;a<5&&u=this.CODE_G_START&&(r|=1<<4-a),4!=a&&(u=this._nextSet(this._row,n.end),u=this._nextUnset(this._row,u))}return 5!=s.length?null:i(s)!==o(r)?null:{code:s.join(""),decodedCodes:f,end:n.end}},e.a=r},function(t,e,n){"use strict";function r(t,e){o.a.call(this,t,e)}var o=n(4),i={FORMAT:{value:"ean_8",writeable:!1}};r.prototype=Object.create(o.a.prototype,i),r.prototype.constructor=r,r.prototype._decodePayload=function(t,e,n){var r,o=this;for(r=0;r<4;r++){if(!(t=o._decodeCode(t.end,o.CODE_G_START)))return null;e.push(t.code),n.push(t)}if(null===(t=o._findPattern(o.MIDDLE_PATTERN,t.end,!0,!1)))return null;for(n.push(t),r=0;r<4;r++){if(!(t=o._decodeCode(t.end,o.CODE_G_START)))return null;n.push(t),e.push(t.code)}return t},e.a=r},function(t,e,n){"use strict";function r(t){t=a()(o(),t),u.a.call(this,t),this.barSpaceRatio=[1,1],t.normalizeBarSpaceWidth&&(this.SINGLE_CODE_ERROR=.38,this.AVG_CODE_ERROR=.09)}function o(){var t={};return Object.keys(r.CONFIG_KEYS).forEach(function(e){t[e]=r.CONFIG_KEYS[e].default}),t}var i=n(28),a=n.n(i),u=n(1),c=1,s=3,f={START_PATTERN:{value:[c,c,c,c]},STOP_PATTERN:{value:[c,c,s]},CODE_PATTERN:{value:[[c,c,s,s,c],[s,c,c,c,s],[c,s,c,c,s],[s,s,c,c,c],[c,c,s,c,s],[s,c,s,c,c],[c,s,s,c,c],[c,c,c,s,s],[s,c,c,s,c],[c,s,c,s,c]]},SINGLE_CODE_ERROR:{value:.78,writable:!0},AVG_CODE_ERROR:{value:.38,writable:!0},MAX_CORRECTION_FACTOR:{value:5},FORMAT:{value:"i2of5"}};r.prototype=Object.create(u.a.prototype,f),r.prototype.constructor=r,r.prototype._matchPattern=function(t,e){if(this.config.normalizeBarSpaceWidth){var n,r=[0,0],o=[0,0],i=[0,0],a=this.MAX_CORRECTION_FACTOR,c=1/a;for(n=0;n=0&&n._matchRange(t,e.start,0))return e;r=e.end,e=null}},r.prototype._verifyTrailingWhitespace=function(t){var e,n=this;return e=t.end+(t.end-t.start)/2,e=o.CODE_G_START&&(t.code=t.code-o.CODE_G_START,i|=1<<5-r),e.push(t.code),n.push(t)}return o._determineParity(i,e)?t:null},r.prototype._determineParity=function(t,e){var n,r;for(r=0;r0&&n(f)?e>1?r(f,e-1,n,a,u):o(u,f):a||(u[u.length]=f)}return u}var o=n(90),i=n(128);t.exports=r},function(t,e,n){var r=n(117),o=r();t.exports=o},function(t,e,n){function r(t,e){e=o(e,t);for(var n=0,r=e.length;null!=t&&n1?n[o-1]:void 0,u=o>2?n[2]:void 0;for(a=t.length>3&&"function"==typeof a?(o--,a):void 0,u&&i(n[0],n[1],u)&&(a=o<3?void 0:a,o=1),e=Object(e);++r-1}var o=n(12);t.exports=r},function(t,e,n){function r(t,e){var n=this.__data__,r=o(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this}var o=n(12);t.exports=r},function(t,e,n){function r(){this.size=0,this.__data__={hash:new o,map:new(a||i),string:new o}}var o=n(84),i=n(10),a=n(33);t.exports=r},function(t,e,n){function r(t){var e=o(this,t).delete(t);return this.size-=e?1:0,e}var o=n(14);t.exports=r},function(t,e,n){function r(t){return o(this,t).get(t)}var o=n(14);t.exports=r},function(t,e,n){function r(t){return o(this,t).has(t)}var o=n(14);t.exports=r},function(t,e,n){function r(t,e){var n=o(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this}var o=n(14);t.exports=r},function(t,e,n){function r(t){var e=o(t,function(t){return n.size===i&&n.clear(),t}),n=e.cache;return e}var o=n(161),i=500;t.exports=r},function(t,e){function n(t){var e=[];if(null!=t)for(var n in Object(t))e.push(n);return e}t.exports=n},function(t,e,n){(function(t){var r=n(38),o="object"==typeof e&&e&&!e.nodeType&&e,i=o&&"object"==typeof t&&t&&!t.nodeType&&t,a=i&&i.exports===o,u=a&&r.process,c=function(){try{return u&&u.binding&&u.binding("util")}catch(t){}}();t.exports=c}).call(e,n(29)(t))},function(t,e){function n(t){return o.call(t)}var r=Object.prototype,o=r.toString;t.exports=n},function(t,e){function n(t,e){return function(n){return t(e(n))}}t.exports=n},function(t,e){function n(t){var e=0,n=0;return function(){var a=i(),u=o-(a-n);if(n=a,u>0){if(++e>=r)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}var r=800,o=16,i=Date.now;t.exports=n},function(t,e,n){function r(){this.__data__=new o,this.size=0}var o=n(10);t.exports=r},function(t,e){function n(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n}t.exports=n},function(t,e){function n(t){return this.__data__.get(t)}t.exports=n},function(t,e){function n(t){return this.__data__.has(t)}t.exports=n},function(t,e,n){function r(t,e){var n=this.__data__;if(n instanceof o){var r=n.__data__;if(!i||r.length=0;e--){var n=Math.floor(Math.random()*e),r=t[e];t[e]=t[n],t[n]=r}return t},toPointList:function(t){var e=t.reduce((function(t,e){var n="[".concat(e.join(","),"]");return t.push(n),t}),[]);return"[".concat(e.join(",\r\n"),"]")},threshold:function(t,e,n){return t.reduce((function(r,o){return n.apply(t,[o])>=e&&r.push(o),r}),[])},maxIndex:function(t){for(var e=0,n=0;nt[e]&&(e=n);return e},max:function(t){for(var e=0,n=0;ne&&(e=t[n]);return e},sum:function(t){for(var e=t.length,n=0;e--;)n+=t[e];return n}}},function(t,e,n){"use strict";n.d(e,"h",(function(){return l})),n.d(e,"i",(function(){return d})),n.d(e,"b",(function(){return p})),n.d(e,"j",(function(){return v})),n.d(e,"e",(function(){return y})),n.d(e,"c",(function(){return g})),n.d(e,"f",(function(){return x})),n.d(e,"g",(function(){return _})),n.d(e,"a",(function(){return b})),n.d(e,"d",(function(){return O}));var r=n(7),o=n(84),i={clone:r.clone,dot:r.dot},a=function(t,e){var n=[],r={rad:0,vec:i.clone([0,0])},o={};function a(t){o[t.id]=t,n.push(t)}function u(){var t,e=0;for(t=0;te},getPoints:function(){return n},getCenter:function(){return r}}},u=function(t,e,n){return{rad:t[n],point:t,id:e}},c=n(8),s={clone:r.clone},f={clone:o.clone};function l(t,e){return{x:t,y:e,toVec2:function(){return s.clone([this.x,this.y])},toVec3:function(){return f.clone([this.x,this.y,1])},round:function(){return this.x=this.x>0?Math.floor(this.x+.5):Math.floor(this.x-.5),this.y=this.y>0?Math.floor(this.y+.5):Math.floor(this.y-.5),this}}}function h(t,e){e||(e=8);for(var n=t.data,r=n.length,o=8-e,i=new Int32Array(1<>o]++;return i}function d(t,e){var n=function(t){var e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:8,r=8-n;function o(t,n){for(var r=0,o=t;o<=n;o++)r+=e[o];return r}function i(t,n){for(var r=0,o=t;o<=n;o++)r+=o*e[o];return r}function a(){var r,a,u,s,f=[0],l=(1<c)for((i=s[u]).score=o,i.item=t[r],c=Number.MAX_VALUE,a=0;a1&&void 0!==arguments[1]?arguments[1]:[0,0,0],n=t[0],r=t[1],o=t[2],i=o*r,a=i*(1-Math.abs(n/60%2-1)),u=o-i,c=0,s=0,f=0;return n<60?(c=i,s=a):n<120?(c=a,s=i):n<180?(s=i,f=a):n<240?(s=a,f=i):n<300?(c=a,f=i):n<360&&(c=i,f=a),e[0]=255*(c+u)|0,e[1]=255*(s+u)|0,e[2]=255*(f+u)|0,e}function m(t){for(var e=[],n=[],r=1;re[r]?r++:n++;return o}(r,o),u=[8,10,15,20,32,60,80],c={"x-small":5,small:4,medium:3,large:2,"x-large":1},s=c[t]||c.medium,f=u[s],l=Math.floor(i/f);function h(t){for(var e=0,n=t[Math.floor(t.length/2)];e0&&(n=Math.abs(t[e]-l)>Math.abs(t[e-1]-l)?t[e-1]:t[e]),l/nu[s-1]/u[s]?{x:n,y:n}:null}return(n=h(a))||(n=h(m(i)))||(n=h(m(l*f))),n}var w={top:function(t,e){return"%"===t.unit?Math.floor(e.height*(t.value/100)):null},right:function(t,e){return"%"===t.unit?Math.floor(e.width-e.width*(t.value/100)):null},bottom:function(t,e){return"%"===t.unit?Math.floor(e.height-e.height*(t.value/100)):null},left:function(t,e){return"%"===t.unit?Math.floor(e.width*(t.value/100)):null}};function O(t,e,n){var r={width:t,height:e},o=Object.keys(n).reduce((function(t,e){var o=function(t){return{value:parseFloat(t),unit:(t.indexOf("%"),t.length,"%")}}(n[e]),i=w[e](o,r);return t[e]=i,t}),{});return{sx:o.left,sy:o.top,sw:o.right-o.left,sh:o.bottom-o.top}}},function(t,e,n){"use strict";var r=n(83),o=n.n(r),i=n(3),a=n.n(i),u=n(4),c=n.n(u),s=n(0),f=n.n(s),l=n(7),h=n(9),d=n(8),p={clone:l.clone};function v(t){if(t<0)throw new Error("expected positive number, received ".concat(t))}var y=function(){function t(e,n){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:Uint8Array,o=arguments.length>3?arguments[3]:void 0;a()(this,t),f()(this,"data",void 0),f()(this,"size",void 0),f()(this,"indexMapping",void 0),n?this.data=n:(this.data=new r(e.x*e.y),o&&d.a.init(this.data,0)),this.size=e}return c()(t,[{key:"inImageWithBorder",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return v(e),t.x>=0&&t.y>=0&&t.x0&&((a=v[r-1]).m00+=1,a.m01+=n,a.m10+=e,a.m11+=e*n,a.m02+=o,a.m20+=e*e);for(i=0;i=0?x:-x)+g,a.theta=(180*f/g+90)%180-90,a.theta<0&&(a.theta+=180),a.rad=f>g?f-g:f,a.vec=p.clone([Math.cos(f),Math.sin(f)]),y.push(a));return y}},{key:"getAsRGBA",value:function(){for(var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1,e=new Uint8ClampedArray(4*this.size.x*this.size.y),n=0;n1&&void 0!==arguments[1]?arguments[1]:1,n=t.getContext("2d");if(!n)throw new Error("Unable to get canvas context");var r=n.getImageData(0,0,t.width,t.height),o=this.getAsRGBA(e);t.width=this.size.x,t.height=this.size.y;var i=new ImageData(o,r.width,r.height);n.putImageData(i,0,0)}},{key:"overlay",value:function(t,e,n){var r=e<0||e>360?360:e,i=[0,1,1],a=[0,0,0],u=[255,255,255],c=[0,0,0],s=t.getContext("2d");if(!s)throw new Error("Unable to get canvas context");for(var f=s.getImageData(n.x,n.y,this.size.x,this.size.y),l=f.data,d=this.data.length;d--;){i[0]=this.data[d]*r;var p=4*d,v=i[0]<=0?u:i[0]>=360?c:Object(h.g)(i,a),y=o()(v,3);l[p]=y[0],l[p+1]=y[1],l[p+2]=y[2],l[p+3]=255}s.putImageData(f,n.x,n.y)}}]),t}();e.a=y},function(t,e,n){t.exports=n(228)},function(t,e,n){var r=n(227);function o(e,n,i){return"undefined"!=typeof Reflect&&Reflect.get?(t.exports=o=Reflect.get,t.exports.default=t.exports,t.exports.__esModule=!0):(t.exports=o=function(t,e,n){var o=r(t,e);if(o){var i=Object.getOwnPropertyDescriptor(o,e);return i.get?i.get.call(n):i.value}},t.exports.default=t.exports,t.exports.__esModule=!0),o(e,n,i||e)}t.exports=o,t.exports.default=t.exports,t.exports.__esModule=!0},function(t,e){t.exports=function(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}},function(t,e){var n=Array.isArray;t.exports=n},function(t,e,n){"use strict";e.a={drawRect:function(t,e,n,r){n.strokeStyle=r.color,n.fillStyle=r.color,n.lineWidth=r.lineWidth||1,n.beginPath(),n.strokeRect(t.x,t.y,e.x,e.y)},drawPath:function(t,e,n,r){n.strokeStyle=r.color,n.fillStyle=r.color,n.lineWidth=r.lineWidth,n.beginPath(),n.moveTo(t[0][e.x],t[0][e.y]);for(var o=1;oh&&(h=i.box[o][0]),i.box[o][1]d&&(d=i.box[o][1]);for(u=[[s,f],[h,f],[h,d],[s,d]],c=r.halfSample?2:1,a=y.invert(a,a),o=0;o<4;o++)v.transformMat2(u[o],u[o],a);for(o=0;o<4;o++)v.scale(u[o],u[o],c);return u}function E(t,e){l.subImageAsCopy(a,Object(x.h)(t,e)),p.skeletonize()}function M(t,e,n,r){var o,i,u,c,s=[],f=[],l=Math.ceil(h.x/3);if(t.length>=2){for(o=0;ol&&s.push(t[o]);if(s.length>=2){for(u=function(t){var e=Object(x.b)(t,.9),n=Object(x.j)(e,1,(function(t){return t.getPoints().length})),r=[],o=[];if(1===n.length){r=n[0].item.getPoints();for(var i=0;i1&&u.length>=s.length/4*3&&u.length>t.length/4&&(i/=u.length,c={index:e[1]*R.x+e[0],pos:{x:n,y:r},box:[v.clone([n,r]),v.clone([n+a.size.x,r]),v.clone([n+a.size.x,r+a.size.y]),v.clone([n,r+a.size.y])],moments:u,rad:i,vec:v.clone([Math.cos(i),Math.sin(i)])},f.push(c))}}return f}e.a={init:function(e,n){r=n,d=e,function(){o=r.halfSample?new g.a({x:d.size.x/2|0,y:d.size.y/2|0}):d,h=Object(x.a)(r.patchSize,o.size),R.x=o.size.x/h.x|0,R.y=o.size.y/h.y|0,l=new g.a(o.size,void 0,Uint8Array,!1),u=new g.a(h,void 0,Array,!0);var e=new ArrayBuffer(65536);a=new g.a(h,new Uint8Array(e,0,h.x*h.y)),i=new g.a(h,new Uint8Array(e,h.x*h.y*3,h.x*h.y),void 0,!0),p=Object(w.a)("undefined"!=typeof window?window:"undefined"!=typeof self?self:t,{size:h.x},e),f=new g.a({x:o.size.x/a.size.x|0,y:o.size.y/a.size.y|0},void 0,Array,!0),c=new g.a(f.size,void 0,void 0,!0),s=new g.a(f.size,void 0,Int32Array,!0)}(),r.useWorker||"undefined"==typeof document||(O.dom.binary=document.createElement("canvas"),O.dom.binary.className="binaryBuffer",O.ctx.binary=O.dom.binary.getContext("2d"),O.dom.binary.width=l.size.x,O.dom.binary.height=l.size.y)},locate:function(){r.halfSample&&Object(x.f)(d,o),Object(x.i)(o,l),l.zeroBorder();var t=function(){var t,e,n,r,o,c,s=[];for(t=0;t.95&&a(i):s.data[i]=Number.MAX_VALUE}for(_.a.init(c.data,0),_.a.init(s.data,0),_.a.init(f.data,null),e=0;e0&&r[s.data[n]-1]++;return(r=r.map((function(t,e){return{val:t,label:e+1}}))).sort((function(t,e){return e.val-t.val})),r.filter((function(t){return t.val>=5}))}(e);return 0===n.length?null:function(t,e){var n,r,o,i,a=[],u=[];for(n=0;n-1&&t%1==0&&t-1&&t%1==0&&t<=9007199254740991}},function(t,e){function n(e,r){return t.exports=n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},t.exports.default=t.exports,t.exports.__esModule=!0,n(e,r)}t.exports=n,t.exports.default=t.exports,t.exports.__esModule=!0},function(t,e,n){var r=n(22),o=n(18);t.exports=function(t){return"symbol"==typeof t||o(t)&&"[object Symbol]"==r(t)}},function(t,e,n){var r=n(42);t.exports=function(t){if("string"==typeof t||r(t))return t;var e=t+"";return"0"==e&&1/t==-1/0?"-0":e}},function(t,e,n){var r=n(35)(n(17),"Map");t.exports=r},function(t,e,n){(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.exports=n}).call(this,n(46))},function(t,e){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e,n){var r=n(109),o=n(116),i=n(118),a=n(119),u=n(120);function c(t){var e=-1,n=null==t?0:t.length;for(this.clear();++et.length)&&(e=t.length);for(var n=0,r=new Array(e);n0&&(i=1/Math.sqrt(i),t[0]=e[0]*i,t[1]=e[1]*i,t[2]=e[2]*i);return t}},function(t,e){t.exports=function(t,e){return t[0]*e[0]+t[1]*e[1]+t[2]*e[2]}},function(t,e){t.exports=function(t,e,n){return t[0]=e[0]-n[0],t[1]=e[1]-n[1],t[2]=e[2]-n[2],t}},function(t,e){t.exports=function(t,e,n){return t[0]=e[0]*n[0],t[1]=e[1]*n[1],t[2]=e[2]*n[2],t}},function(t,e){t.exports=function(t,e,n){return t[0]=e[0]/n[0],t[1]=e[1]/n[1],t[2]=e[2]/n[2],t}},function(t,e){t.exports=function(t,e){var n=e[0]-t[0],r=e[1]-t[1],o=e[2]-t[2];return Math.sqrt(n*n+r*r+o*o)}},function(t,e){t.exports=function(t,e){var n=e[0]-t[0],r=e[1]-t[1],o=e[2]-t[2];return n*n+r*r+o*o}},function(t,e){t.exports=function(t){var e=t[0],n=t[1],r=t[2];return Math.sqrt(e*e+n*n+r*r)}},function(t,e){t.exports=function(t){var e=t[0],n=t[1],r=t[2];return e*e+n*n+r*r}},function(t,e,n){var r=n(153),o=n(154),i=n(60),a=n(155);t.exports=function(t,e){return r(t)||o(t,e)||i(t,e)||a()},t.exports.default=t.exports,t.exports.__esModule=!0},function(t,e,n){t.exports={EPSILON:n(71),create:n(72),clone:n(191),angle:n(192),fromValues:n(73),copy:n(193),set:n(194),equals:n(195),exactEquals:n(196),add:n(197),subtract:n(76),sub:n(198),multiply:n(77),mul:n(199),divide:n(78),div:n(200),min:n(201),max:n(202),floor:n(203),ceil:n(204),round:n(205),scale:n(206),scaleAndAdd:n(207),distance:n(79),dist:n(208),squaredDistance:n(80),sqrDist:n(209),length:n(81),len:n(210),squaredLength:n(82),sqrLen:n(211),negate:n(212),inverse:n(213),normalize:n(74),dot:n(75),cross:n(214),lerp:n(215),random:n(216),transformMat4:n(217),transformMat3:n(218),transformQuat:n(219),rotateX:n(220),rotateY:n(221),rotateZ:n(222),forEach:n(223)}},function(t,e,n){var r=n(229),o=n(243)((function(t,e){return null==t?{}:r(t,e)}));t.exports=o},function(t,e,n){var r=n(2),o=n(41),i=n(248),a=n(249);function u(e){var n="function"==typeof Map?new Map:void 0;return t.exports=u=function(t){if(null===t||!i(t))return t;if("function"!=typeof t)throw new TypeError("Super expression must either be null or a function");if(void 0!==n){if(n.has(t))return n.get(t);n.set(t,e)}function e(){return a(t,arguments,r(this).constructor)}return e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),o(e,t)},t.exports.default=t.exports,t.exports.__esModule=!0,u(e)}t.exports=u,t.exports.default=t.exports,t.exports.__esModule=!0},function(t,e,n){"use strict";var r=n(21),o={createContour2D:function(){return{dir:null,index:null,firstVertex:null,insideContours:null,nextpeer:null,prevpeer:null}},CONTOUR_DIR:{CW_DIR:0,CCW_DIR:1,UNKNOWN_DIR:2},DIR:{OUTSIDE_EDGE:-32767,INSIDE_EDGE:-32766},create:function(t,e){var n=t.data,i=e.data,a=t.size.x,u=t.size.y,c=r.a.create(t,e);return{rasterize:function(t){var e,r,s,f,l,h,d,p,v,y,g,x,_=[],m=0;for(x=0;x<400;x++)_[x]=0;for(_[0]=n[0],v=null,h=1;h0){a=a-1|0;r[n+a|0]=(r[t+a|0]|0)-(r[e+a|0]|0)|0}}function c(t,e,n){t|=0;e|=0;n|=0;var a=0;a=i(o,o)|0;while((a|0)>0){a=a-1|0;r[n+a|0]=r[t+a|0]|0|(r[e+a|0]|0)|0}}function s(t){t|=0;var e=0;var n=0;n=i(o,o)|0;while((n|0)>0){n=n-1|0;e=(e|0)+(r[t+n|0]|0)|0}return e|0}function f(t,e){t|=0;e|=0;var n=0;n=i(o,o)|0;while((n|0)>0){n=n-1|0;r[t+n|0]=e}}function l(t,e){t|=0;e|=0;var n=0;var i=0;var a=0;var u=0;var c=0;var s=0;var f=0;var l=0;for(n=1;(n|0)<(o-1|0);n=n+1|0){l=l+o|0;for(i=1;(i|0)<(o-1|0);i=i+1|0){u=l-o|0;c=l+o|0;s=i-1|0;f=i+1|0;a=(r[t+u+s|0]|0)+(r[t+u+f|0]|0)+(r[t+l+i|0]|0)+(r[t+c+s|0]|0)+(r[t+c+f|0]|0)|0;if((a|0)>(0|0)){r[e+l+i|0]=1}else{r[e+l+i|0]=0}}}}function h(t,e){t|=0;e|=0;var n=0;n=i(o,o)|0;while((n|0)>0){n=n-1|0;r[e+n|0]=r[t+n|0]|0}}function d(t){t|=0;var e=0;var n=0;for(e=0;(e|0)<(o-1|0);e=e+1|0){r[t+e|0]=0;r[t+n|0]=0;n=n+o-1|0;r[t+n|0]=0;n=n+1|0}for(e=0;(e|0)<(o|0);e=e+1|0){r[t+n|0]=0;n=n+1|0}}function p(){var t=0;var e=0;var n=0;var r=0;var p=0;var v=0;e=i(o,o)|0;n=e+e|0;r=n+e|0;f(r,0);d(t);do{a(t,e);l(e,n);u(t,n,n);c(r,n,r);h(e,t);p=s(t)|0;v=(p|0)==0|0}while(!v)}return{skeletonize:p}}},function(t,e,n){t.exports=n(263)},function(t,e,n){var r=n(91),o=n(48),i=n(121),a=n(123),u=n(13),c=n(56),s=n(54);t.exports=function t(e,n,f,l,h){e!==n&&i(n,(function(i,c){if(h||(h=new r),u(i))a(e,n,c,f,t,l,h);else{var d=l?l(s(e,c),i,c+"",e,n,h):void 0;void 0===d&&(d=i),o(e,c,d)}}),c)}},function(t,e,n){var r=n(24),o=n(97),i=n(98),a=n(99),u=n(100),c=n(101);function s(t){var e=this.__data__=new r(t);this.size=e.size}s.prototype.clear=o,s.prototype.delete=i,s.prototype.get=a,s.prototype.has=u,s.prototype.set=c,t.exports=s},function(t,e){t.exports=function(){this.__data__=[],this.size=0}},function(t,e,n){var r=n(25),o=Array.prototype.splice;t.exports=function(t){var e=this.__data__,n=r(e,t);return!(n<0)&&(n==e.length-1?e.pop():o.call(e,n,1),--this.size,!0)}},function(t,e,n){var r=n(25);t.exports=function(t){var e=this.__data__,n=r(e,t);return n<0?void 0:e[n][1]}},function(t,e,n){var r=n(25);t.exports=function(t){return r(this.__data__,t)>-1}},function(t,e,n){var r=n(25);t.exports=function(t,e){var n=this.__data__,o=r(n,t);return o<0?(++this.size,n.push([t,e])):n[o][1]=e,this}},function(t,e,n){var r=n(24);t.exports=function(){this.__data__=new r,this.size=0}},function(t,e){t.exports=function(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n}},function(t,e){t.exports=function(t){return this.__data__.get(t)}},function(t,e){t.exports=function(t){return this.__data__.has(t)}},function(t,e,n){var r=n(24),o=n(44),i=n(47);t.exports=function(t,e){var n=this.__data__;if(n instanceof r){var a=n.__data__;if(!o||a.length<199)return a.push([t,e]),this.size=++n.size,this;n=this.__data__=new i(a)}return n.set(t,e),this.size=n.size,this}},function(t,e,n){var r=n(36),o=n(105),i=n(13),a=n(107),u=/^\[object .+?Constructor\]$/,c=Function.prototype,s=Object.prototype,f=c.toString,l=s.hasOwnProperty,h=RegExp("^"+f.call(l).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");t.exports=function(t){return!(!i(t)||o(t))&&(r(t)?h:u).test(a(t))}},function(t,e,n){var r=n(27),o=Object.prototype,i=o.hasOwnProperty,a=o.toString,u=r?r.toStringTag:void 0;t.exports=function(t){var e=i.call(t,u),n=t[u];try{t[u]=void 0;var r=!0}catch(t){}var o=a.call(t);return r&&(e?t[u]=n:delete t[u]),o}},function(t,e){var n=Object.prototype.toString;t.exports=function(t){return n.call(t)}},function(t,e,n){var r,o=n(106),i=(r=/[^.]+$/.exec(o&&o.keys&&o.keys.IE_PROTO||""))?"Symbol(src)_1."+r:"";t.exports=function(t){return!!i&&i in t}},function(t,e,n){var r=n(17)["__core-js_shared__"];t.exports=r},function(t,e){var n=Function.prototype.toString;t.exports=function(t){if(null!=t){try{return n.call(t)}catch(t){}try{return t+""}catch(t){}}return""}},function(t,e){t.exports=function(t,e){return null==t?void 0:t[e]}},function(t,e,n){var r=n(110),o=n(24),i=n(44);t.exports=function(){this.size=0,this.__data__={hash:new r,map:new(i||o),string:new r}}},function(t,e,n){var r=n(111),o=n(112),i=n(113),a=n(114),u=n(115);function c(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e1?n[i-1]:void 0,u=i>2?n[2]:void 0;for(a=t.length>3&&"function"==typeof a?(i--,a):void 0,u&&o(n[0],n[1],u)&&(a=i<3?void 0:a,i=1),e=Object(e);++r0){if(++e>=800)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}},function(t,e,n){var r=n(26),o=n(39),i=n(31),a=n(13);t.exports=function(t,e,n){if(!a(n))return!1;var u=typeof e;return!!("number"==u?o(n)&&i(e,n.length):"string"==u&&e in n)&&r(n[e],t)}},function(t,e){"undefined"!=typeof window&&(window.requestAnimationFrame||(window.requestAnimationFrame=window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){window.setTimeout(t,1e3/60)})),"function"!=typeof Math.imul&&(Math.imul=function(t,e){var n=65535&t,r=65535&e;return n*r+((t>>>16&65535)*r+n*(e>>>16&65535)<<16>>>0)|0}),"function"!=typeof Object.assign&&(Object.assign=function(t){"use strict";if(null===t)throw new TypeError("Cannot convert undefined or null to object");for(var e=Object(t),n=1;n0&&(o=1/Math.sqrt(o),t[0]=e[0]*o,t[1]=e[1]*o);return t}},function(t,e){t.exports=function(t,e){return t[0]*e[0]+t[1]*e[1]}},function(t,e){t.exports=function(t,e,n){var r=e[0]*n[1]-e[1]*n[0];return t[0]=t[1]=0,t[2]=r,t}},function(t,e){t.exports=function(t,e,n,r){var o=e[0],i=e[1];return t[0]=o+r*(n[0]-o),t[1]=i+r*(n[1]-i),t}},function(t,e){t.exports=function(t,e){e=e||1;var n=2*Math.random()*Math.PI;return t[0]=Math.cos(n)*e,t[1]=Math.sin(n)*e,t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1];return t[0]=n[0]*r+n[2]*o,t[1]=n[1]*r+n[3]*o,t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1];return t[0]=n[0]*r+n[2]*o+n[4],t[1]=n[1]*r+n[3]*o+n[5],t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1];return t[0]=n[0]*r+n[3]*o+n[6],t[1]=n[1]*r+n[4]*o+n[7],t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1];return t[0]=n[0]*r+n[4]*o+n[12],t[1]=n[1]*r+n[5]*o+n[13],t}},function(t,e,n){t.exports=function(t,e,n,o,i,a){var u,c;e||(e=2);n||(n=0);c=o?Math.min(o*e+n,t.length):t.length;for(u=n;un*n){var o=Math.sqrt(r);t[0]=e[0]/o*n,t[1]=e[1]/o*n}else t[0]=e[0],t[1]=e[1];return t}},function(t,e){t.exports=function(t){var e=new Float32Array(3);return e[0]=t[0],e[1]=t[1],e[2]=t[2],e}},function(t,e,n){t.exports=function(t,e){var n=r(t[0],t[1],t[2]),a=r(e[0],e[1],e[2]);o(n,n),o(a,a);var u=i(n,a);return u>1?0:Math.acos(u)};var r=n(73),o=n(74),i=n(75)},function(t,e){t.exports=function(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t}},function(t,e){t.exports=function(t,e,n,r){return t[0]=e,t[1]=n,t[2]=r,t}},function(t,e,n){t.exports=function(t,e){var n=t[0],o=t[1],i=t[2],a=e[0],u=e[1],c=e[2];return Math.abs(n-a)<=r*Math.max(1,Math.abs(n),Math.abs(a))&&Math.abs(o-u)<=r*Math.max(1,Math.abs(o),Math.abs(u))&&Math.abs(i-c)<=r*Math.max(1,Math.abs(i),Math.abs(c))};var r=n(71)},function(t,e){t.exports=function(t,e){return t[0]===e[0]&&t[1]===e[1]&&t[2]===e[2]}},function(t,e){t.exports=function(t,e,n){return t[0]=e[0]+n[0],t[1]=e[1]+n[1],t[2]=e[2]+n[2],t}},function(t,e,n){t.exports=n(76)},function(t,e,n){t.exports=n(77)},function(t,e,n){t.exports=n(78)},function(t,e){t.exports=function(t,e,n){return t[0]=Math.min(e[0],n[0]),t[1]=Math.min(e[1],n[1]),t[2]=Math.min(e[2],n[2]),t}},function(t,e){t.exports=function(t,e,n){return t[0]=Math.max(e[0],n[0]),t[1]=Math.max(e[1],n[1]),t[2]=Math.max(e[2],n[2]),t}},function(t,e){t.exports=function(t,e){return t[0]=Math.floor(e[0]),t[1]=Math.floor(e[1]),t[2]=Math.floor(e[2]),t}},function(t,e){t.exports=function(t,e){return t[0]=Math.ceil(e[0]),t[1]=Math.ceil(e[1]),t[2]=Math.ceil(e[2]),t}},function(t,e){t.exports=function(t,e){return t[0]=Math.round(e[0]),t[1]=Math.round(e[1]),t[2]=Math.round(e[2]),t}},function(t,e){t.exports=function(t,e,n){return t[0]=e[0]*n,t[1]=e[1]*n,t[2]=e[2]*n,t}},function(t,e){t.exports=function(t,e,n,r){return t[0]=e[0]+n[0]*r,t[1]=e[1]+n[1]*r,t[2]=e[2]+n[2]*r,t}},function(t,e,n){t.exports=n(79)},function(t,e,n){t.exports=n(80)},function(t,e,n){t.exports=n(81)},function(t,e,n){t.exports=n(82)},function(t,e){t.exports=function(t,e){return t[0]=-e[0],t[1]=-e[1],t[2]=-e[2],t}},function(t,e){t.exports=function(t,e){return t[0]=1/e[0],t[1]=1/e[1],t[2]=1/e[2],t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1],i=e[2],a=n[0],u=n[1],c=n[2];return t[0]=o*c-i*u,t[1]=i*a-r*c,t[2]=r*u-o*a,t}},function(t,e){t.exports=function(t,e,n,r){var o=e[0],i=e[1],a=e[2];return t[0]=o+r*(n[0]-o),t[1]=i+r*(n[1]-i),t[2]=a+r*(n[2]-a),t}},function(t,e){t.exports=function(t,e){e=e||1;var n=2*Math.random()*Math.PI,r=2*Math.random()-1,o=Math.sqrt(1-r*r)*e;return t[0]=Math.cos(n)*o,t[1]=Math.sin(n)*o,t[2]=r*e,t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1],i=e[2],a=n[3]*r+n[7]*o+n[11]*i+n[15];return a=a||1,t[0]=(n[0]*r+n[4]*o+n[8]*i+n[12])/a,t[1]=(n[1]*r+n[5]*o+n[9]*i+n[13])/a,t[2]=(n[2]*r+n[6]*o+n[10]*i+n[14])/a,t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1],i=e[2];return t[0]=r*n[0]+o*n[3]+i*n[6],t[1]=r*n[1]+o*n[4]+i*n[7],t[2]=r*n[2]+o*n[5]+i*n[8],t}},function(t,e){t.exports=function(t,e,n){var r=e[0],o=e[1],i=e[2],a=n[0],u=n[1],c=n[2],s=n[3],f=s*r+u*i-c*o,l=s*o+c*r-a*i,h=s*i+a*o-u*r,d=-a*r-u*o-c*i;return t[0]=f*s+d*-a+l*-c-h*-u,t[1]=l*s+d*-u+h*-a-f*-c,t[2]=h*s+d*-c+f*-u-l*-a,t}},function(t,e){t.exports=function(t,e,n,r){var o=n[1],i=n[2],a=e[1]-o,u=e[2]-i,c=Math.sin(r),s=Math.cos(r);return t[0]=e[0],t[1]=o+a*s-u*c,t[2]=i+a*c+u*s,t}},function(t,e){t.exports=function(t,e,n,r){var o=n[0],i=n[2],a=e[0]-o,u=e[2]-i,c=Math.sin(r),s=Math.cos(r);return t[0]=o+u*c+a*s,t[1]=e[1],t[2]=i+u*s-a*c,t}},function(t,e){t.exports=function(t,e,n,r){var o=n[0],i=n[1],a=e[0]-o,u=e[1]-i,c=Math.sin(r),s=Math.cos(r);return t[0]=o+a*s-u*c,t[1]=i+a*c+u*s,t[2]=e[2],t}},function(t,e,n){t.exports=function(t,e,n,o,i,a){var u,c;e||(e=3);n||(n=0);c=o?Math.min(o*e+n,t.length):t.length;for(u=n;u=0;--o){var i=this.tryEntries[o],a=i.completion;if("root"===i.tryLoc)return r("end");if(i.tryLoc<=this.prev){var u=n.call(i,"catchLoc"),c=n.call(i,"finallyLoc");if(u&&c){if(this.prev=0;--r){var o=this.tryEntries[r];if(o.tryLoc<=this.prev&&n.call(o,"finallyLoc")&&this.prev=0;--e){var n=this.tryEntries[e];if(n.finallyLoc===t)return this.complete(n.completion,n.afterLoc),b(n),s}},catch:function(t){for(var e=this.tryEntries.length-1;e>=0;--e){var n=this.tryEntries[e];if(n.tryLoc===t){var r=n.completion;if("throw"===r.type){var o=r.arg;b(n)}return o}}throw new Error("illegal catch attempt")},delegateYield:function(t,e,n){return this.delegate={iterator:O(t),resultName:e,nextLoc:n},"next"===this.method&&(this.arg=void 0),s}},t}(t.exports);try{regeneratorRuntime=r}catch(t){Function("r","regeneratorRuntime = r")(r)}},function(t,e,n){var r=n(230),o=n(240);t.exports=function(t,e){return r(t,e,(function(e,n){return o(t,n)}))}},function(t,e,n){var r=n(231),o=n(239),i=n(32);t.exports=function(t,e,n){for(var a=-1,u=e.length,c={};++a0&&i(f)?n>1?t(f,n-1,i,a,u):r(u,f):a||(u[u.length]=f)}return u}},function(t,e){t.exports=function(t,e){for(var n=-1,r=e.length,o=t.length;++nMath.abs(f-c),d=[],p=t.data,v=t.size.x,y=255,g=0;function x(t,e){u=p[e*v+t],y=ug?u:g,d.push(u)}h&&(i=c,c=s,s=i,i=f,f=l,l=i),c>f&&(i=c,c=f,f=i,i=s,s=l,l=i);var _=f-c,m=Math.abs(l-s);r=_/2|0,o=s;var b=sl?f.UP:f.DOWN,h.push({pos:0,val:s[0]}),i=0;id&&s[i+1]>.5*l?f.UP:r)&&(h.push({pos:i,val:s[i]}),r=o);for(h.push({pos:s.length,val:s[s.length-1]}),a=h[0].pos;al?0:1;for(i=1;ih[i].val?h[i].val+(h[i+1].val-h[i].val)/3*2|0:h[i+1].val+(h[i].val-h[i+1].val)/3|0,a=h[i].pos;ad?0:1;return{line:s,threshold:d}},s.debug={printFrequency:function(t,e){var n,r=e.getContext("2d");for(e.width=t.length,e.height=256,r.beginPath(),r.strokeStyle="blue",n=0;n1&&void 0!==arguments[1]?arguments[1]:0,n=e;nn)return Number.MAX_VALUE;o+=i}return o/u}},{key:"_nextSet",value:function(t){for(var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=e;n1&&(t[n[r]]=o)}},{key:"decodePattern",value:function(t){this._row=t;var e=this.decode();return null===e?(this._row.reverse(),(e=this.decode())&&(e.direction=l.Reverse,e.start=this._row.length-e.start,e.end=this._row.length-e.end)):e.direction=l.Forward,e&&(e.format=this.FORMAT),e}},{key:"_matchRange",value:function(t,e,n){var r;for(r=t=t<0?0:t;r0&&void 0!==arguments[0]?arguments[0]:this._nextUnset(this._row),e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this._row.length,n=!(arguments.length>2&&void 0!==arguments[2])||arguments[2],r=[],o=0;r[o]=0;for(var i=t;ithis.AVG_CODE_ERROR?null:(this.CODE_PATTERN[n.code]&&(n.correction.bar=this.calculateCorrection(this.CODE_PATTERN[n.code],r,this.MODULE_INDICES.bar),n.correction.space=this.calculateCorrection(this.CODE_PATTERN[n.code],r,this.MODULE_INDICES.space)),n)}r[++a]=1,i=!i}return null}},{key:"_correct",value:function(t,e){this._correctBars(t,e.bar,this.MODULE_INDICES.bar),this._correctBars(t,e.space,this.MODULE_INDICES.space)}},{key:"_findStart",value:function(){for(var t=[0,0,0,0,0,0],e=this._nextSet(this._row),n={error:Number.MAX_VALUE,code:-1,start:0,end:0,correction:{bar:1,space:1}},r=!1,o=0,i=e;i.48?null:o}n[++a]=1,i=!i}return null}},{key:"_findStart",value:function(){for(var t=this._nextSet(this._row),e=null;!e;){if(!(e=this._findPattern(I,t,!1,!0)))return null;var n=e.start-(e.end-e.start);if(n>=0&&this._matchRange(n,e.start,0))return e;t=e.end,e=null}return null}},{key:"_calculateFirstDigit",value:function(t){for(var e=0;e=10?(r.code-=10,o|=1<<5-i):o|=0<<5-i,e.push(r.code),n.push(r)}var a=this._calculateFirstDigit(o);if(null===a)return null;e.unshift(a);var u=this._findPattern(z,r.end,!0,!1);if(null===u||!u.end)return null;n.push(u);for(var c=0;c<6;c++){if(!(u=this._decodeCode(u.end,10)))return null;n.push(u),e.push(u.code)}return u}},{key:"_verifyTrailingWhitespace",value:function(t){var e=t.end+(t.end-t.start);return e=0;n-=2)e+=t[n];e*=3;for(var r=t.length-1;r>=0;r-=2)e+=t[r];return e%10==0}},{key:"_decodeExtensions",value:function(t){var e=this._nextSet(this._row,t),n=this._findPattern(U,e,!1,!1);if(null===n)return null;for(var r=0;r0){var u=this._decodeExtensions(a.end);if(!u)return null;if(!u.decodedCodes)return null;var c=u.decodedCodes[u.decodedCodes.length-1],s={start:c.start+((c.end-c.start)/2|0),end:c.end};if(!this._verifyTrailingWhitespace(s))return null;o={supplement:u,code:n.join("")+u.code}}return T(T({code:n.join(""),start:i.start,end:a.end,startInfo:i,decodedCodes:r},o),{},{format:this.FORMAT})}}]),n}(A),W=n(33),F=n.n(W);function V(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var q=new Uint16Array(F()("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%").map((function(t){return t.charCodeAt(0)}))),G=new Uint16Array([52,289,97,352,49,304,112,37,292,100,265,73,328,25,280,88,13,268,76,28,259,67,322,19,274,82,7,262,70,22,385,193,448,145,400,208,133,388,196,148,168,162,138,42]),H=function(t){b()(n,t);var e=V(n);function n(){var t;v()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i3;){n=this._findNextWidth(t,n),r=0;for(var i=0,a=0;an&&(i|=1<0;u++)if(t[u]>n&&(r--,2*t[u]>=o))return-1;return i}}return-1}},{key:"_findNextWidth",value:function(t,e){for(var n=Number.MAX_VALUE,r=0;re&&(n=t[r]);return n}},{key:"_patternToChar",value:function(t){for(var e=0;e=r}},{key:"decode",value:function(t,e){var n=new Uint16Array([0,0,0,0,0,0,0,0,0]),r=[];if(!(e=this._findStart()))return null;var o,i,a=this._nextSet(this._row,e.end);do{n=this._toCounters(a,n);var u=this._toPattern(n);if(u<0)return null;if(null===(o=this._patternToChar(u)))return null;r.push(o),i=a,a+=S.a.sum(n),a=this._nextSet(this._row,a)}while("*"!==o);return r.pop(),r.length&&this._verifyTrailingWhitespace(i,a,n)?{code:r.join(""),start:e.start,end:a,startInfo:e,decodedCodes:r,format:this.FORMAT}:null}}]),n}(A),X=n(12),Q=n.n(X);function Y(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var $=/[IOQ]/g,Z=/[A-Z0-9]{17}/,K=function(t){b()(n,t);var e=Y(n);function n(){var t;v()(this,n);for(var r=arguments.length,o=new Array(r),i=0;ir&&(r=o),othis._counters.length)return-1;for(var n=this._computeAlternatingThreshold(t,e),r=this._computeAlternatingThreshold(t+1,e),o=64,i=0,a=0,u=0;u<7;u++)i=0==(1&u)?n:r,this._counters[t+u]>i&&(a|=o),o>>=1;return a}},{key:"_isStartEnd",value:function(t){for(var e=0;e=this._calculatePatternLength(t)/2)&&(e+8>=this._counters.length||this._counters[e+7]>=this._calculatePatternLength(e)/2)}},{key:"_charToPattern",value:function(t){for(var e=t.charCodeAt(0),n=0;n=0;a--){var u=2==(1&a)?r.bar:r.space,c=1==(1&n)?u.wide:u.narrow;c.size+=this._counters[o+a],c.counts++,n>>=1}o+=8}return["space","bar"].forEach((function(t){var e=r[t];e.wide.min=Math.floor((e.narrow.size/e.narrow.counts+e.wide.size/e.wide.counts)/2),e.narrow.max=Math.ceil(e.wide.min),e.wide.max=Math.ceil((2*e.wide.size+1.5)/e.wide.counts)})),r}},{key:"_validateResult",value:function(t,e){for(var n,r=this._thresholdResultPattern(t,e),o=e,i=0;i=0;a--){var u=0==(1&a)?r.bar:r.space,c=1==(1&n)?u.wide:u.narrow,s=this._counters[o+a];if(sc.max)return!1;n>>=1}o+=8}return!0}},{key:"decode",value:function(t,e){if(this._counters=this._fillCounters(),!(e=this._findStart()))return null;var n,r=e.startCounter,o=[];do{if((n=this._toPattern(r))<0)return null;var i=this._patternToChar(n);if(null===i)return null;if(o.push(i),r+=8,o.length>1&&this._isStartEnd(n))break}while(rthis._counters.length?this._counters.length:r;var a=e.start+this._sumCounters(e.startCounter,r-8);return{code:o.join(""),start:e.start,end:a,startInfo:e,decodedCodes:o,format:this.FORMAT}}}]),n}(A);function ot(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var it=function(t){b()(n,t);var e=ot(n);function n(){var t;v()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i=10&&(n|=1<<1-c),1!==c&&(r=this._nextSet(this._row,u.end),r=this._nextUnset(this._row,r))}if(2!==i.length||parseInt(i.join(""))%4!==n)return null;var s=this._findStart();return{code:i.join(""),decodedCodes:a,end:u.end,format:this.FORMAT,startInfo:s,start:s.start}}}]),n}(B);function ft(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var lt=[24,20,18,17,12,6,3,10,9,5];var ht=function(t){b()(n,t);var e=ft(n);function n(){var t;v()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i=10&&(n|=1<<4-c),4!==c&&(r=this._nextSet(this._row,i.end),r=this._nextUnset(this._row,r))}if(5!==a.length)return null;if(function(t){for(var e=t.length,n=0,r=e-2;r>=0;r-=2)n+=t[r];n*=3;for(var o=e-1;o>=0;o-=2)n+=t[o];return(n*=3)%10}(a)!==function(t){for(var e=0;e<10;e++)if(t===lt[e])return e;return null}(n))return null;var s=this._findStart();return{code:a.join(""),decodedCodes:u,end:i.end,format:this.FORMAT,startInfo:s,start:s.start}}}]),n}(B);function dt(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function pt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var vt=function(t){b()(n,t);var e=pt(n);function n(){var t;v()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i=10&&(r.code=r.code-10,o|=1<<5-i),e.push(r.code),n.push(r)}return this._determineParity(o,e)?r:null}},{key:"_determineParity",value:function(t,e){for(var n=0;n2&&void 0!==arguments[2]&&arguments[2],r=arguments.length>3&&void 0!==arguments[3]&&arguments[3],o=new Array(t.length).fill(0),i=0,a={error:Number.MAX_VALUE,start:0,end:0},u=this.AVG_CODE_ERROR;n=n||!1,r=r||!1,e||(e=this._nextSet(this._row));for(var c=e;c=0&&this._matchRange(t,n.start,0))return n;e=n.end,n=null}return null}},{key:"_verifyTrailingWhitespace",value:function(t){var e=t.end+(t.end-t.start)/2;return e2&&void 0!==arguments[2]&&arguments[2],r=arguments.length>3&&void 0!==arguments[3]&&arguments[3],o=[],i=0,a={error:Number.MAX_VALUE,code:-1,start:0,end:0},u=0,c=0,s=this.AVG_CODE_ERROR;e||(e=this._nextSet(this._row));for(var f=0;f=0&&this._matchRange(r,t.start,0))return t;e=t.end,t=null}return t}},{key:"_verifyTrailingWhitespace",value:function(t){var e=t.end+(t.end-t.start)/2;return e4)return-1;if(0==(1&o))for(var a=0;a="a"&&o<="d"){if(r>e-2)return null;var i=t[++r],a=i.charCodeAt(0),u=void 0;switch(o){case"a":if(!(i>="A"&&i<="Z"))return null;u=String.fromCharCode(a-64);break;case"b":if(i>="A"&&i<="E")u=String.fromCharCode(a-38);else if(i>="F"&&i<="J")u=String.fromCharCode(a-11);else if(i>="K"&&i<="O")u=String.fromCharCode(a+16);else if(i>="P"&&i<="S")u=String.fromCharCode(a+43);else{if(!(i>="T"&&i<="Z"))return null;u=String.fromCharCode(127)}break;case"c":if(i>="A"&&i<="O")u=String.fromCharCode(a-32);else{if("Z"!==i)return null;u=":"}break;case"d":if(!(i>="A"&&i<="Z"))return null;u=String.fromCharCode(a+32);break;default:return console.warn("* code_93_reader _decodeExtended hit default case, this may be an error",u),null}n.push(u)}else n.push(o)}return n}},{key:"_matchCheckChar",value:function(t,e,n){var r=t.slice(0,e),o=r.length,i=r.reduce((function(t,e,r){return t+((-1*r+(o-1))%n+1)*Ct.indexOf(e.charCodeAt(0))}),0);return Ct[i%47]===t[e].charCodeAt(0)}},{key:"_verifyChecksums",value:function(t){return this._matchCheckChar(t,t.length-2,20)&&this._matchCheckChar(t,t.length-1,15)}},{key:"decode",value:function(t,e){if(!(e=this._findStart()))return null;var n,r,o=new Uint16Array([0,0,0,0,0,0]),i=[],a=this._nextSet(this._row,e.end);do{o=this._toCounters(a,o);var u=this._toPattern(o);if(u<0)return null;if(null===(r=this._patternToChar(u)))return null;i.push(r),n=a,a+=S.a.sum(o),a=this._nextSet(this._row,a)}while("*"!==r);return i.pop(),i.length&&this._verifyEnd(n,a)&&this._verifyChecksums(i)?(i=i.slice(0,i.length-2),null===(i=this._decodeExtended(i))?null:{code:i.join(""),start:e.start,end:a,startInfo:e,decodedCodes:i,format:this.FORMAT}):null}}]),n}(A);function St(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var At=/[AEIO]/g,kt=function(t){b()(n,t);var e=St(n);function n(){var t;v()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i1&&(!e.inImageWithBorder(t[0])||!e.inImageWithBorder(t[1]));)o(-(r-=Math.ceil(r/2)));return t}(r,u,Math.floor(.1*i)))?null:(null===(o=a(r))&&(o=function(t,e,n){var r,o,i,u=Math.sqrt(Math.pow(t[1][0]-t[0][0],2)+Math.pow(t[1][1]-t[0][1],2)),c=null,s=Math.sin(n),f=Math.cos(n);for(r=1;r<16&&null===c;r++)i={y:(o=u/16*r*(r%2==0?-1:1))*s,x:o*f},e[0].y+=i.x,e[0].x-=i.y,e[1].y+=i.x,e[1].x-=i.y,c=a(e);return c}(t,r,u)),null===o?null:{codeResult:o.codeResult,line:r,angle:u,pattern:o.barcodeLine.line,threshold:o.barcodeLine.threshold})}return o(),{decodeFromBoundingBox:function(t){return u(t)},decodeFromBoundingBoxes:function(e){var n,r,o=[],i=t.multiple;for(n=0;n2&&void 0!==arguments[2]&&arguments[2];r(t,{callback:e,async:n,once:!0})},unsubscribe:function(n,r){if(n){var o=e(n);o.subscribers=o&&r?o.subscribers.filter((function(t){return t.callback!==r})):[]}else t={}}}}(),jt=n(20),It=n.n(jt),zt=n(11),Ut=n.n(zt),Lt=n(85),Nt=n.n(Lt),Bt=n(86);function Wt(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=C()(t);if(e){var o=C()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return O()(this,n)}}var Ft,Vt=function(t){b()(n,t);var e=Wt(n);function n(t,r){var o;return v()(this,n),o=e.call(this,t),M()(_()(o),"code",void 0),o.code=r,Object.setPrototypeOf(_()(o),n.prototype),o}return n}(n.n(Bt)()(Error)),qt="This may mean that the user has declined camera access, or the browser does not support media APIs. If you are running in iOS, you must use Safari.";function Gt(){try{return navigator.mediaDevices.enumerateDevices()}catch(e){var t=new Vt("enumerateDevices is not defined. ".concat(qt),-1);return Promise.reject(t)}}function Ht(t){try{return navigator.mediaDevices.getUserMedia(t)}catch(t){var e=new Vt("getUserMedia is not defined. ".concat(qt),-1);return Promise.reject(e)}}function Xt(t){return new Promise((function(e,n){var r=10;!function o(){r>0?t.videoWidth>10&&t.videoHeight>10?e():window.setTimeout(o,500):n(new Vt("Unable to play video stream. Is webcam working?",-1)),r--}()}))}function Qt(t,e){return Yt.apply(this,arguments)}function Yt(){return(Yt=It()(Ut.a.mark((function t(e,n){var r;return Ut.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,Ht(n);case 2:if(r=t.sent,Ft=r,!e){t.next=11;break}return e.setAttribute("autoplay","true"),e.setAttribute("muted","true"),e.setAttribute("playsinline","true"),e.srcObject=r,e.addEventListener("loadedmetadata",(function(){e.play()})),t.abrupt("return",Xt(e));case 11:return t.abrupt("return",Promise.resolve());case 12:case"end":return t.stop()}}),t)})))).apply(this,arguments)}function $t(t){var e=Nt()(t,["width","height","facingMode","aspectRatio","deviceId"]);return void 0!==t.minAspectRatio&&t.minAspectRatio>0&&(e.aspectRatio=t.minAspectRatio,console.log("WARNING: Constraint 'minAspectRatio' is deprecated; Use 'aspectRatio' instead")),void 0!==t.facing&&(e.facingMode=t.facing,console.log("WARNING: Constraint 'facing' is deprecated. Use 'facingMode' instead'")),e}function Zt(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=$t(t);return e&&e.deviceId&&e.facingMode&&delete e.facingMode,Promise.resolve({audio:!1,video:e})}function Kt(){return(Kt=It()(Ut.a.mark((function t(){var e;return Ut.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,Gt();case 2:return e=t.sent,t.abrupt("return",e.filter((function(t){return"videoinput"===t.kind})));case 4:case"end":return t.stop()}}),t)})))).apply(this,arguments)}function Jt(){if(!Ft)return null;var t=Ft.getVideoTracks();return t&&null!=t&&t.length?t[0]:null}var te={requestedVideoElement:null,request:function(t,e){return It()(Ut.a.mark((function n(){var r;return Ut.a.wrap((function(n){for(;;)switch(n.prev=n.next){case 0:return te.requestedVideoElement=t,n.next=3,Zt(e);case 3:return r=n.sent,n.abrupt("return",Qt(t,r));case 5:case"end":return n.stop()}}),n)})))()},release:function(){var t=Ft&&Ft.getVideoTracks();return null!==te.requestedVideoElement&&te.requestedVideoElement.pause(),new Promise((function(e){setTimeout((function(){t&&t.length&&t[0].stop(),Ft=null,te.requestedVideoElement=null,e()}),0)}))},enumerateVideoDevices:function(){return Kt.apply(this,arguments)},getActiveStreamLabel:function(){var t=Jt();return t?t.label:""},getActiveTrack:Jt},ee=te;var ne={create:function(t){var e,n=document.createElement("canvas"),r=n.getContext("2d"),o=[],i=null!==(e=t.capacity)&&void 0!==e?e:20,a=!0===t.capture;function u(e){return!!i&&e&&!function(t,e){return e&&e.some((function(e){return Object.keys(e).every((function(n){return e[n]===t[n]}))}))}(e,t.blacklist)&&function(t,e){return"function"!=typeof e||e(t)}(e,t.filter)}return{addResult:function(t,e,c){var s={};u(c)&&(i--,s.codeResult=c,a&&(n.width=e.x,n.height=e.y,d.a.drawImage(t,e,r),s.frame=n.toDataURL()),o.push(s))},getResults:function(){return o}}}},re={inputStream:{name:"Live",type:"LiveStream",constraints:{width:640,height:480,facingMode:"environment"},area:{top:"0%",right:"0%",left:"0%",bottom:"0%"},singleChannel:!1},locate:!0,numOfWorkers:4,decoder:{readers:["code_128_reader"]},locator:{halfSample:!0,patchSize:"medium"}},oe=n(7),ie=function t(){v()(this,t),M()(this,"config",void 0),M()(this,"inputStream",void 0),M()(this,"framegrabber",void 0),M()(this,"inputImageWrapper",void 0),M()(this,"stopped",!1),M()(this,"boxSize",void 0),M()(this,"resultCollector",void 0),M()(this,"decoder",void 0),M()(this,"workerPool",[]),M()(this,"onUIThread",!0),M()(this,"canvasContainer",new ue)},ae=function t(){v()(this,t),M()(this,"image",void 0),M()(this,"overlay",void 0)},ue=function t(){v()(this,t),M()(this,"ctx",void 0),M()(this,"dom",void 0),this.ctx=new ae,this.dom=new ae},ce=n(23);function se(t){if("undefined"==typeof document)return null;if(t instanceof HTMLElement&&t.nodeName&&1===t.nodeType)return t;var e="string"==typeof t?t:"#interactive.viewport";return document.querySelector(e)}function fe(t,e){var n=function(t,e){var n=document.querySelector(t);return n||((n=document.createElement("canvas")).className=e),n}(t,e),r=n.getContext("2d");return{canvas:n,context:r}}function le(t){var e,n,r,o,i=se(null==t||null===(e=t.config)||void 0===e||null===(n=e.inputStream)||void 0===n?void 0:n.target),a=null==t||null===(r=t.config)||void 0===r||null===(o=r.inputStream)||void 0===o?void 0:o.type;if(!a)return null;var u=function(t){if("undefined"!=typeof document){var e=fe("canvas.imgBuffer","imgBuffer"),n=fe("canvas.drawingBuffer","drawingBuffer");return e.canvas.width=n.canvas.width=t.x,e.canvas.height=n.canvas.height=t.y,{dom:{image:e.canvas,overlay:n.canvas},ctx:{image:e.context,overlay:n.context}}}return null}(t.inputStream.getCanvasSize());if(!u)return{dom:{image:null,overlay:null},ctx:{image:null,overlay:null}};var c=u.dom;return"undefined"!=typeof document&&i&&("ImageStream"!==a||i.contains(c.image)||i.appendChild(c.image),i.contains(c.overlay)||i.appendChild(c.overlay)),u}var he={274:"orientation"},de=Object.keys(he).map((function(t){return he[t]}));function pe(t){return new Promise((function(e){var n=new FileReader;n.onload=function(t){return e(t.target.result)},n.readAsArrayBuffer(t)}))}function ve(t){return new Promise((function(e,n){var r=new XMLHttpRequest;r.open("GET",t,!0),r.responseType="blob",r.onreadystatechange=function(){r.readyState!==XMLHttpRequest.DONE||200!==r.status&&0!==r.status||e(this.response)},r.onerror=n,r.send()}))}function ye(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:de,n=new DataView(t),r=t.byteLength,o=e.reduce((function(t,e){var n=Object.keys(he).filter((function(t){return he[t]===e}))[0];return n&&(t[n]=e),t}),{}),i=2;if(255!==n.getUint8(0)||216!==n.getUint8(1))return!1;for(;i1&&void 0!==arguments[1]?arguments[1]:de;return/^blob:/i.test(t)?ve(t).then(pe).then((function(t){return ye(t,e)})):Promise.resolve(null)}(t,["orientation"]).then((function(t){s[0].tags=t,e(s)})).catch((function(t){console.log(t),e(s)})):e(s))},i=0;i0&&n.forEach((function(n){t.removeEventListener(e,n)}))}))},trigger:function(o,a){var s,f,l,h,d,p=i[o];if("canrecord"===o&&(h=t.videoWidth,d=t.videoHeight,e=null!==(f=r)&&void 0!==f&&f.size?h/d>1?r.size:Math.floor(h/d*r.size):h,n=null!==(l=r)&&void 0!==l&&l.size?h/d>1?Math.floor(d/h*r.size):r.size:d,u.x=e,u.y=n),p&&p.length>0)for(s=0;s0)for(n=0;n1?n.size:Math.floor(r/o*n.size):r,e=null!==(f=n)&&void 0!==f&&f.size?r/o>1?Math.floor(o/r*n.size):n.size:o,v.x=t,v.y=e,u=!0,i=0,setTimeout((function(){y("canrecord",[])}),0)}),1,s,null===(l=n)||void 0===l?void 0:l.sequence)},ended:function(){return l},setAttribute:function(){},getConfig:function(){return n},pause:function(){a=!0},play:function(){a=!1},setCurrentTime:function(t){i=t},addEventListener:function(t,e){-1!==h.indexOf(t)&&(d[t]||(d[t]=[]),d[t].push(e))},clearEventHandlers:function(){Object.keys(d).forEach((function(t){return delete d[t]}))},setTopRight:function(t){p.x=t.x,p.y=t.y},getTopRight:function(){return p},setCanvasSize:function(t){v.x=t.x,v.y=t.y},getCanvasSize:function(){return v},getFrame:function(){var t,e;if(!u)return null;a||(t=null===(e=c)||void 0===e?void 0:e[i],i=t&&r&&r()};if(e)for(var a=0;a0&&void 0!==arguments[0]?arguments[0]:"LiveStream",e=arguments.length>1?arguments[1]:void 0,n=arguments.length>2?arguments[2]:void 0;switch(t){case"VideoStream":var r=document.createElement("video");return{video:r,inputStream:n.createVideoStream(r)};case"ImageStream":return{inputStream:n.createImageStream()};case"LiveStream":var o=null;return e&&((o=e.querySelector("video"))||(o=document.createElement("video"),e.appendChild(o))),{video:o,inputStream:n.createLiveStream(o)};default:return console.error("* setupInputStream invalid type ".concat(t)),{video:null,inputStream:null}}}(n,this.getViewPort(),Oe),i=o.video,a=o.inputStream;"LiveStream"===n&&i&&ee.request(i,r).then((function(){return a.trigger("canrecord")})).catch((function(e){return t(e)})),a.setAttribute("preload","auto"),a.setInputStream(this.context.config.inputStream),a.addEventListener("canrecord",this.canRecord.bind(void 0,t)),this.context.inputStream=a}}},{key:"getBoundingBoxes",value:function(){var t;return null!==(t=this.context.config)&&void 0!==t&&t.locate?ce.a.locate():[[Object(oe.clone)(this.context.boxSize[0]),Object(oe.clone)(this.context.boxSize[1]),Object(oe.clone)(this.context.boxSize[2]),Object(oe.clone)(this.context.boxSize[3])]]}},{key:"transformResult",value:function(t){var e=this,n=this.context.inputStream.getTopRight(),r=n.x,o=n.y;if((0!==r||0!==o)&&(t.barcodes&&t.barcodes.forEach((function(t){return e.transformResult(t)})),t.line&&2===t.line.length&&function(t,e,n){t[0].x+=e,t[0].y+=n,t[1].x+=e,t[1].y+=n}(t.line,r,o),t.box&&Ie(t.box,r,o),t.boxes&&t.boxes.length>0))for(var i=0;i0&&void 0!==arguments[0]?arguments[0]:null,e=arguments.length>1?arguments[1]:void 0,n=t;t&&this.context.onUIThread&&(this.transformResult(t),this.addResult(t,e),n=t.barcodes||t),Tt.publish("processed",n),this.hasCodeResult(t)&&Tt.publish("detected",n)}},{key:"locateAndDecode",value:function(){var t=this.getBoundingBoxes();if(t){var e,n=this.context.decoder.decodeFromBoundingBoxes(t)||{};n.boxes=t,this.publishResult(n,null===(e=this.context.inputImageWrapper)||void 0===e?void 0:e.data)}else{var r,o=this.context.decoder.decodeFromImage(this.context.inputImageWrapper);if(o)this.publishResult(o,null===(r=this.context.inputImageWrapper)||void 0===r?void 0:r.data);else this.publishResult()}}},{key:"startContinuousUpdate",value:function(){var t,e=this,n=null,r=1e3/((null===(t=this.context.config)||void 0===t?void 0:t.frequency)||60);this.context.stopped=!1;var o=this.context;!function t(i){n=n||i,o.stopped||(i>=n&&(n+=r,e.update()),window.requestAnimationFrame(t))}(performance.now())}},{key:"start",value:function(){var t,e;this.context.onUIThread&&"LiveStream"===(null===(t=this.context.config)||void 0===t||null===(e=t.inputStream)||void 0===e?void 0:e.type)?this.startContinuousUpdate():this.update()}},{key:"stop",value:(e=It()(Ut.a.mark((function t(){var e;return Ut.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:if(this.context.stopped=!0,je(0),null===(e=this.context.config)||void 0===e||!e.inputStream||"LiveStream"!==this.context.config.inputStream.type){t.next=6;break}return t.next=5,ee.release();case 5:this.context.inputStream.clearEventHandlers();case 6:case"end":return t.stop()}}),t,this)}))),function(){return e.apply(this,arguments)})},{key:"setReaders",value:function(t){this.context.decoder&&this.context.decoder.setReaders(t),function(t){ke.forEach((function(e){return e.worker.postMessage({cmd:"setReaders",readers:t})}))}(t)}},{key:"registerReader",value:function(t,e){Dt.registerReader(t,e),this.context.decoder&&this.context.decoder.registerReader(t,e),function(t,e){ke.forEach((function(n){return n.worker.postMessage({cmd:"registerReader",name:t,reader:e})}))}(t,e)}}]),t}(),Ue=new ze,Le=Ue.context,Ne={init:function(t,e,n){var r,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:Ue;return e||(r=new Promise((function(t,n){e=function(e){e?n(e):t()}}))),o.context.config=u()({},re,t),o.context.config.numOfWorkers>0&&(o.context.config.numOfWorkers=0),n?(o.context.onUIThread=!1,o.initializeData(n),e&&e()):o.initInputStream(e),r},start:function(){return Ue.start()},stop:function(){return Ue.stop()},pause:function(){Le.stopped=!0},onDetected:function(t){t&&("function"==typeof t||"object"===i()(t)&&t.callback)?Tt.subscribe("detected",t):console.trace("* warning: Quagga.onDetected called with invalid callback, ignoring")},offDetected:function(t){Tt.unsubscribe("detected",t)},onProcessed:function(t){t&&("function"==typeof t||"object"===i()(t)&&t.callback)?Tt.subscribe("processed",t):console.trace("* warning: Quagga.onProcessed called with invalid callback, ignoring")},offProcessed:function(t){Tt.unsubscribe("processed",t)},setReaders:function(t){t?Ue.setReaders(t):console.trace("* warning: Quagga.setReaders called with no readers, ignoring")},registerReader:function(t,e){t?e?Ue.registerReader(t,e):console.trace("* warning: Quagga.registerReader called with no reader, ignoring"):console.trace("* warning: Quagga.registerReader called with no name, ignoring")},registerResultCollector:function(t){t&&"function"==typeof t.addResult&&(Le.resultCollector=t)},get canvas(){return Le.canvasContainer},decodeSingle:function(t,e){var n=this,r=new ze;return(t=u()({inputStream:{type:"ImageStream",sequence:!1,size:800,src:t.src},numOfWorkers:1,locator:{halfSample:!1}},t)).numOfWorkers>0&&(t.numOfWorkers=0),t.numOfWorkers>0&&("undefined"==typeof Blob||"undefined"==typeof Worker)&&(console.warn("* no Worker and/or Blob support - forcing numOfWorkers to 0"),t.numOfWorkers=0),new Promise((function(o,i){try{n.init(t,(function(){Tt.once("processed",(function(t){r.stop(),e&&e.call(null,t),o(t)}),!0),r.start()}),null,r)}catch(t){i(t)}}))},get default(){return Ne},Readers:r,CameraAccess:ee,ImageDebug:d.a,ImageWrapper:c.a,ResultCollector:ne};e.default=Ne}]).default})); \ No newline at end of file From 340b306d2e6cc6e6fad36a51f15e4fe8bbe3e3e0 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 18:08:07 -0800 Subject: [PATCH 04/49] Fix path --- bookwyrm/templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 54ccbe276..b059af6d2 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -272,7 +272,7 @@ - + {% block scripts %}{% endblock %} From fcc8b6aaabe7df427038d485b3b1a07cf94fd193 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 18:19:12 -0800 Subject: [PATCH 05/49] Move to sass --- bookwyrm/static/css/bookwyrm.css | 1319 ----------------- bookwyrm/static/css/bookwyrm/_all.scss | 1 + .../css/bookwyrm/components/_barcode.scss | 14 + 3 files changed, 15 insertions(+), 1319 deletions(-) delete mode 100644 bookwyrm/static/css/bookwyrm.css create mode 100644 bookwyrm/static/css/bookwyrm/components/_barcode.scss diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css deleted file mode 100644 index f1faf30c1..000000000 --- a/bookwyrm/static/css/bookwyrm.css +++ /dev/null @@ -1,1319 +0,0 @@ -html { - scroll-behavior: smooth; -} - -body { - min-height: 100vh; - display: flex; - flex-direction: column; -} - -button { - border: none; - margin: 0; - padding: 0; - width: auto; - overflow: visible; - background: transparent; - - /* inherit font, color & alignment from ancestor */ - color: inherit; - font: inherit; - text-align: inherit; - - /* Normalize `line-height`. Cannot be changed from `normal` in Firefox 4+. */ - line-height: normal; - - /* Corrects font smoothing for webkit */ - -webkit-font-smoothing: inherit; - -moz-osx-font-smoothing: inherit; - - /* Corrects inability to style clickable `input` types in iOS */ - -webkit-appearance: none; - - /* Generalizes pointer cursor */ - cursor: pointer; -} - -button::-moz-focus-inner { - /* Remove excess padding and border in Firefox 4+ */ - border: 0; - padding: 0; -} - -/* Better accessibility for keyboard users */ -*:focus-visible { - outline-style: auto !important; -} - -.image { - overflow: hidden; -} - -.navbar .logo { - max-height: 50px; -} - -.card { - overflow: visible; -} - -.card.has-border { - border: 1px solid #eee; -} - -.scroll-x { - overflow: hidden; - overflow-x: auto; -} - -.modal-card { - pointer-events: none; -} - -.modal-card > * { - pointer-events: all; -} - -/* stylelint-disable no-descending-specificity */ -.modal-card:focus { - outline-style: auto; -} - -.modal-card:focus:not(:focus-visible) { - outline-style: initial; -} - -.modal-card:focus-visible { - outline-style: auto; -} -/* stylelint-enable no-descending-specificity */ - -.modal-card.is-fullwidth { - min-width: 75% !important; -} - -@media only screen and (min-width: 769px) { - .modal-card.is-thin { - width: 350px !important; - } -} - -.modal-card-body { - max-height: 70vh; -} - -.clip-text { - max-height: 35em; - overflow: hidden; -} - -/** Utilities not covered by Bulma - ******************************************************************************/ - -@media only screen and (max-width: 768px) { - .is-sr-only-mobile { - border: none !important; - clip: rect(0, 0, 0, 0) !important; - height: 0.01em !important; - overflow: hidden !important; - padding: 0 !important; - position: absolute !important; - white-space: nowrap !important; - width: 0.01em !important; - } - - .m-0-mobile { - margin: 0 !important; - } - - .card-footer.is-stacked-mobile { - flex-direction: column; - } - - .card-footer.is-stacked-mobile .card-footer-item:not(:last-child) { - border-bottom: 1px solid #ededed; - border-right: 0; - } - - .is-flex-direction-row-mobile { - flex-direction: row !important; - } - - .is-flex-direction-column-mobile { - flex-direction: column !important; - } -} - -.tag.is-small { - height: auto; -} - -.button.is-transparent { - background-color: transparent; -} - -.card.is-stretchable { - display: flex; - flex-direction: column; - height: 100%; -} - -.card.is-stretchable .card-content { - flex-grow: 1; -} - -.preserve-whitespace p { - white-space: pre-wrap !important; -} - -.display-inline p { - display: inline !important; -} - -button .button-invisible-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - padding: 1rem; - box-sizing: border-box; - display: flex; - align-items: center; - flex-direction: column; - justify-content: center; - background: rgba(0, 0, 0, 66%); - color: white; - opacity: 0; - transition: opacity 0.2s ease; -} - -button:hover .button-invisible-overlay, -button:active .button-invisible-overlay, -button:focus-visible .button-invisible-overlay { - opacity: 1; -} - -/** File input styles - ******************************************************************************/ - -input[type="file"]::file-selector-button { - -moz-appearance: none; - -webkit-appearance: none; - background-color: #fff; - border-radius: 4px; - border: 1px solid #dbdbdb; - box-shadow: none; - color: #363636; - cursor: pointer; - font-size: 1rem; - height: 2.5em; - justify-content: center; - line-height: 1.5; - padding-bottom: calc(0.5em - 1px); - padding-left: 1em; - padding-right: 1em; - padding-top: calc(0.5em - 1px); - text-align: center; - white-space: nowrap; -} - -input[type="file"]::file-selector-button:hover { - border-color: #b5b5b5; - color: #363636; -} - -/** General `details` element styles - ******************************************************************************/ - -details summary { - cursor: pointer; -} - -summary::-webkit-details-marker { - display: none; -} - -details summary::marker { - content: none; -} - -details.detail-pinned-button summary { - position: absolute; - right: 0; -} - -details.detail-pinned-button form { - float: left; - width: 100%; - margin-top: 1em; -} - -/** Dropdown w/ Details element - ******************************************************************************/ - -details.dropdown[open] summary.dropdown-trigger::before { - content: ""; - position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; -} - -details.dropdown .dropdown-menu { - display: block !important; -} - -details.dropdown .dropdown-menu button { - /* Fix weird Safari defaults */ - box-sizing: border-box; -} - -details.dropdown .dropdown-menu button:focus-visible, -details.dropdown .dropdown-menu a:focus-visible { - outline-style: auto; - outline-offset: -2px; -} - -@media only screen and (max-width: 768px) { - details.dropdown[open] summary.dropdown-trigger::before { - background-color: rgba(0, 0, 0, 50%); - z-index: 30; - } - - details .dropdown-menu { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex !important; - align-items: center; - justify-content: center; - pointer-events: none; - z-index: 100; - } - - details .dropdown-menu > * { - pointer-events: all; - } -} - -/** Details panel - ******************************************************************************/ - -details.details-panel { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 10%); - transition: box-shadow 0.2s ease; - padding: 0.75rem; -} - -details[open].details-panel, -details.details-panel:hover { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 20%); -} - -details.details-panel summary { - position: relative; -} - -details.details-panel summary .details-close { - position: absolute; - right: 0; - top: 0; - transform: rotate(45deg); - transition: transform 0.2s ease; -} - -details[open].details-panel summary .details-close { - transform: rotate(0deg); -} - -@media only screen and (min-width: 769px) { - .details-panel .filters-field:not(:last-child) { - border-right: 1px solid rgba(0, 0, 0, 10%); - margin-top: 0.75rem; - margin-bottom: 0.75rem; - padding-top: 0.25rem; - padding-bottom: 0.25rem; - } -} - -/** Shelving - ******************************************************************************/ - -/** @todo Replace icons with SVG symbols. - @see https://www.youtube.com/watch?v=9xXBYcWgCHA */ -.shelf-option:disabled > *::after { - font-family: icomoon; /* stylelint-disable font-family-no-missing-generic-family-keyword */ - content: "\e919"; /* icon-check */ - margin-left: 0.5em; -} - -/** Toggles - ******************************************************************************/ - -.toggle-button[aria-pressed="true"], -.toggle-button[aria-pressed="true"]:hover { - background-color: hsl(171deg, 100%, 41%); - color: white; -} - -.hide-active[aria-pressed="true"], -.hide-inactive[aria-pressed="false"] { - display: none; -} - -.transition-x.is-hidden, -.transition-y.is-hidden { - display: block !important; - visibility: hidden !important; - height: 0 !important; - width: 0 !important; - margin: 0 !important; - padding: 0 !important; - overflow: auto; -} - -.transition-x, -.transition-y { - transition-duration: 0.5s; - transition-timing-function: ease; -} - -.transition-x { - transition-property: width, margin-left, margin-right, padding-left, padding-right; -} - -.transition-y { - transition-property: height, margin-top, margin-bottom, padding-top, padding-bottom; -} - -@media (prefers-reduced-motion: reduce) { - .transition-x, - .transition-y { - transition-duration: 0.001ms !important; - } -} - -/** Stars - ******************************************************************************/ - -.stars { - white-space: nowrap; -} - -/** Stars in a review form - * - * Specificity makes hovering taking over checked inputs. - * - * \e9d9: filled star - * \e9d7: empty star; - * -------------------------------------------------------------------------- */ - -.form-rate-stars { - width: max-content; -} - -/* All stars are visually filled by default. */ -.form-rate-stars .icon::before { - content: "\e9d9"; /* icon-star-full */ -} - -/* Icons directly following half star inputs are marked as half */ -.form-rate-stars input.half:checked ~ .icon::before { - content: "\e9d8"; /* icon-star-half */ -} - -/* stylelint-disable no-descending-specificity */ -.form-rate-stars input.half:checked + input + .icon:hover::before { - content: "\e9d8" !important; /* icon-star-half */ -} - -/* Icons directly following half check inputs that follow the checked input are emptied. */ -.form-rate-stars input.half:checked + input + .icon ~ .icon::before { - content: "\e9d7"; /* icon-star-empty */ -} - -/* Icons directly following inputs that follow the checked input are emptied. */ -.form-rate-stars input:checked ~ input + .icon::before { - content: "\e9d7"; /* icon-star-empty */ -} - -/* When a label is hovered, repeat the fill-all-then-empty-following pattern. */ -.form-rate-stars:hover .icon.icon::before { - content: "\e9d9" !important; /* icon-star-full */ -} - -.form-rate-stars .icon:hover ~ .icon::before { - content: "\e9d7" !important; /* icon-star-empty */ -} - -/** Book covers - * - * - .is-cover gives the behaviour of the cover and its surrounding. (optional) - * - .cover-container gives the dimensions and position (for borders, image and other elements). - * - .book-cover is positioned and sized based on its container. - * - * To have the cover within specific dimensions, specify a width or height for - * standard bulma’s named breapoints: - * - * `is-(w|h)-(auto|xs|s|m|l|xl|xxl)[-(mobile|tablet|desktop)]` - * - * The cover will be centered horizontally and vertically within those dimensions. - * - * When using `.column.is-N`, add `.is-w-auto` to the container so that the flex - * calculations are not biased by the default `max-content`. - ******************************************************************************/ - -.column.is-cover { - flex-grow: 0 !important; -} - -.column.is-cover, -.column.is-cover + .column { - flex-basis: auto !important; -} - -.cover-container { - display: flex; - justify-content: center; - align-items: center; - position: relative; - width: max-content; - max-width: 100%; - overflow: hidden; -} - -/* Book cover - * -------------------------------------------------------------------------- */ - -.book-cover { - display: block; - max-width: 100%; - max-height: 100%; - - /* Useful when stretching under-sized images. */ - image-rendering: optimizequality; - image-rendering: smooth; -} - -/* Cover caption - * -------------------------------------------------------------------------- */ - -.no-cover .cover-caption { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - padding: 0.5em; - font-size: 0.75em; - color: white; - background-color: #002549; - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - gap: 1em; - white-space: initial; - text-align: center; -} - -/** Avatars - ******************************************************************************/ - -.avatar { - vertical-align: middle; - display: inline; -} - -/** Statuses: Quotes - * - * \e906: icon-quote-open - * \e905: icon-quote-close - * - * The `content` class on the blockquote allows to apply styles to markdown - * generated HTML in the quote: https://bulma.io/documentation/elements/content/ - * - * ```html - *
- *
- * User generated quote in markdown… - *
- * - *

— Book Title by Author

- *
- * ``` - ******************************************************************************/ - -.quote > blockquote { - position: relative; - padding-left: 2em; -} - -.quote > blockquote::before, -.quote > blockquote::after { - font-family: icomoon; - position: absolute; -} - -.quote > blockquote::before { - content: "\e907"; /* icon-quote-open */ - top: 0; - left: 0; -} - -.quote > blockquote::after { - content: "\e906"; /* icon-quote-close */ - right: 0; -} - -/** Animations and transitions - ******************************************************************************/ - -@keyframes turning { - from { transform: rotateZ(0deg); } - to { transform: rotateZ(360deg); } -} - -.is-processing .icon-spinner::before { - animation: turning 1.5s infinite linear; -} - -.icon-spinner { - display: none; -} - -.is-processing .icon-spinner { - display: flex; -} - -@media (prefers-reduced-motion: reduce) { - .is-processing .icon::before { - transition-duration: 0.001ms !important; - } -} - -/** Transient notification - ******************************************************************************/ - -#live-messages { - position: fixed; - bottom: 1em; - right: 1em; -} - -/** Tooltips - ******************************************************************************/ - -.tooltip { - width: 100%; -} - -/** States - ******************************************************************************/ - -/* "disabled" for non-buttons */ - -.is-disabled { - background-color: #dbdbdb; - border-color: #dbdbdb; - box-shadow: none; - color: #7a7a7a; - opacity: 0.5; - cursor: not-allowed; -} - -/* Book preview table - ******************************************************************************/ - -.book-preview td { - vertical-align: middle; -} - -@media only screen and (max-width: 768px) { - table.is-mobile, - table.is-mobile tbody { - display: block; - } - - table.is-mobile tr { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - border-top: 1px solid #dbdbdb; - } - - table.is-mobile td { - display: block; - box-sizing: border-box; - flex: 1 0 100%; - order: 2; - border-bottom: 0; - } - - table.is-mobile td.book-preview-top-row { - order: 1; - flex-basis: auto; - } - - table.is-mobile td[data-title]:not(:empty)::before { - content: attr(data-title); - display: block; - font-size: 0.75em; - font-weight: bold; - } - - table.is-mobile td:empty { - padding: 0; - } - - table.is-mobile th, - table.is-mobile thead { - display: none; - } -} - -/* Book list - ******************************************************************************/ - -ol.ordered-list { - list-style: none; - counter-reset: list-counter; -} - -ol.ordered-list li { - counter-increment: list-counter; -} - -ol.ordered-list li::before { - content: counter(list-counter); - position: absolute; - left: -20px; - width: 20px; - height: 24px; - background-color: #fff; - border: 1px solid #dbdbdb; - border-right: 0; - border-top-left-radius: 2px; - border-top-right-radius: 2px; - display: flex; - justify-content: center; - align-items: center; - color: #888; - font-size: 0.8em; - font-weight: bold; -} - -@media only screen and (max-width: 768px) { - ol.ordered-list li::before { - left: 0; - z-index: 1; - border: 0; - border-right: 1px solid #dbdbdb; - border-bottom: 1px solid #dbdbdb; - border-radius: 0; - border-bottom-right-radius: 2px; - } -} - -.overflow-wrap-anywhere { - overflow-wrap: anywhere; - min-width: 10em; -} - -/* Threads - ******************************************************************************/ - -.thread .is-main .card { - box-shadow: 0 0.5em 1em -0.125em rgb(50 115 220 / 35%), 0 0 0 1px rgb(50 115 220 / 2%); -} - -.thread::after { - content: ""; - position: absolute; - z-index: -1; - top: 0; - bottom: 0; - left: 2.5em; - border-left: 2px solid #e0e0e0; -} - -/* Breadcrumbs - ******************************************************************************/ - -.breadcrumb li:first-child * { - padding-left: 0; -} - -.breadcrumb li > * { - align-items: center; - display: flex; - justify-content: center; - padding: 0 0.75em; -} - -/* Notifications page - ******************************************************************************/ - -.notification a.icon { - text-decoration: none !important; -} - -/* Breadcrumbs - ******************************************************************************/ - -.books-grid { - display: grid; - grid-template-columns: repeat(2, 1fr); - gap: 1rem; - align-items: end; - justify-items: stretch; -} - -.books-grid > .is-big { - grid-column: span 2; - grid-row: span 2; - justify-self: stretch; -} - -.books-grid .book-cover { - width: 100%; -} - -.books-grid .book-title { - --height-basis: 1.35rem; - - display: block; - margin-top: 0.5rem; - line-height: var(--height-basis); - min-height: calc(2 * var(--height-basis)); -} - -@media only screen and (min-width: 769px) { - .books-grid { - gap: 1.5rem; - grid-template-columns: repeat(auto-fill, minmax(8em, 1fr)); - } -} - -/* Copy - ******************************************************************************/ - -.horizontal-copy { - display: flex; - flex-direction: row; - align-items: center; - gap: 0.75rem; -} - -.horizontal-copy textarea { - min-width: initial; - white-space: nowrap; -} - -.horizontal-copy button { - align-self: stretch; - height: unset; -} - -.vertical-copy { - display: flex; - flex-direction: column; - align-items: stretch; - gap: 0.75rem; -} - -.vertical-copy button { - width: 100%; -} - -/* Dimensions - * @todo These could be in rem. - ******************************************************************************/ - -.is-32x32 { - min-width: 32px !important; - min-height: 32px !important; -} - -.is-96x96 { - min-width: 96px !important; - min-height: 96px !important; -} - -.is-w-auto { - width: auto !important; -} - -.is-w-xs { - width: 80px !important; -} - -.is-w-s { - width: 100px !important; -} - -.is-w-m { - width: 150px !important; -} - -.is-w-l { - width: 200px !important; -} - -.is-w-xl { - width: 250px !important; -} - -.is-w-xxl { - width: 500px !important; -} - -.is-h-xs { - height: 80px !important; -} - -.is-h-s { - height: 100px !important; -} - -.is-h-m { - height: 150px !important; -} - -.is-h-l { - height: 200px !important; -} - -.is-h-xl { - height: 250px !important; -} - -.is-h-xxl { - height: 500px !important; -} - -@media only screen and (max-width: 768px) { - .is-w-auto-mobile { - width: auto !important; - } - - .is-w-xs-mobile { - width: 80px !important; - } - - .is-w-s-mobile { - width: 100px !important; - } - - .is-w-m-mobile { - width: 150px !important; - } - - .is-w-l-mobile { - width: 200px !important; - } - - .is-w-xl-mobile { - width: 250px !important; - } - - .is-w-xxl-mobile { - width: 500px !important; - } - - .is-h-xs-mobile { - height: 80px !important; - } - - .is-h-s-mobile { - height: 100px !important; - } - - .is-h-m-mobile { - height: 150px !important; - } - - .is-h-l-mobile { - height: 200px !important; - } - - .is-h-xl-mobile { - height: 250px !important; - } - - .is-h-xxl-mobile { - height: 500px !important; - } -} - -@media only screen and (min-width: 769px) { - .is-w-auto-tablet { - width: auto !important; - } - - .is-w-xs-tablet { - width: 80px !important; - } - - .is-w-s-tablet { - width: 100px !important; - } - - .is-w-m-tablet { - width: 150px !important; - } - - .is-w-l-tablet { - width: 200px !important; - } - - .is-w-xl-tablet { - width: 250px !important; - } - - .is-w-xxl-tablet { - width: 500px !important; - } - - .is-h-xs-tablet { - height: 80px !important; - } - - .is-h-s-tablet { - height: 100px !important; - } - - .is-h-m-tablet { - height: 150px !important; - } - - .is-h-l-tablet { - height: 200px !important; - } - - .is-h-xl-tablet { - height: 250px !important; - } - - .is-h-xxl-tablet { - height: 500px !important; - } -} - -@media only screen and (min-width: 1024px) { - .is-w-auto-desktop { - width: auto !important; - } - - .is-w-xs-desktop { - width: 80px !important; - } - - .is-w-s-desktop { - width: 100px !important; - } - - .is-w-m-desktop { - width: 150px !important; - } - - .is-w-l-desktop { - width: 200px !important; - } - - .is-w-xl-desktop { - width: 250px !important; - } - - .is-w-xxl-desktop { - width: 500px !important; - } - - .is-h-xs-desktop { - height: 80px !important; - } - - .is-h-s-desktop { - height: 100px !important; - } - - .is-h-m-desktop { - height: 150px !important; - } - - .is-h-l-desktop { - height: 200px !important; - } - - .is-h-xl-desktop { - height: 250px !important; - } - - .is-h-xxl-desktop { - height: 500px !important; - } -} - -/* Alignments - * - * Use them with `.align.to-(c|t|r|b|l)[-(mobile|tablet)]` - ******************************************************************************/ - -/* Flex item position - * -------------------------------------------------------------------------- */ - -.align { - display: flex !important; - flex-direction: row !important; -} - -.align.to-c { - justify-content: center !important; -} - -.align.to-t { - align-items: flex-start !important; -} - -.align.to-r { - justify-content: flex-end !important; -} - -.align.to-b { - align-items: flex-end !important; -} - -.align.to-l { - justify-content: flex-start !important; -} - -@media screen and (max-width: 768px) { - .align.to-c-mobile { - justify-content: center !important; - } - - .align.to-t-mobile { - align-items: flex-start !important; - } - - .align.to-r-mobile { - justify-content: flex-end !important; - } - - .align.to-b-mobile { - align-items: flex-end !important; - } - - .align.to-l-mobile { - justify-content: flex-start !important; - } -} - -@media screen and (min-width: 769px) { - .align.to-c-tablet { - justify-content: center !important; - } - - .align.to-t-tablet { - align-items: flex-start !important; - } - - .align.to-r-tablet { - justify-content: flex-end !important; - } - - .align.to-b-tablet { - align-items: flex-end !important; - } - - .align.to-l-tablet { - justify-content: flex-start !important; - } -} - -/* Spacings - * - * Those are supplementary rules to Bulma’s. They follow the same conventions. - * Add those you’ll need. - ******************************************************************************/ - -.mr-auto { - margin-right: auto !important; -} - -.ml-auto { - margin-left: auto !important; -} - -@media screen and (max-width: 768px) { - .m-0-mobile { - margin: 0 !important; - } - - .mr-auto-mobile { - margin-right: auto !important; - } - - .ml-auto-mobile { - margin-left: auto !important; - } - - .mt-3-mobile { - margin-top: 0.75rem !important; - } - - .ml-3-mobile { - margin-left: 0.75rem !important; - } - - .mx-3-mobile { - margin-right: 0.75rem !important; - margin-left: 0.75rem !important; - } - - .my-3-mobile { - margin-top: 0.75rem !important; - margin-bottom: 0.75rem !important; - } -} - -@media screen and (min-width: 769px) { - .m-0-tablet { - margin: 0 !important; - } - - .mr-auto-tablet { - margin-right: auto !important; - } - - .ml-auto-tablet { - margin-left: auto !important; - } - - .mt-3-tablet { - margin-top: 0.75rem !important; - } - - .ml-3-tablet { - margin-left: 0.75rem !important; - } - - .mx-3-tablet { - margin-right: 0.75rem !important; - margin-left: 0.75rem !important; - } - - .my-3-tablet { - margin-top: 0.75rem !important; - margin-bottom: 0.75rem !important; - } -} - -/* Gaps (for Flexbox and Grid) - * - * Those are supplementary rules to Bulma’s. They follow the same conventions. - * Add those you’ll need. - ******************************************************************************/ - -.is-gap-0 { - gap: 0; -} - -.is-gap-1 { - gap: 0.25rem; -} - -.is-gap-2 { - gap: 0.5rem; -} - -.is-gap-3 { - gap: 0.75rem; -} - -.is-gap-4 { - gap: 1rem; -} - -.is-gap-5 { - gap: 1.5rem; -} - -.is-gap-6 { - gap: 3rem; -} - -.is-row-gap-0 { - row-gap: 0; -} - -.is-row-gap-1 { - row-gap: 0.25rem; -} - -.is-row-gap-2 { - row-gap: 0.5rem; -} - -.is-row-gap-3 { - row-gap: 0.75rem; -} - -.is-row-gap-4 { - row-gap: 1rem; -} - -.is-row-gap-5 { - row-gap: 1.5rem; -} - -.is-row-gap-6 { - row-gap: 3rem; -} - -.is-column-gap-0 { - column-gap: 0; -} - -.is-column-gap-1 { - column-gap: 0.25rem; -} - -.is-column-gap-2 { - column-gap: 0.5rem; -} - -.is-column-gap-3 { - column-gap: 0.75rem; -} - -.is-column-gap-4 { - column-gap: 1rem; -} - -.is-column-gap-5 { - column-gap: 1.5rem; -} - -.is-column-gap-6 { - column-gap: 3rem; -} - -/* Barcode scanner CSS */ -#barcode-scanner { - position: relative; - min-height: 200px; -} - -#barcode-scanner .drawingBuffer { - position: absolute; - top: 0; - left: 0; - height: auto; - width: 100%; -} diff --git a/bookwyrm/static/css/bookwyrm/_all.scss b/bookwyrm/static/css/bookwyrm/_all.scss index 11d7e403d..e9333bd19 100644 --- a/bookwyrm/static/css/bookwyrm/_all.scss +++ b/bookwyrm/static/css/bookwyrm/_all.scss @@ -1,6 +1,7 @@ /** Imports ******************************************************************************/ @import "components/avatar"; +@import "components/barcode"; @import "components/book_cover"; @import "components/book_grid"; @import "components/book_list"; diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss new file mode 100644 index 000000000..da1aa721c --- /dev/null +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -0,0 +1,14 @@ + +/* Barcode scanner CSS */ +#barcode-scanner { + position: relative; + min-height: 200px; + + .drawingBuffer { + position: absolute; + top: 0; + left: 0; + height: auto; + width: 100%; + } +} From 649ffe571a96b0bb25249cc846fd8468ea73661a Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 18:29:38 -0800 Subject: [PATCH 06/49] Fix typos with searching --- bookwyrm/static/js/bookwyrm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 10032c557..d7ba9ffe0 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -689,7 +689,7 @@ let BookWyrm = new (class { statusNode.querySelector('.isbn').innerText = code; toggleStatus('found'); - const search = new Url('search'); + const search = new URL('/search', document.location); search.searchParams.set('q', code); cleanup(); From 8d0e5494808137d8763ee3f001c629de5c07ffb7 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 20:19:26 -0800 Subject: [PATCH 07/49] Improve visuals and quality of scanning --- .../css/bookwyrm/components/_barcode.scss | 10 +++++++++ bookwyrm/static/js/bookwyrm.js | 22 +++++++++++-------- bookwyrm/templates/search/barcode_modal.html | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss index da1aa721c..1abbf5d40 100644 --- a/bookwyrm/static/css/bookwyrm/components/_barcode.scss +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -12,3 +12,13 @@ width: 100%; } } + +#barcode-status { + :dir(ltr) .select { + float: right; + } + + :dir(rtl) .select { + float: left; + } +} diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index d7ba9ffe0..4944ada65 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -655,10 +655,13 @@ let BookWyrm = new (class { } } - function cleanup() { + function cleanup(clearDrawing = true) { Quagga.stop(); - scannerNode.replaceChildren(); cameraListNode.removeEventListener('change', changeListener); + + if (clearDrawing) { + scannerNode.replaceChildren(); + } } Quagga.onProcessed((result) => { @@ -683,7 +686,14 @@ let BookWyrm = new (class { } }); + let lastDetection = null; Quagga.onDetected((result) => { + // Detect the same code twice as an extra check to avoid bogus scans. + if (lastDetection === null || lastDetection !== result.codeResult.code) { + lastDetection = result.codeResult.code; + return; + } + const code = result.codeResult.code; statusNode.querySelector('.isbn').innerText = code; @@ -692,7 +702,7 @@ let BookWyrm = new (class { const search = new URL('/search', document.location); search.searchParams.set('q', code); - cleanup(); + cleanup(false); location.assign(search); }); @@ -711,12 +721,6 @@ let BookWyrm = new (class { constraints: { facingMode: "environment", }, - area: { - top: "25%", - right: "25%", - left: "25%", - bottom: "25%", - } }, decoder : { readers: [ diff --git a/bookwyrm/templates/search/barcode_modal.html b/bookwyrm/templates/search/barcode_modal.html index 17eb8829e..00cc7c027 100644 --- a/bookwyrm/templates/search/barcode_modal.html +++ b/bookwyrm/templates/search/barcode_modal.html @@ -12,7 +12,7 @@
@@ -25,7 +25,7 @@ {% trans "Align your book's barcode with the camera." %}
From fee6ffcbd858b0a54bdadc236d17c448d78a5ba8 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 21:29:18 -0800 Subject: [PATCH 08/49] Fix formatting in chrome Was using experimental selector, forget about it. Also reduce jumping around of video size --- .../static/css/bookwyrm/components/_barcode.scss | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss index 1abbf5d40..c12d59ea4 100644 --- a/bookwyrm/static/css/bookwyrm/components/_barcode.scss +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -2,7 +2,7 @@ /* Barcode scanner CSS */ #barcode-scanner { position: relative; - min-height: 200px; + min-height: 450px; .drawingBuffer { position: absolute; @@ -13,12 +13,6 @@ } } -#barcode-status { - :dir(ltr) .select { - float: right; - } - - :dir(rtl) .select { - float: left; - } +#barcode-status .select { + float: right; } From 464050deaa4911bca518a43ee3568df296c257ad Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 21:32:01 -0800 Subject: [PATCH 09/49] Implement switching cameras Also, use session storage to remember last selected camera deviceId, if any --- bookwyrm/static/js/bookwyrm.js | 119 +++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 52 deletions(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 4944ada65..0ae950447 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -645,8 +645,7 @@ let BookWyrm = new (class { const cameraListNode = document.getElementById("barcode-camera-list"); let changeListener = cameraListNode.addEventListener('change', (event) => { - // TODO - //event.target.value + initBarcodes(event.target.value); }); function toggleStatus(status) { @@ -655,6 +654,71 @@ let BookWyrm = new (class { } } + function initBarcodes(cameraId = null) { + if (!cameraId) { + cameraId = sessionStorage.getItem('preferredCam'); + } else { + sessionStorage.setItem('preferredCam', cameraId); + } + + scannerNode.replaceChildren(); + Quagga.stop(); + Quagga.init({ + inputStream : { + name: "Live", + type: "LiveStream", + target: scannerNode, + constraints: { + facingMode: "environment", + deviceId: cameraId, + }, + }, + decoder : { + readers: [ + "ean_reader", + { + format: "ean_reader", + config: { + supplements: [ "ean_2_reader", "ean_5_reader" ] + } + } + ], + multiple: false + }, + }, (err) => { + if (err) { + console.log(err); + toggleStatus('access-denied'); + return; + } + + let activeId = null; + const track = Quagga.CameraAccess.getActiveTrack(); + if (track) { + activeId = track.getSettings().deviceId; + } + + Quagga.CameraAccess.enumerateVideoDevices().then((devices) => { + cameraListNode.replaceChildren(); + + for (const device of devices) { + const child = document.createElement('option'); + child.value = device.deviceId; + child.innerText = device.label.slice(0, 30); + + if (activeId === child.value) { + child.selected = true; + } + + cameraListNode.appendChild(child); + } + }); + + toggleStatus('scanning'); + Quagga.start(); + }); + } + function cleanup(clearDrawing = true) { Quagga.stop(); cameraListNode.removeEventListener('change', changeListener); @@ -709,55 +773,6 @@ let BookWyrm = new (class { event.target.addEventListener('close', cleanup, { once: true }); toggleStatus('grant-access'); - - // Clear camera list - cameraListNode.replaceChildren(); - - Quagga.init({ - inputStream : { - name: "Live", - type: "LiveStream", - target: scannerNode, - constraints: { - facingMode: "environment", - }, - }, - decoder : { - readers: [ - "ean_reader", - { - format: "ean_reader", - config: { - supplements: [ "ean_2_reader", "ean_5_reader" ] - } - } - ], - multiple: false - }, - }, (err) => { - if (err) { - console.log(err); - toggleStatus('access-denied'); - return; - } - - const stream = Quagga.CameraAccess.getActiveStreamLabel(); - Quagga.CameraAccess.enumerateVideoDevices().then((devices) => { - for (const device of devices) { - const child = document.createElement('option'); - child.value = device.deviceId || device.id; - child.innerText = device.label.slice(0, 30); - - if (stream === child.value) { - child.selected = true; - } - - cameraListNode.appendChild(child); - } - }); - - Quagga.start(); - toggleStatus('scanning'); - }); + initBarcodes(); } })(); From cdddf73e29ea23b72ab988b57dae1647cef8d1b8 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 26 Feb 2022 23:22:44 -0800 Subject: [PATCH 10/49] Improve layout for some camera types --- .../static/css/bookwyrm/components/_barcode.scss | 14 +++++++++++--- bookwyrm/static/js/bookwyrm.js | 6 +++++- bookwyrm/templates/search/barcode_modal.html | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss index c12d59ea4..b6b416977 100644 --- a/bookwyrm/static/css/bookwyrm/components/_barcode.scss +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -2,14 +2,22 @@ /* Barcode scanner CSS */ #barcode-scanner { position: relative; - min-height: 450px; + max-width: 100%; + text-align: center; + + video { + height: calc(70vh - 200px); + max-width: 100%; + } .drawingBuffer { position: absolute; top: 0; left: 0; - height: auto; - width: 100%; + right: 0; + margin: auto; + height: calc(70vh - 200px); + max-width: 100%; } } diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 0ae950447..f6811614b 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -751,11 +751,15 @@ let BookWyrm = new (class { }); let lastDetection = null; + let numDetected = 0; Quagga.onDetected((result) => { - // Detect the same code twice as an extra check to avoid bogus scans. + // Detect the same code 3 times as an extra check to avoid bogus scans. if (lastDetection === null || lastDetection !== result.codeResult.code) { + numDetected = 1; lastDetection = result.codeResult.code; return; + } else if (numDetected++ < 3) { + return; } const code = result.codeResult.code; diff --git a/bookwyrm/templates/search/barcode_modal.html b/bookwyrm/templates/search/barcode_modal.html index 00cc7c027..93789ae3f 100644 --- a/bookwyrm/templates/search/barcode_modal.html +++ b/bookwyrm/templates/search/barcode_modal.html @@ -8,7 +8,7 @@ {% endblock %} {% block modal-body %} -
+
+
{% endblock %} From e71a5e3bdfe6a4077ddcbbffcf392f09519c44bc Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sun, 27 Feb 2022 00:00:22 -0800 Subject: [PATCH 13/49] Add barcode icon and use other icons Minor formatting and messaging tweaks --- .../css/bookwyrm/components/_barcode.scss | 1 + bookwyrm/static/css/fonts/icomoon.eot | Bin 10460 -> 10688 bytes bookwyrm/static/css/fonts/icomoon.svg | 1 + bookwyrm/static/css/fonts/icomoon.ttf | Bin 10296 -> 10524 bytes bookwyrm/static/css/fonts/icomoon.woff | Bin 10372 -> 10600 bytes bookwyrm/static/css/vendor/icons.css | 3 +++ bookwyrm/static/js/bookwyrm.js | 1 + bookwyrm/templates/search/barcode_modal.html | 9 ++++++++- 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss index b6b416977..8c77d5252 100644 --- a/bookwyrm/static/css/bookwyrm/components/_barcode.scss +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -4,6 +4,7 @@ position: relative; max-width: 100%; text-align: center; + height: calc(70vh - 200px); video { height: calc(70vh - 200px); diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot index 7b1f2d9d9f9d3ff8805e56d83c6c2ceba7654a8f..69628662beb9b527fe62d38c0d177366773ad879 100644 GIT binary patch delta 613 zcmcZ;cp#YVfF=WjjOIi(GnVu$U+IYs<@JUP3=Df17#I?ga}x`e=Pr+6U|^JCU|{G; zPb@BAU|Q4-vdbcmfq`)Y1A~f1MrvY;{EI&&3=FC-7#JALGBQ#V zIk;KO85qLm;ejBN$^#U%{P3=9km8h=3Y49v_IC#Nu0hk~3X z!63lE%)r6G$e{32^rgZ}^OsdG+g{#!#r4YU|KI=rLAn?eUNXEChss=s%P{_bEY2d% zEcRAxwb%l&05L_;Zw$-~jFS&)NN#pzvSnmZR#H;l+{P>~S1-W8z~I2b!0f=l%)rjT z&A`tf%plGn%^=U9%%IMo&7jX<%wW!7&0x>KAZ#qCjEotfd=SlSET{~kS&c=N&7oM; zSX3E=)uA*)L&E_FhXx0S0}c+13}EVC_yGll0}2X^3ltRoEC35NI5;pmK=6TvhJObd z8kimaHZV2d#||iffnoDvML`xBY2U2$cz&C&4BRZ>(7NYv2To7EplZ&jJDEdmGAjcM x1B1on1#04xH>(9mO9-qI6cKb0ED-Dyyd=aSB*VbSz`&r(B*h@GSx$W)BLLigqk8}V delta 369 zcmX>Qd?%3Yjs^pRg~miSGnPQzr#B}$l-Ci{&P^=1ymsOm1_nkM1_p+f z^u*!<1_lNJ1_s6j3=9k$={c2YdKcn%FfcH#U|>*A$Vg30kr$F*!@!`*!N9;^mXVQ~ z$idBG#=xNJz`($ul95|dvA~YgnSntyg@J)#Lr#8j;{IJbrZF(6i7+rQMCB${6fl_T zG08A6sDUg}$V<#ko$1B-n}I=X0s{kMTS0zt2?H|&0|SGG1Oo$u0s}Mig~=(5)!G>h z3=Con0u0OyYz&MH3NJ-pD!i + diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf index 151f2b782e011873be7120240fc65777f3771917..12c79d551739bdbfe9e7246ae713b4d23545fdce 100644 GIT binary patch delta 595 zcmdlHFej*50V!3=9kc3=E7b7#J8h(sL@)Om+O$Vg30k$>^0gn>cz1p@qRQq_tZFQ(48rPA znxUcLfP+JWgTny_2Sx@k^)LK@g2Dj>1;zym3V#-Wg&G_j7#$$^Ktsd70}Tz#4u2b% z8t`KW6u`i+`M-i7i;T2yR(d?Y%~u9)7Eo|9+;g}Crzh*EnltK7PEnoA$T0bfYPO<; qz$!rzK^MUS!9KxDLL5Re;6$U#Bn3(e3=9lRlNB|DH&0eu$_N1TgOqUq delta 367 zcmbOev?HLNfsuiMft#U$ftkU;KUm+0Ux?j+fq`KU0|P@sa&BV5<+T&nFfcI6FfcH* zq$d^^FfcF(FfcGKU|?Y2NYANE)4LGAgMoo@1p|X}LPlz0ioB5g8U_Yc4h9AWvy6P#=r-wX_D6Brm6+Y0iFOBk3L7#J8dBp4VN6d0J9FHAg8Eu6u? zz#zsTz`)GF#=yv+@KW@p!sGx(N#&}SZ7;9C;(BHF|L_0*42=IDi?fI`i>(ryFXk_% zAo`VonSpWgL`Lz=D;aGWS(KEOl{UX(l9${3P?4WS=H^q~z<7R}uMFHQAPX7pUd^2Y zVu0w$JZk2QI+I=0CNo-0exN2k`LkMpw4J~Tfg6G>f=YsEf^!5nFff3FR)IWDY7~4R2rWfb$g8bqV1_n(Juo{qBW(EcZ zX6B2Nc^Ioh3m6y}Bp3u3m>D=27#S2^ioR5MY5ub6W!uYJuee^B{r~&_KPVg+6kamC z6o<-Ohs!Yje=N=-&Mfv;Y_-?|u>dhe(QgdQ42-Za+x(i*o{>daNlAIL9<#h$y#NCP zg98f#vjYP&13LpZ13!Z>gE)gUgFJ&WgF1sYgFb^XgE@mWgFOR-u(6;rGG>JGK{T_m zpfZSNH5OGihhkM@QDqQThtdoU4F?rJD>mthRxoJf-Ex9zFFz<{5D@1xLLpc?1YHCR1p5Rp32_L?fRmjrlN19ej2IZ0KtZ_qzS>eo E0PditHvj+t delta 413 zcmaD6)DkFC?(gQtz{tSBz@X8>zzwD?CI@PYPt+EvH%QJ+EMQ<@%wS+(XaV8NYbUNr zPb>zBy)IVGeEW(UIgx?EPc4CgfguWn_wU*b&GrZO<7-Cw5g6LNUW(G!3sBHeqXv@f=q^zv8*^F6UZnLfuKa0%Gr@Ddh{5D@1xLH8q$8h&* z?i>&UL{E-TGiTJ9JV9;pWOelnMLU5N0yhL%1eFBS1m_5X{0j { if (err) { + scannerNode.replaceChildren(); console.log(err); toggleStatus('access-denied'); return; diff --git a/bookwyrm/templates/search/barcode_modal.html b/bookwyrm/templates/search/barcode_modal.html index 9480197f8..3f7b01cea 100644 --- a/bookwyrm/templates/search/barcode_modal.html +++ b/bookwyrm/templates/search/barcode_modal.html @@ -12,19 +12,26 @@
- + From 9f67a74340737a902ffcb6317e03535196804402 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sun, 27 Feb 2022 00:04:25 -0800 Subject: [PATCH 14/49] Show grant access dialog every time we initialize --- bookwyrm/static/js/bookwyrm.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index efd5cfff0..01c13091a 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -655,6 +655,8 @@ let BookWyrm = new (class { } function initBarcodes(cameraId = null) { + toggleStatus('grant-access'); + if (!cameraId) { cameraId = sessionStorage.getItem('preferredCam'); } else { @@ -777,7 +779,6 @@ let BookWyrm = new (class { event.target.addEventListener('close', cleanup, { once: true }); - toggleStatus('grant-access'); initBarcodes(); } })(); From 43f62ef5d7add5d3a4fc8bc146ea5ed15693812e Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sun, 27 Feb 2022 00:18:38 -0800 Subject: [PATCH 15/49] d'oh, fix event leak --- bookwyrm/static/js/bookwyrm.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 01c13091a..39d5f6647 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -644,9 +644,11 @@ let BookWyrm = new (class { const statusNode = document.getElementById("barcode-status"); const cameraListNode = document.getElementById("barcode-camera-list"); - let changeListener = cameraListNode.addEventListener('change', (event) => { + cameraListNode.addEventListener('change', onChangeCamera); + + function onChangeCamera(event) { initBarcodes(event.target.value); - }); + } function toggleStatus(status) { for (const child of statusNode.children) { @@ -724,7 +726,7 @@ let BookWyrm = new (class { function cleanup(clearDrawing = true) { Quagga.stop(); - cameraListNode.removeEventListener('change', changeListener); + cameraListNode.removeEventListener('change', onChangeCamera); if (clearDrawing) { scannerNode.replaceChildren(); From f5c66b5b4a9e983426a1ebf2389697224c965df3 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sun, 27 Feb 2022 00:33:54 -0800 Subject: [PATCH 16/49] Adjust layout more Ensure camera select box is never hidden. --- .../static/css/bookwyrm/components/_barcode.scss | 2 +- bookwyrm/static/js/bookwyrm.js | 2 +- bookwyrm/templates/search/barcode_modal.html | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss index 8c77d5252..c000a1a89 100644 --- a/bookwyrm/static/css/bookwyrm/components/_barcode.scss +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -22,6 +22,6 @@ } } -#barcode-status .select { +#barcode-camera-list { float: right; } diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 39d5f6647..a9cc5c6ca 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -642,7 +642,7 @@ let BookWyrm = new (class { openBarcodeScanner(event) { const scannerNode = document.getElementById("barcode-scanner"); const statusNode = document.getElementById("barcode-status"); - const cameraListNode = document.getElementById("barcode-camera-list"); + const cameraListNode = document.querySelector("#barcode-camera-list > select"); cameraListNode.addEventListener('change', onChangeCamera); diff --git a/bookwyrm/templates/search/barcode_modal.html b/bookwyrm/templates/search/barcode_modal.html index 3f7b01cea..cfbb4e1c8 100644 --- a/bookwyrm/templates/search/barcode_modal.html +++ b/bookwyrm/templates/search/barcode_modal.html @@ -8,9 +8,17 @@ {% endblock %} {% block modal-body %} -
+
+
+
+ +
+ +
+
- + +
+ + {{ form.subjects }} + + {% trans "Separate multiple values with commas." %} + + + {% include 'snippets/form_errors.html' with errors_list=form.subjects.errors id="desc_subjects" %} +
From 822868bf8786a0becc68fdb1613684f3598d84cb Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 12 Mar 2022 04:17:11 -0800 Subject: [PATCH 26/49] fish autocompletions --- bw-dev | 1 + complete_bwdev.fish | 97 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 complete_bwdev.fish diff --git a/bw-dev b/bw-dev index 41971bb81..1cc930264 100755 --- a/bw-dev +++ b/bw-dev @@ -225,6 +225,7 @@ case "$CMD" in *) set +x # No need to echo echo echo "Unrecognised command. Try:" + echo " setup" echo " up [container]" echo " service_ports_web" echo " initdb" diff --git a/complete_bwdev.fish b/complete_bwdev.fish new file mode 100644 index 000000000..9cd8f2600 --- /dev/null +++ b/complete_bwdev.fish @@ -0,0 +1,97 @@ +# bw-dev auto-completions for fish-shell. +# copy this to ~./.config/fish/completions/ with the name `bw-dev.fish` +# this will only work if renamed to `bw-dev.fish`. + +set -l commands up \ +service_ports_web \ +initdb \ +resetdb \ +makemigrations \ +migrate \ +bash \ +shell \ +dbshell \ +restart_celery \ +pytest \ +collectstatic \ +makemessages \ +compilemessages \ +update_locales \ +build \ +clean \ +black \ +prettier \ +stylelint \ +formatters \ +compilescss \ +collectstatic_watch \ +populate_streams \ +populate_lists_streams \ +populate_suggestions \ +generate_thumbnails \ +generate_preview_images \ +copy_media_to_s3 \ +set_cors_to_s3 \ +setup \ +admin_code \ +runweb + +function __bw_complete -a cmds cmd desc + complete -f -c bw-dev -n "not __fish_seen_subcommand_from $cmds" -a $cmd -d $desc +end + + +__bw_complete "$commands" "up" "bring one or all service(s) up" +__bw_complete "$commands" "service_ports_web" "run command on the web container with its portsenabled and mapped" +__bw_complete "$commands" "initdb" "initialize database" +__bw_complete "$commands" "resetdb" "!! WARNING !! reset database" +__bw_complete "$commands" "makemigrations" "create new migrations" +__bw_complete "$commands" "migrate" "perform all migrations" +__bw_complete "$commands" "bash" "open up bash within the web container" +__bw_complete "$commands" "shell" "open the Python shell within the web container" +__bw_complete "$commands" "dbshell" "open the database shell within the web container" +__bw_complete "$commands" "restart_celery" "restart the celery container" +__bw_complete "$commands" "pytest" "run unit tests" +__bw_complete "$commands" "collectstatic" "copy changed static files into the installation" +__bw_complete "$commands" "makemessages" "extract all localizable messages from the code" +__bw_complete "$commands" "compilemessages" "compile .po localization files to .mo" +__bw_complete "$commands" "update_locales" "run makemessages and compilemessages for the en_US and additional locales" +__bw_complete "$commands" "build" "build the containers" +__bw_complete "$commands" "clean" "bring the cluster down and remove all containers" +__bw_complete "$commands" "black" "run Python code formatting tool" +__bw_complete "$commands" "prettier" "run JavaScript code formatting tool" +__bw_complete "$commands" "stylelint" "run SCSS linting tool" +__bw_complete "$commands" "formatters" "run multiple formatter tools" +__bw_complete "$commands" "compilescss" "compile the SCSS layouts to CSS" +__bw_complete "$commands" "populate_streams" "populate the main streams" +__bw_complete "$commands" "populate_lists_streams" "populate streams for book lists" +__bw_complete "$commands" "populate_suggestions" "populate book suggestions" +__bw_complete "$commands" "generate_thumbnails" "generate book thumbnails" +__bw_complete "$commands" "generate_preview_images" "generate book preview images" +__bw_complete "$commands" "collectstatic_watch" "watch filesystem and copy changed static files" +__bw_complete "$commands" "copy_media_to_s3" "run the `s3 cp` command to copy media to a bucket on S3" +__bw_complete "$commands" "sync_media_to_s3" "run the `s3 sync` command to sync media with a bucket on S3" +__bw_complete "$commands" "set_cors_to_s3" "push a CORS configuration defined in .json to s3" +__bw_complete "$commands" "setup" "perform first-time setup" +__bw_complete "$commands" "admin_code" "get the admin code" +__bw_complete "$commands" "runweb" "run a command on the web container" + +complete -f -c bw-dev -n "__fish_seen_subcommand_from up"\ + -a "(docker-compose config --service)" + +complete -x -c bw-dev -n "__fish_seen_subcommand_from migrate" + +complete -x -c bw-dev -n "__fish_seen_subcommand_from pytest"\ + -a "bookwyrm/tests/**.py" + +complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\ + -a "--stream=" -d "pick a single stream to populate" + +complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\ + -l stream -a "home local books" + +complete -x -c bw-dev -n "__fish_seen_subcommand_from generate_preview_images"\ + -a "--all" -d "Generates images for ALL types: site, users and books. Can use a lot of computing power." + +complete -x -c bw-dev -n "__fish_seen_subcommand_from set_cors_to_s3"\ + -a "**.json" From 4530d4917a7513beea762b4a68b43013ac9b7815 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 12 Mar 2022 04:24:22 -0800 Subject: [PATCH 27/49] make more compact with a function --- complete_bwdev.fish | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/complete_bwdev.fish b/complete_bwdev.fish index 9cd8f2600..426ab0d49 100644 --- a/complete_bwdev.fish +++ b/complete_bwdev.fish @@ -40,7 +40,6 @@ function __bw_complete -a cmds cmd desc complete -f -c bw-dev -n "not __fish_seen_subcommand_from $cmds" -a $cmd -d $desc end - __bw_complete "$commands" "up" "bring one or all service(s) up" __bw_complete "$commands" "service_ports_web" "run command on the web container with its portsenabled and mapped" __bw_complete "$commands" "initdb" "initialize database" @@ -76,22 +75,16 @@ __bw_complete "$commands" "setup" "perform first-time setup" __bw_complete "$commands" "admin_code" "get the admin code" __bw_complete "$commands" "runweb" "run a command on the web container" -complete -f -c bw-dev -n "__fish_seen_subcommand_from up"\ - -a "(docker-compose config --service)" -complete -x -c bw-dev -n "__fish_seen_subcommand_from migrate" +function __bw_complete_subcommand -a cmd + complete -f -c bw-dev -n "__fish_seen_subcommand_from $cmd" $argv[2..-1] +end -complete -x -c bw-dev -n "__fish_seen_subcommand_from pytest"\ - -a "bookwyrm/tests/**.py" - -complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\ - -a "--stream=" -d "pick a single stream to populate" - -complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\ - -l stream -a "home local books" - -complete -x -c bw-dev -n "__fish_seen_subcommand_from generate_preview_images"\ - -a "--all" -d "Generates images for ALL types: site, users and books. Can use a lot of computing power." - -complete -x -c bw-dev -n "__fish_seen_subcommand_from set_cors_to_s3"\ - -a "**.json" +__bw_complete_subcommand "up" -a "(docker-compose config --service)" +__bw_complete_subcommand "migrate" +__bw_complete_subcommand "pytest" -a "bookwyrm/tests/**.py" +__bw_complete_subcommand "populate_streams" -a "--stream=" -d "pick a single stream to populate" +__bw_complete_subcommand "populate_streams" -l stream -a "home local books" +__bw_complete_subcommand "generate_preview_images" -a "--all"\ + -d "Generates images for ALL types: site, users and books. Can use a lot of computing power." +__bw_complete_subcommand "set_cors_to_s3" -a "**.json" From 3358c233ea9b3c2816eded5bfd306e3ad3df2936 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 12 Mar 2022 04:38:42 -0800 Subject: [PATCH 28/49] remove no-up autocomplete --- complete_bwdev.fish | 1 - 1 file changed, 1 deletion(-) diff --git a/complete_bwdev.fish b/complete_bwdev.fish index 426ab0d49..c1f28dd51 100644 --- a/complete_bwdev.fish +++ b/complete_bwdev.fish @@ -81,7 +81,6 @@ function __bw_complete_subcommand -a cmd end __bw_complete_subcommand "up" -a "(docker-compose config --service)" -__bw_complete_subcommand "migrate" __bw_complete_subcommand "pytest" -a "bookwyrm/tests/**.py" __bw_complete_subcommand "populate_streams" -a "--stream=" -d "pick a single stream to populate" __bw_complete_subcommand "populate_streams" -l stream -a "home local books" From 306f177d5586263228928f4fcde46446c1b47823 Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 12 Mar 2022 21:12:25 -0700 Subject: [PATCH 29/49] add SASS_PROCESSOR_ENABLED = True --- bookwyrm/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 7d04a0466..6911d2325 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -188,6 +188,7 @@ STATICFILES_FINDERS = [ ] SASS_PROCESSOR_INCLUDE_FILE_PATTERN = r"^.+\.[s]{0,1}(?:a|c)ss$" +SASS_PROCESSOR_ENABLED = True # minify css is production but not dev if not DEBUG: From 0c87ee1d4b83b605a2735bf8ddc0cac418386b2b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 11:36:31 -0700 Subject: [PATCH 30/49] Fixes instructions on admin themes view --- bookwyrm/management/commands/compilethemes.py | 32 ------------------- bookwyrm/templates/settings/themes.html | 2 +- bw-dev | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 bookwyrm/management/commands/compilethemes.py diff --git a/bookwyrm/management/commands/compilethemes.py b/bookwyrm/management/commands/compilethemes.py deleted file mode 100644 index e3fba632b..000000000 --- a/bookwyrm/management/commands/compilethemes.py +++ /dev/null @@ -1,32 +0,0 @@ -""" Compile themes """ -import os -from django.contrib.staticfiles.utils import get_files -from django.contrib.staticfiles.storage import StaticFilesStorage -from django.core.files.base import ContentFile -from django.core.management.base import BaseCommand - -import sass -from sass_processor.processor import SassProcessor - -# pylint: disable=line-too-long -class Command(BaseCommand): - """Compile themes""" - - help = "Compile theme scss files" - - # pylint: disable=no-self-use,unused-argument - def handle(self, *args, **options): - """compile themes""" - storage = StaticFilesStorage() - theme_files = list(get_files(storage, location="css/themes")) - theme_files = [t for t in theme_files if t[-5:] == ".scss"] - for filename in theme_files: - path = storage.path(filename) - content = sass.compile( - filename=path, - include_paths=SassProcessor.include_paths, - ) - basename, _ = os.path.splitext(path) - destination_filename = basename + ".css" - print(f"saving f{destination_filename}") - storage.save(destination_filename, ContentFile(content)) diff --git a/bookwyrm/templates/settings/themes.html b/bookwyrm/templates/settings/themes.html index d3dac804f..44d0cecec 100644 --- a/bookwyrm/templates/settings/themes.html +++ b/bookwyrm/templates/settings/themes.html @@ -29,7 +29,7 @@ {% trans "Copy the theme file into the bookwyrm/static/css/themes directory on your server from the command line." %}
  • - {% trans "Run ./bw-dev compilescss." %} + {% trans "Run ./bw-dev collectstatic." %}
  • {% trans "Add the file name using the form below to make it available in the application interface." %} diff --git a/bw-dev b/bw-dev index 1cc930264..b4b8cc0d3 100755 --- a/bw-dev +++ b/bw-dev @@ -154,7 +154,7 @@ case "$CMD" in --config dev-tools/.stylelintrc.js ;; compilescss) - runweb python manage.py compilethemes + runweb python manage.py compilescss runweb python manage.py collectstatic --no-input ;; collectstatic_watch) From 2f124e00d123a0ecdf932b58ee4331125b826873 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 11:57:46 -0700 Subject: [PATCH 31/49] Updates locales --- locale/de_DE/LC_MESSAGES/django.po | 60 +++++++------- locale/en_US/LC_MESSAGES/django.po | 120 +++++++++++++-------------- locale/es_ES/LC_MESSAGES/django.mo | Bin 83719 -> 83719 bytes locale/es_ES/LC_MESSAGES/django.po | 60 +++++++------- locale/fr_FR/LC_MESSAGES/django.po | 60 +++++++------- locale/gl_ES/LC_MESSAGES/django.mo | Bin 89448 -> 89448 bytes locale/gl_ES/LC_MESSAGES/django.po | 60 +++++++------- locale/it_IT/LC_MESSAGES/django.mo | Bin 90758 -> 90758 bytes locale/it_IT/LC_MESSAGES/django.po | 60 +++++++------- locale/lt_LT/LC_MESSAGES/django.mo | Bin 84886 -> 84886 bytes locale/lt_LT/LC_MESSAGES/django.po | 60 +++++++------- locale/no_NO/LC_MESSAGES/django.mo | Bin 79871 -> 79871 bytes locale/no_NO/LC_MESSAGES/django.po | 60 +++++++------- locale/pt_BR/LC_MESSAGES/django.mo | Bin 90058 -> 90058 bytes locale/pt_BR/LC_MESSAGES/django.po | 60 +++++++------- locale/pt_PT/LC_MESSAGES/django.mo | Bin 72909 -> 72909 bytes locale/pt_PT/LC_MESSAGES/django.po | 60 +++++++------- locale/sv_SE/LC_MESSAGES/django.mo | Bin 87935 -> 87935 bytes locale/sv_SE/LC_MESSAGES/django.po | 60 +++++++------- locale/zh_Hans/LC_MESSAGES/django.po | 60 +++++++------- locale/zh_Hant/LC_MESSAGES/django.po | 60 +++++++------- 21 files changed, 417 insertions(+), 423 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index e458e84b6..f7ed0969d 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 20:16\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -261,73 +261,73 @@ msgstr "Zitate" msgid "Everything else" msgstr "Alles andere" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Start-Zeitleiste" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Startseite" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Bücher-Zeitleiste" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Bücher" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Englisch)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (Spanisch)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Galizisch)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (Italienisch)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Französisch)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisch)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegisch)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianisches Portugiesisch)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugiesisch)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Schwedisch)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (vereinfachtes Chinesisch)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinesisch, traditionell)" @@ -356,54 +356,54 @@ msgstr "Etwas ist schief gelaufen! Tut uns leid." msgid "About" msgstr "Über" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Willkommen auf %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s ist Teil von BookWyrm, ein Netzwerk unabhängiger, selbstverwalteter Gemeinschaften für Leser*innen. Obwohl du dich nahtlos mit anderen Benutzer*innen überall im BookWyrm-Netzwerk austauschen kannst, ist diese Gemeinschaft einzigartig." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s ist mit einer durchschnittlichen Bewertung von %(rating)s (von 5) das beliebtestes Buch auf %(site_name)s." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Das Buch %(title)s wollen mehr Benutzer*innen von %(site_name)s lesen als jedes andere Buch." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s hat die unterschiedlichsten Bewertungen aller Bücher auf %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Verfolge deine Lektüre, sprich über Bücher, schreibe Besprechungen und entdecke, was Du als Nächstes lesen könntest. BookWyrm ist eine Software im menschlichen Maßstab, die immer übersichtlich, werbefrei, persönlich, und gemeinschaftsorientiert sein wird. Wenn du Feature-Anfragen, Fehlerberichte oder große Träume hast, wende dich an und verschaffe dir Gehör." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Lerne deinen Admins kennen" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Die Moderator*innen und Administrator*innen von %(site_name)s halten diese Seite am Laufen. Beachte den Verhaltenskodex und melde, wenn andere Benutzer*innen dagegen verstoßen oder Spam verbreiten." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderator*in" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Administration" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index a6941e87f..76cfb32bd 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -221,7 +221,7 @@ msgid "Followers" msgstr "" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -262,73 +262,73 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -728,14 +728,14 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -749,20 +749,20 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "" @@ -771,9 +771,9 @@ msgstr "" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "" -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -874,8 +874,8 @@ msgid "Add to list" msgstr "" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "" @@ -1216,7 +1216,7 @@ msgstr "" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "" @@ -1292,7 +1292,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "" msgid "This action cannot be un-done" msgstr "" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "" msgid "Suggest \"%(title)s\" for this list" msgstr "" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "" @@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4200,7 +4201,8 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4216,10 +4218,6 @@ msgstr "" msgid "All books" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "" msgid "Content" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "" @@ -4851,10 +4849,6 @@ msgstr "" msgid "Groups: %(username)s" msgstr "" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index cdb48a306eb2e333416e2cd803bb8ce01c4274c3..43db15d9d564c104654b5a2f27f668fb4ecbd918 100644 GIT binary patch delta 22 dcmZqgV{Pwa-5`93-9o|0(8|zkv(%xtEdW=?2ps?b delta 22 dcmZqgV{Pwa-5`93-AKXE(#qI!v(%xtEdW>D2qORh diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index 51f969045..98d4e124f 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-02 19:39\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -261,73 +261,73 @@ msgstr "Citas" msgid "Everything else" msgstr "Todo lo demás" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Línea de tiempo principal" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Línea temporal de libros" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Gallego)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (Noruego)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileño)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chino simplificado)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chino tradicional)" @@ -356,54 +356,54 @@ msgstr "¡Algo salió mal! Disculpa." msgid "About" msgstr "Acerca de" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "¡Bienvenido a %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s es parte de BookWyrm, una red de comunidades independientes y autogestionadas para lectores. Aunque puedes interactuar sin problemas con los usuarios de cualquier parte de la red BookWyrm, esta comunidad es única." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s es el libro más querido de %(site_name)s, con una valoración promedio de %(rating)s sobre 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Los usuarios de %(site_name)s quieren leer %(title)s más que cualquier otro libro." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "Las valoraciones de %(title)s están más divididas que las de cualquier otro libro en %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Haz un registro de tu lectura, habla sobre libros, escribe reseñas y descubre qué leer a continuación. BookWyrm es un software de escala humana, siempre sin anuncios, anticorporativo y orientado a la comunidad, diseñado para ser pequeño y personal. Si tienes solicitudes de características, informes de errores o grandes sueños, contacta y hazte oír." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Conoce a tus administradores" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Los moderadores y administradores de %(site_name)s mantienen el sitio en funcionamiento, hacen cumplir el código de conducta y responden cuando los usuarios informan de spam y mal comportamiento." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderador" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Administrador" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 31ebd43cd..6c5d17c4d 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-02 12:24\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -261,73 +261,73 @@ msgstr "Citations" msgid "Everything else" msgstr "Tout le reste" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Mon fil d’actualité" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Accueil" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Actualité de mes livres" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livres" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Galicien)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (italien)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituanien)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (norvégien)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugais brésilien)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugais européen)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Suédois)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简化字" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "Infos supplémentaires :" @@ -356,54 +356,54 @@ msgstr "Une erreur s’est produite ; désolé !" msgid "About" msgstr "À propos" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bienvenue sur %(site_name)s !" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s fait partie de BookWyrm, un réseau de communautés indépendantes et autogérées, à destination des lecteurs. Bien que vous puissiez interagir apparemment avec les comptes n'importe où dans le réseau BookWyrm, cette communauté est unique." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s est le livre le plus aimé de %(site_name)s, avec une note moyenne de %(rating)s sur 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Sur %(site_name)s, c’est %(title)s que tout le monde veut lire plus que n’importe quel autre livre." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s divise les critiques plus que n’importe quel autre livre sur %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Gardez trace de vos lectures, parlez de livres, écrivez des commentaires et découvrez quoi lire ensuite. BookWyrm est un logiciel à échelle humaine, sans publicité, anti-capitaliste et axé sur la communauté, conçu pour rester petit et personnel. Si vous avez des demandes de fonctionnalités, des rapports de bogue ou des rêves grandioses, rejoignez-nous et faites-vous entendre." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Rencontrez vos admins" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "L’administration et la modération de %(site_name)s maintiennent le site opérationnel, font respecter le code de conduite, et répondent lorsque les utilisateurs signalent le spam et les mauvais comportements." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Modérateur/modératrice" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index dbe430ba55e58d9a4febfef0b56a7a2c87061b09..691d4246e087603ac0f44e63c0f842b22202e1a0 100644 GIT binary patch delta 22 ecmaE{i}l4W)(zR0*)0@|46O{!HWyv~)(HT0#0nPx delta 22 ecmaE{i}l4W)(zR0*^Lwo%&m+~HWyv~)(HT0pb8ZL diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index b76edace6..1f45a6890 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-02 07:34\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -261,73 +261,73 @@ msgstr "Citas" msgid "Everything else" msgstr "As outras cousas" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Cronoloxía de Inicio" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Cronoloxía de libros" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Alemán (Alemaña)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (España)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (Italian)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Francés (Francia)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithuanian)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Noruegués (Norwegian)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileiro)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Sueco (Swedish)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinés simplificado)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinés tradicional)" @@ -356,54 +356,54 @@ msgstr "Algo fallou! Lamentámolo." msgid "About" msgstr "Acerca de" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Sexas ben vida a %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s é parte de BookWyrm, unha rede independente, auto-xestionada por comunidades de persoas lectoras. Aínda que podes interactuar con outras usuarias da rede BookWyrm, esta comunidade é única." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s é o libro máis querido de %(site_name)s, cunha valoración media de %(rating)s sobre 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(title)s é o libro que máis queren ler as usuarias de %(site_name)s." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s é o libro con valoracións máis diverxentes en %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Rexistra as túas lecturas, conversa acerca dos libros, escribe recensións e descubre próximas lecturas. Sempre sen publicidade, anti-corporacións e orientado á comunidade, BookWyrm é software a escala humana, deseñado para ser pequeno e persoal. Se queres propoñer novas ferramentas, informar de fallos, ou colaborar, contacta con nós e deixa oír a túa voz." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Contacta coa administración" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "A moderación e administración de %(site_name)s coidan e xestionan o sitio web, fan cumprir co código de conduta e responden ás denuncias das usuarias sobre spam e mal comportamento." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderación" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo index cddc0a5404396ed218fbdc22f037e2c5d7c0a1d9..2be0c3ac01a7057cabd8b69e3f99520ca5e585ef 100644 GIT binary patch delta 22 ecmZoW%G!36bwl%Ib_)d~Ln}kG&0UxO^Z@{Am5o diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index 143539d9e..245387351 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 21:14\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -261,73 +261,73 @@ msgstr "Citazioni" msgid "Everything else" msgstr "Tutto il resto" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "La tua timeline" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Home" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Timeline dei libri" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libri" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Inglese)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch (Tedesco)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (Spagnolo)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Galiziano)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Francese)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegese)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portoghese Brasiliano)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portoghese europeo)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Svedese)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Cinese Semplificato)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Cinese Tradizionale)" @@ -356,54 +356,54 @@ msgstr "Qualcosa è andato storto! Ci dispiace." msgid "About" msgstr "Informazioni su" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Benvenuto su %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s fa parte di BookWyrm, una rete di comunità indipendenti e autogestite per i lettori. Mentre puoi interagire apparentemente con gli utenti ovunque nella rete di BookWyrm, questa comunità è unica." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s è il libro più amato di %(site_name)s, con un punteggio medio di %(rating)s su 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Più %(site_name)s utenti vogliono leggere %(title)s rispetto a qualsiasi altro libro." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s ha le valutazioni più divisive di ogni libro su %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Traccia la tue letture, parla di libri, scrivi recensioni, e scopri cosa leggere dopo. BookWyrm, sempre libero, anti-corporate, orientato alla comunità, è un software a misura d'uomo, progettato per rimanere piccolo e personale. Se hai richieste di funzionalità, segnalazioni di bug o grandi sogni, contatta e fai sentire la tua voce." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Incontra gli amministratori" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "I moderatori e gli amministratori di %(site_name)s mantengono il sito attivo e funzionante, applicano il codice di condotta, e rispondono quando gli utenti segnalano spam o comportamenti non adeguati." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderatori" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index d05ea5af184fd779c03aaa8e5ecc5f100443d7eb..b4885e93b693c8909b1476f861f3aaecba0a2b0a 100644 GIT binary patch delta 19 bcmbO>opsuD)(sj5Su7Nc3^(f>%<2LFNj3*j delta 19 bcmbO>opsuD)(sj5Sqv473^wZ=%<2LFNbv_r diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index ca506d583..b272ecf09 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 20:15\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:15\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -261,73 +261,73 @@ msgstr "Citatos" msgid "Everything else" msgstr "Visa kita" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Pagrindinė siena" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Pagrindinis" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Knygų siena" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Knygos" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Anglų)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch (Vokiečių)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (Ispanų)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (galisų)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italų (Italian)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Prancūzų)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norvegų (Norwegian)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português brasileiro (Brazilijos portugalų)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europos portugalų)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Švedų)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Supaprastinta kinų)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicinė kinų)" @@ -356,54 +356,54 @@ msgstr "Kažkas nepavyko. Atsiprašome." msgid "About" msgstr "Apie" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Sveiki atvykę į %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s yra BookWyrmdalis, tinklo nepriklausomų skaitytojų bendruomenių. Jūs galite bendrauti su nariais iš šio BookWyrm tinklo, tačiau ši bendruomenė yra unikali." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s yra %(site_name)s's mėgstamiausia knyga, kurios vidutinis įvertinimas yra %(rating)s iš 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Daugiau %(site_name)s narių nori perskaityti %(title)s negu bet kurią kitą knygą." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s labiausiai kontroversiškai reitinguota %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Sekite savo skaitymus, kalbėkite apie knygas, rašykite atsiliepimus ir atraskite, ką dar perskaityti. „BookWyrm“ – tai programinė įranga, kurioje nėra reklamų, biurokratijos. Tai bendruomenei orientuota, nedidelė ir asmeninė įranga, kurią lengva plėsti. Jei norite papildomų funkcijų, įgyvendinti savo svajones ar tiesiog pranešti apie klaidą, susisiekite ir jus išgirsime." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Šio serverio administratoriai" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Svetainės %(site_name)s moderatoriai ir administratoriai nuolat atnaujina puslapį, laikosi elgsenos susitarimo ir atsako, kai naudotojai praneša apie brukalą ir blogą elgesį." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderatorius" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Administravimas" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo index 97e81d11d44590e10e50b3cefb248244ad231eb4..dbfe5ea07ba28095af217223c694380ae67f9888 100644 GIT binary patch delta 22 ecmezWp5_00mJJ#Q*)0@|46O{!HtQd}PzC^c*9po1 delta 22 ecmezWp5_00mJJ#Q*$owp46F=IH|rm~PzC^cbP2%# diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po index 473c4a71e..a7626b284 100644 --- a/locale/no_NO/LC_MESSAGES/django.po +++ b/locale/no_NO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 20:15\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -261,73 +261,73 @@ msgstr "Sitater" msgid "Everything else" msgstr "Andre ting" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Lokal tidslinje" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Boktidslinja" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Bøker" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Engelsk)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch (Tysk)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (Spansk)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (Italiensk)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Fransk)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisk)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (Norsk)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português - Brasil (Brasiliansk portugisisk)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisisk)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Svensk)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Forenklet kinesisk)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradisjonelt kinesisk)" @@ -356,54 +356,54 @@ msgstr "Beklager, noe gikk galt! Leit, det der." msgid "About" msgstr "Om" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Velkommen til %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s er en del av BookWyrm, et nettverk av selvstendige, selvstyrte samfunn for lesere. Du kan kommunisere sømløst med brukere hvor som helst i BookWyrm nettverket, men hvert samfunn er unikt." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s er %(site_name)s sin favorittbok, med en gjennomsnittlig vurdering på %(rating)s av 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Flere av %(site_name)s sine medlemmer ønsker å lese %(title)s enn noen annen bok." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s er den boka på %(site_name)s med de mest polariserte vurderingene." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Journalfør lesingen din, snakk om bøker, skriv anmeldelser, og oppdag din neste bok. BookWyrm er reklamefri, ukommers og fellesskapsorientert, programvare for mennesker, designet for å forbli liten og nær. Hvis du har ønsker, feilrapporter eller store vyer, ta kontakt og bli hørt." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Møt administratorene" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s sine moderatorer og administratorer holder nettsida oppe og tilgjengelig, håndhever adferdskoden, og svarer på brukernes rapporterer om spam og dårlig atferd." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index ef4929f88c44dedad938ff601db128dccc37a28d..064c6caebac3129eca39164512621959f106f161 100644 GIT binary patch delta 22 ecmX@LpY_y!)(y><*)0@|46O{!Hg{ci=m7w77zttk delta 22 ecmX@LpY_y!)(y><*$owpjIE3eH+Nlj=m7w6zX@3Y diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index c2432bbba..60b192c6a 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 23:21\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -261,73 +261,73 @@ msgstr "Citações" msgid "Everything else" msgstr "Todo o resto" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Linha do tempo" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Página inicial" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Linha do tempo dos livros" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English (Inglês)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português do Brasil)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Português Europeu)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -356,54 +356,54 @@ msgstr "Algo deu errado! Foi mal." msgid "About" msgstr "Sobre" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bem-vindol(a) a %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s é parte da BookWyrm, uma rede independente e autogestionada para leitores. Apesar de você poder interagir diretamente com usuários de toda a rede BookWyrm, esta comunidade é única." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s é o livro favorito da instância %(site_name)s, com uma avaliação média de %(rating)s em 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "O livro mais desejado de toda a instância %(site_name)s é %(title)s." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s tem a avaliação mais polêmica de toda a instância %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Registre o andamento de suas leituras, fale sobre livros, escreva resenhas e ache o que ler em seguida. Sempre sem propagandas, anticorporativa e voltada à comunidade, a BookWyrm é um software em escala humana desenvolvido para permanecer pequeno e pessoal. Se você tem sugestões de funções, avisos sobre bugs ou grandes sonhos para o projeto, fale conosco e faça sua voz ser ouvida." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Conheça a administração" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Moderadores/as e administradores/as de %(site_name)s mantêm o site funcionando, aplicam o código de conduta e respondem quando usuários denunciam spam e mau comportamento." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderador/a" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo index 9c144cf8a16437303931924bed48443e9f8fb759..85e167660be76978d3eae5b1408af98292516f36 100644 GIT binary patch delta 22 ecmX@RljZDAmJRM}*ew){46O{!Hv6rqF8}~)+X%M+ delta 22 ecmX@RljZDAmJRM}*bNno46F=IH~X!rF8}~)cnGcl diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index ff508e117..32acf05c3 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 20:15\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -261,73 +261,73 @@ msgstr "Citações" msgid "Everything else" msgstr "Tudo o resto" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Cronograma Inicial" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Início" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Cronograma de Livros" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "Inglês" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituano)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português brasileiro)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português (Português Europeu)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -356,54 +356,54 @@ msgstr "Ocorreu um erro! Pedimos desculpa por isto." msgid "About" msgstr "Sobre" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bem-vindo(a) ao %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s faz parte do BookWyrm, uma rede de comunidades independentes, focada nos leitores. Enquanto podes interagir continuamente com utilizadores por todo o lado na Rede Boomwyrm, esta comunidade é única." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Conheça os nossos administradores" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderador" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo index 4f1348791d606f2cc21d5ef40c9a0d0916f359d7..eb44d9bf9529fbb561ab36fe4271c235c2e19ff6 100644 GIT binary patch delta 21 dcmeyrj`jaK)(za}*en!`46O_|3!cmC1OR8N2%`W1 delta 21 dcmeyrj`jaK)(za}*h~}*Osq^c3!cmC1OR832%`W1 diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po index f98510e33..303495c60 100644 --- a/locale/sv_SE/LC_MESSAGES/django.po +++ b/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-04 04:45\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:15\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -261,73 +261,73 @@ msgstr "Citationer" msgid "Everything else" msgstr "Allt annat" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "Tidslinje för Hem" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "Hem" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "Tidslinjer för böcker" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Böcker" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "Engelska" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Tyska (Tysk)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Spanska (Spansk)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italienska (Italiensk)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Franska (Fransk)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Litauiska (Litauisk)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norska (Norska)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português d Brasil (Brasiliansk Portugisiska)" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisiska)" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska (Svenska)" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Förenklad Kinesiska)" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditionell Kinesiska)" @@ -356,54 +356,54 @@ msgstr "Något gick fel! Förlåt för det." msgid "About" msgstr "Om" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Välkommen till %(site_name)s!" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s är en del av BookWyrm, ett nätverk av oberoende, självstyrda gemenskaper för läsare. Medan du kan interagera sömlöst med användare var som helst i BookWyrm-nätverketså är den här gemenskapen unik." -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s är %(site_name)s's mest omtyckta bok med ett genomsnittligt betyg på %(rating)s utav 5." -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Flera %(site_name)s användare vill läsa %(title)s än någon annan bok." -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s har de mest splittrade betygen av alla böcker på %(site_name)s." -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Följ din läsning, prata om böcker, skriv recensioner och upptäck vad som ska läsas härnäst. BookWyrm är alltid annonsfri, företagsfientlig och gemenskapsorienterad, och är en mänsklig programvara som är utformad för att förbli liten och personlig. Om du har förfrågningar om funktioner, felrapporter eller storslagna drömmar, ta kontakt och gör dig själv hörd." -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "Träffa dina administratörer" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s's moderatorer och administratörer håller hemsidan uppe och fungerande, upprätthåller uppförandekoden och svarar när användarna rapporterar skräppost och dåligt uppförande." -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "Administratör" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index ec1edda73..4acf1dce3 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-04 15:46\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -261,73 +261,73 @@ msgstr "引用" msgid "Everything else" msgstr "所有其它内容" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "主页时间线" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "主页" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "书目时间线" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "书目" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "Galego（加利西亚语）" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "Italiano（意大利语）" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français（法语）" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių（立陶宛语）" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "Norsk（挪威语）" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil（巴西葡萄牙语）" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu（欧洲葡萄牙语）" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "Svenska（瑞典语）" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文（繁体中文）" @@ -356,54 +356,54 @@ msgstr "某些东西出错了！对不起啦。" msgid "About" msgstr "关于" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "欢迎来到 %(site_name)s！" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s 是 BookWyrm 的一部分，这是一个为读者建立的独立、自我导向的社区网络。 虽然您可以在 BookWyrm 网络中与任何地方的用户无缝互动，但这个社区是独一无二的。" -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s 是 %(site_name)s 最受欢迎的书，平均得分为 %(rating)s（满分五分）。" -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(site_name)s 上的最用户想读的书籍是 %(title)s。" -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "在 %(site_name)s 上，对 %(title)s 这本书的评分争议较大。" -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "记录您的阅读、谈论书籍、撰写评论、发现下一本书。 BookWyrm 永远是无广告、反公司化和面向社区的为人设计的软件，其目的是保持小规模和个人性。 如果您有特性请求、错误报告或大梦想， 联系我们，为自己发声。" -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "遇见您的管理员" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s 的仲裁员和管理员负责维持站点运行， 执行行为守则，并在用户报告垃圾邮件和不良行为时做出回应。" -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "仲裁员" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "管理员" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 4222d2635..a410c4fed 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-01 19:48+0000\n" -"PO-Revision-Date: 2022-03-01 20:15\n" +"POT-Creation-Date: 2022-03-08 19:55+0000\n" +"PO-Revision-Date: 2022-03-08 21:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -261,73 +261,73 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home Timeline" msgstr "主頁時間線" -#: bookwyrm/settings.py:211 +#: bookwyrm/settings.py:207 msgid "Home" msgstr "主頁" -#: bookwyrm/settings.py:212 +#: bookwyrm/settings.py:208 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:212 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "書目" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:280 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:281 msgid "Deutsch (German)" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:282 msgid "Español (Spanish)" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:283 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:284 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:285 msgid "Français (French)" msgstr "Français（法語）" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:286 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:287 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:288 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:293 +#: bookwyrm/settings.py:289 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:294 +#: bookwyrm/settings.py:290 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:295 +#: bookwyrm/settings.py:291 msgid "简体中文 (Simplified Chinese)" msgstr "簡體中文" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:292 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文" @@ -356,54 +356,54 @@ msgstr "某些東西出錯了！抱歉。" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:19 +#: bookwyrm/templates/about/about.html:20 #: bookwyrm/templates/get_started/layout.html:20 #, python-format msgid "Welcome to %(site_name)s!" msgstr "歡迎來到 %(site_name)s！" -#: bookwyrm/templates/about/about.html:23 +#: bookwyrm/templates/about/about.html:24 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:40 +#: bookwyrm/templates/about/about.html:42 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:59 +#: bookwyrm/templates/about/about.html:61 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:78 +#: bookwyrm/templates/about/about.html:80 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:89 +#: bookwyrm/templates/about/about.html:91 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:96 +#: bookwyrm/templates/about/about.html:98 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:99 +#: bookwyrm/templates/about/about.html:101 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:113 +#: bookwyrm/templates/about/about.html:115 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:115 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 msgid "Admin" msgstr "管理員" -#: bookwyrm/templates/about/about.html:131 +#: bookwyrm/templates/about/about.html:133 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 From 739b394ccc63522f4aca72953bbc01826eaa3ee3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 12:31:21 -0700 Subject: [PATCH 32/49] Catch error when trying to update book --- bookwyrm/views/books/books.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index ad7ee9436..3556a0dc1 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -12,7 +12,7 @@ from django.views.decorators.http import require_POST from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse -from bookwyrm.connectors import connector_manager +from bookwyrm.connectors import connector_manager, ConnectorException from bookwyrm.connectors.abstract_connector import get_image from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views.helpers import is_api_request @@ -191,6 +191,10 @@ def update_book_from_remote(request, book_id, connector_identifier): ) book = get_object_or_404(models.Book.objects.select_subclasses(), id=book_id) - connector.update_book_from_remote(book) + try: + connector.update_book_from_remote(book) + except ConnectorException: + # the remote source isn't available or doesn't know this book + pass return redirect("book", book.id) From c7efa2340505ae22f5f0d225eedb3716e2545eb9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 12:38:29 -0700 Subject: [PATCH 33/49] Display error message for remote failure --- bookwyrm/templates/book/book.html | 9 +++++++++ bookwyrm/views/books/books.py | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 0e2fd5d39..fa098281e 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -12,6 +12,15 @@ {% endblock %} {% block content %} +{% if update_error %} +
    + + + {% trans "Unable to connect to remote source." %} + +
    +{% endif %} + {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
    diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 3556a0dc1..a010c300f 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -22,7 +22,7 @@ from bookwyrm.views.helpers import is_api_request class Book(View): """a book! this is the stuff""" - def get(self, request, book_id, user_statuses=False): + def get(self, request, book_id, user_statuses=False, update_error=False): """info about a book""" if is_api_request(request): book = get_object_or_404( @@ -80,6 +80,7 @@ class Book(View): else None, "rating": reviews.aggregate(Avg("rating"))["rating__avg"], "lists": lists, + "update_error": update_error, } if request.user.is_authenticated: @@ -195,6 +196,6 @@ def update_book_from_remote(request, book_id, connector_identifier): connector.update_book_from_remote(book) except ConnectorException: # the remote source isn't available or doesn't know this book - pass + return Book().get(request, book_id, update_error=True) return redirect("book", book.id) From 3885ae789b7c75da35f83e1a68242b015d135b12 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 13:11:24 -0700 Subject: [PATCH 34/49] Manually add theme path rather than options --- bookwyrm/forms.py | 7 ++++++- bookwyrm/templates/settings/themes.html | 22 ++-------------------- bookwyrm/views/admin/themes.py | 5 ----- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index f152ed4ea..7cfbe6283 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -468,7 +468,12 @@ class ThemeForm(CustomForm): fields = ["name", "path"] widgets = { "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), - "path": forms.Select(attrs={"aria-describedby": "desc_path"}), + "path": forms.TextInput( + attrs={ + "aria-describedby": "desc_path", + "placeholder": "css/themes/theme-name.scss", + } + ), } diff --git a/bookwyrm/templates/settings/themes.html b/bookwyrm/templates/settings/themes.html index 44d0cecec..3d4d83dec 100644 --- a/bookwyrm/templates/settings/themes.html +++ b/bookwyrm/templates/settings/themes.html @@ -56,12 +56,7 @@ class="box" enctype="multipart/form-data" > - {% if not choices %} -
    - {% trans "No available theme files detected" %} -
    - {% endif %} -
    +
    {% csrf_token %}
    @@ -79,20 +74,7 @@ {% trans "Theme filename" %}
    -
    - -
    + {{ theme_form.path }} {% include 'snippets/form_errors.html' with errors_list=theme_form.path.errors id="desc_path" %}
    diff --git a/bookwyrm/views/admin/themes.py b/bookwyrm/views/admin/themes.py index 12b449afb..ae9a748d3 100644 --- a/bookwyrm/views/admin/themes.py +++ b/bookwyrm/views/admin/themes.py @@ -1,7 +1,5 @@ """ manage themes """ from django.contrib.auth.decorators import login_required, permission_required -from django.contrib.staticfiles.utils import get_files -from django.contrib.staticfiles.storage import StaticFilesStorage from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.utils.decorators import method_decorator @@ -41,11 +39,8 @@ class Themes(View): def get_view_data(): """data for view""" - choices = list(get_files(StaticFilesStorage(), location="css/themes")) - current = models.Theme.objects.values_list("path", flat=True) return { "themes": models.Theme.objects.all(), - "choices": [c for c in choices if c not in current and c[-5:] == ".scss"], "theme_form": forms.ThemeForm(), } From 37beb5a8f4e3cf085beb8173b80b4c77104e3a51 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 13:19:02 -0700 Subject: [PATCH 35/49] Tick javascript cache buster --- bookwyrm/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 6911d2325..1199ba3ac 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -21,7 +21,7 @@ RELEASE_API = env( PAGE_LENGTH = env("PAGE_LENGTH", 15) DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English") -JS_CACHE = "c7154efb" +JS_CACHE = "bc93172a" # email EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend") From c08459cf5defb21ce74a56e02eb1f2743edc2e6b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 13 Mar 2022 13:19:40 -0700 Subject: [PATCH 36/49] Tick version number --- bookwyrm/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 1199ba3ac..5ab3c7a13 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -11,7 +11,7 @@ from django.utils.translation import gettext_lazy as _ env = Env() env.read_env() DOMAIN = env("DOMAIN") -VERSION = "0.3.2" +VERSION = "0.3.3" RELEASE_API = env( "RELEASE_API", From e4f94780ebdf79bb94617a843a8103b52cf3a47c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 09:06:29 -0700 Subject: [PATCH 37/49] Uses translated fields in admin user info --- bookwyrm/templates/settings/users/user_info.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/templates/settings/users/user_info.html b/bookwyrm/templates/settings/users/user_info.html index c60ae285d..a5447931c 100644 --- a/bookwyrm/templates/settings/users/user_info.html +++ b/bookwyrm/templates/settings/users/user_info.html @@ -71,14 +71,14 @@
    {{ user.last_active_date }}
    {% trans "Manually approved followers:" %}
    -
    {{ user.manually_approves_followers }}
    +
    {{ user.manually_approves_followers|yesno }}
    {% trans "Discoverable:" %}
    -
    {{ user.discoverable }}
    +
    {{ user.discoverable|yesno }}
    {% if not user.is_active %}
    {% trans "Deactivation reason:" %}
    -
    {{ user.deactivation_reason }}
    +
    {{ user.get_deactivation_reason_display }}
    {% endif %} {% if not user.is_active and user.deactivation_reason == "pending" %} @@ -104,7 +104,7 @@
    {{ server.application_version }}
    {% trans "Status:" %}
    -
    {{ server.status }}
    +
    {{ server.get_status_display }}
    {% if server.notes %}
    {% trans "Notes" %}
    From bf68b70fba0c8b45ae7fd29350dee708969c606c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 09:10:48 -0700 Subject: [PATCH 38/49] Use breadcrumbs in use admin view --- bookwyrm/templates/settings/users/user.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/settings/users/user.html b/bookwyrm/templates/settings/users/user.html index 676502e6d..c18ba8295 100644 --- a/bookwyrm/templates/settings/users/user.html +++ b/bookwyrm/templates/settings/users/user.html @@ -1,10 +1,23 @@ {% extends 'settings/layout.html' %} {% load i18n %} +{% load utilities %} {% block title %}{{ user.username }}{% endblock %} {% block header %} {{ user.username }} -{% trans "Back to users" %} +{% endblock %} + +{% block breadcrumbs %} + {% endblock %} {% block panel %} From 488d702473a90c07a449ce5d2c4afae6a434bb31 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 09:27:18 -0700 Subject: [PATCH 39/49] Separate admin user list into tabbed lists --- .../templates/settings/users/user_admin.html | 101 +++++++++++------- bookwyrm/urls.py | 5 + bookwyrm/views/admin/user_admin.py | 5 +- 3 files changed, 71 insertions(+), 40 deletions(-) diff --git a/bookwyrm/templates/settings/users/user_admin.html b/bookwyrm/templates/settings/users/user_admin.html index 874ce8182..e3de77938 100644 --- a/bookwyrm/templates/settings/users/user_admin.html +++ b/bookwyrm/templates/settings/users/user_admin.html @@ -1,5 +1,7 @@ {% extends 'settings/layout.html' %} {% load i18n %} +{% load utilities %} + {% block title %}{% trans "Users" %}{% endblock %} {% block header %} @@ -15,46 +17,67 @@ {% include 'settings/users/user_admin_filters.html' %} - - - {% url 'settings-users' as url %} - - - - - - - {% for user in users %} - - - - - - + {% for user in users %} + + + + + + {% if status != "local" %} + + {% endif %} + + {% endfor %} +
    - {% trans "Username" as text %} - {% include 'snippets/table-sort-header.html' with field="username" sort=sort text=text %} - - {% trans "Date Added" as text %} - {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %} - - {% trans "Last Active" as text %} - {% include 'snippets/table-sort-header.html' with field="last_active_date" sort=sort text=text %} - - {% trans "Status" as text %} - {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %} - - {% trans "Remote instance" as text %} - {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %} -
    {{ user.username }}{{ user.created_date }}{{ user.last_active_date }}{% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %} - {% if user.federated_server %} - {{ user.federated_server.server_name }} - {% elif not user.local %} - {% trans "Not set" %} +
    +
    + +
    +
    + +
    + + + {% url 'settings-users' as url %} + + + + + {% if status != "local" %} + {% endif %} - - - {% endfor %} -
    + {% trans "Username" as text %} + {% include 'snippets/table-sort-header.html' with field="username" sort=sort text=text %} + + {% trans "Date Added" as text %} + {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %} + + {% trans "Last Active" as text %} + {% include 'snippets/table-sort-header.html' with field="last_active_date" sort=sort text=text %} + + {% trans "Status" as text %} + {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %} + + {% trans "Remote instance" as text %} + {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %} +
    +
    {{ user|username }}{{ user.created_date }}{{ user.last_active_date }}{% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %} + {% if user.federated_server %} + {{ user.federated_server.server_name }} + {% else %} + {% trans "Not set" %} + {% endif %} +
    +
    {% include 'snippets/pagination.html' with page=users path=request.path %} {% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index b9c348a43..4d7f503f3 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -125,6 +125,11 @@ urlpatterns = [ re_path( r"^settings/users/?$", views.UserAdminList.as_view(), name="settings-users" ), + re_path( + r"^settings/users/(?P(local|federated))\/?$", + views.UserAdminList.as_view(), + name="settings-users", + ), re_path( r"^settings/users/(?P\d+)/?$", views.UserAdmin.as_view(), diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index aa8479590..df716d2cb 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -19,7 +19,7 @@ from bookwyrm.settings import PAGE_LENGTH class UserAdminList(View): """admin view of users on this server""" - def get(self, request): + def get(self, request, status="local"): """list of users""" filters = {} server = request.GET.get("server") @@ -37,6 +37,8 @@ class UserAdminList(View): if email: filters["email__endswith"] = email + filters["local"] = status == "local" + users = models.User.objects.filter(**filters) sort = request.GET.get("sort", "-created_date") @@ -56,6 +58,7 @@ class UserAdminList(View): "users": paginated.get_page(request.GET.get("page")), "sort": sort, "server": server, + "status": status, } return TemplateResponse(request, "settings/users/user_admin.html", data) From f42e86343494beee61260c9429cf3b7621f0d8fc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 09:38:03 -0700 Subject: [PATCH 40/49] Updates user admin filters --- .../settings/reports/report_filters.html | 7 +++++++ bookwyrm/templates/settings/reports/reports.html | 2 +- .../templates/settings/users/email_filter.html | 16 ++++++++++++++++ .../settings/users/user_admin_filters.html | 7 ++++++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 bookwyrm/templates/settings/reports/report_filters.html create mode 100644 bookwyrm/templates/settings/users/email_filter.html diff --git a/bookwyrm/templates/settings/reports/report_filters.html b/bookwyrm/templates/settings/reports/report_filters.html new file mode 100644 index 000000000..48a3b7c8a --- /dev/null +++ b/bookwyrm/templates/settings/reports/report_filters.html @@ -0,0 +1,7 @@ +{% extends 'snippets/filters_panel/filters_panel.html' %} + +{% block filter_fields %} +{% include 'settings/users/username_filter.html' %} +{% include 'directory/community_filter.html' %} +{% include 'settings/users/server_filter.html' %} +{% endblock %} diff --git a/bookwyrm/templates/settings/reports/reports.html b/bookwyrm/templates/settings/reports/reports.html index c72fd03d0..99cca1a75 100644 --- a/bookwyrm/templates/settings/reports/reports.html +++ b/bookwyrm/templates/settings/reports/reports.html @@ -30,7 +30,7 @@
    -{% include 'settings/users/user_admin_filters.html' %} +{% include 'settings/reports/report_filters.html' %}
    {% if not reports %} diff --git a/bookwyrm/templates/settings/users/email_filter.html b/bookwyrm/templates/settings/users/email_filter.html new file mode 100644 index 000000000..5d49d615e --- /dev/null +++ b/bookwyrm/templates/settings/users/email_filter.html @@ -0,0 +1,16 @@ +{% extends 'snippets/filters_panel/filter_field.html' %} +{% load i18n %} + +{% block filter %} + +
    + +
    +{% endblock %} + diff --git a/bookwyrm/templates/settings/users/user_admin_filters.html b/bookwyrm/templates/settings/users/user_admin_filters.html index 48a3b7c8a..c5ab2dabe 100644 --- a/bookwyrm/templates/settings/users/user_admin_filters.html +++ b/bookwyrm/templates/settings/users/user_admin_filters.html @@ -2,6 +2,11 @@ {% block filter_fields %} {% include 'settings/users/username_filter.html' %} -{% include 'directory/community_filter.html' %} + +{% if status != "local" %} {% include 'settings/users/server_filter.html' %} +{% else %} +{% include 'settings/users/email_filter.html' %} +{% endif %} + {% endblock %} From bfb8fc800a0d10277cfdb5dfe017a8f022b2d109 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 10:59:24 -0700 Subject: [PATCH 41/49] Moves duplicate field script into its own file --- bookwyrm/static/js/bookwyrm.js | 24 -------------- bookwyrm/static/js/forms.js | 32 +++++++++++++++++++ .../templates/book/edit/edit_book_form.html | 5 +++ 3 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 bookwyrm/static/js/forms.js diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 100daa039..95271795d 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -38,10 +38,6 @@ let BookWyrm = new (class { .querySelectorAll("[data-modal-open]") .forEach((node) => node.addEventListener("click", this.handleModalButton.bind(this))); - document - .querySelectorAll("[data-duplicate]") - .forEach((node) => node.addEventListener("click", this.duplicateInput.bind(this))); - document .querySelectorAll("details.dropdown") .forEach((node) => @@ -495,26 +491,6 @@ let BookWyrm = new (class { window.open(url, windowName, "left=100,top=100,width=430,height=600"); } - duplicateInput(event) { - const trigger = event.currentTarget; - const input_id = trigger.dataset.duplicate; - const orig = document.getElementById(input_id); - const parent = orig.parentNode; - const new_count = parent.querySelectorAll("input").length + 1; - - let input = orig.cloneNode(); - - input.id += "-" + new_count; - input.value = ""; - - let label = parent.querySelector("label").cloneNode(); - - label.setAttribute("for", input.id); - - parent.appendChild(label); - parent.appendChild(input); - } - /** * Set up a "click-to-copy" component from a textarea element * with `data-copytext`, `data-copytext-label`, `data-copytext-success` diff --git a/bookwyrm/static/js/forms.js b/bookwyrm/static/js/forms.js new file mode 100644 index 000000000..7d946d147 --- /dev/null +++ b/bookwyrm/static/js/forms.js @@ -0,0 +1,32 @@ +(function () { + "use strict"; + + /** + * Duplicate an input field + * + * @param {event} the click even on the associated button + */ + function duplicateInput(event) { + const trigger = event.currentTarget; + const input_id = trigger.dataset.duplicate; + const orig = document.getElementById(input_id); + const parent = orig.parentNode; + const new_count = parent.querySelectorAll("input").length + 1; + + let input = orig.cloneNode(); + + input.id += "-" + new_count; + input.value = ""; + + let label = parent.querySelector("label").cloneNode(); + + label.setAttribute("for", input.id); + + parent.appendChild(label); + parent.appendChild(input); + } + + document + .querySelectorAll("[data-duplicate]") + .forEach((node) => node.addEventListener("click", duplicateInput)); +})(); diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html index d95aa725e..38a7fe35d 100644 --- a/bookwyrm/templates/book/edit/edit_book_form.html +++ b/bookwyrm/templates/book/edit/edit_book_form.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load static %} {% if form.non_field_errors %}
    @@ -302,3 +303,7 @@
    + +{% block scripts %} + +{% endblock %} From 7169f7ba2030eef10023f3518b0a5e45a52b7219 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 11:43:58 -0700 Subject: [PATCH 42/49] Creates forms directory --- bookwyrm/forms/__init__.py | 3 +++ bookwyrm/{ => forms}/forms.py | 0 2 files changed, 3 insertions(+) create mode 100644 bookwyrm/forms/__init__.py rename bookwyrm/{ => forms}/forms.py (100%) diff --git a/bookwyrm/forms/__init__.py b/bookwyrm/forms/__init__.py new file mode 100644 index 000000000..dac2007b8 --- /dev/null +++ b/bookwyrm/forms/__init__.py @@ -0,0 +1,3 @@ +""" make forms available to the app """ +# site admin +from .forms import * diff --git a/bookwyrm/forms.py b/bookwyrm/forms/forms.py similarity index 100% rename from bookwyrm/forms.py rename to bookwyrm/forms/forms.py From d3f723a07dd95ddf96c5b96d7fb23fea6abd54c2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 11:46:08 -0700 Subject: [PATCH 43/49] Splits forms into separate files --- bookwyrm/forms/__init__.py | 9 + bookwyrm/forms/admin.py | 129 +++++++++ bookwyrm/forms/author.py | 47 +++ bookwyrm/forms/books.py | 81 ++++++ bookwyrm/forms/custom_form.py | 26 ++ bookwyrm/forms/edit_user.py | 68 +++++ bookwyrm/forms/forms.py | 529 +--------------------------------- bookwyrm/forms/groups.py | 16 + bookwyrm/forms/landing.py | 45 +++ bookwyrm/forms/links.py | 48 +++ bookwyrm/forms/lists.py | 37 +++ bookwyrm/forms/status.py | 82 ++++++ 12 files changed, 590 insertions(+), 527 deletions(-) create mode 100644 bookwyrm/forms/admin.py create mode 100644 bookwyrm/forms/author.py create mode 100644 bookwyrm/forms/books.py create mode 100644 bookwyrm/forms/custom_form.py create mode 100644 bookwyrm/forms/edit_user.py create mode 100644 bookwyrm/forms/groups.py create mode 100644 bookwyrm/forms/landing.py create mode 100644 bookwyrm/forms/links.py create mode 100644 bookwyrm/forms/lists.py create mode 100644 bookwyrm/forms/status.py diff --git a/bookwyrm/forms/__init__.py b/bookwyrm/forms/__init__.py index dac2007b8..a6f704339 100644 --- a/bookwyrm/forms/__init__.py +++ b/bookwyrm/forms/__init__.py @@ -1,3 +1,12 @@ """ make forms available to the app """ # site admin +from .admin import * +from .author import * +from .books import * from .forms import * +from .groups import * +from .landing import * +from .links import * +from .lists import * +from .status import * +from .user import * diff --git a/bookwyrm/forms/admin.py b/bookwyrm/forms/admin.py new file mode 100644 index 000000000..6b2984b3b --- /dev/null +++ b/bookwyrm/forms/admin.py @@ -0,0 +1,129 @@ +""" using django model forms """ +import datetime + +from django import forms +from django.forms import widgets +from django.utils import timezone +from django.utils.translation import gettext_lazy as _ + +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class ExpiryWidget(widgets.Select): + def value_from_datadict(self, data, files, name): + """human-readable exiration time buckets""" + selected_string = super().value_from_datadict(data, files, name) + + if selected_string == "day": + interval = datetime.timedelta(days=1) + elif selected_string == "week": + interval = datetime.timedelta(days=7) + elif selected_string == "month": + interval = datetime.timedelta(days=31) # Close enough? + elif selected_string == "forever": + return None + else: + return selected_string # This will raise + + return timezone.now() + interval + + +class CreateInviteForm(CustomForm): + class Meta: + model = models.SiteInvite + exclude = ["code", "user", "times_used", "invitees"] + widgets = { + "expiry": ExpiryWidget( + choices=[ + ("day", _("One Day")), + ("week", _("One Week")), + ("month", _("One Month")), + ("forever", _("Does Not Expire")), + ] + ), + "use_limit": widgets.Select( + choices=[(i, _(f"{i} uses")) for i in [1, 5, 10, 25, 50, 100]] + + [(None, _("Unlimited"))] + ), + } + + +class SiteForm(CustomForm): + class Meta: + model = models.SiteSettings + exclude = ["admin_code", "install_mode"] + widgets = { + "instance_short_description": forms.TextInput( + attrs={"aria-describedby": "desc_instance_short_description"} + ), + "require_confirm_email": forms.CheckboxInput( + attrs={"aria-describedby": "desc_require_confirm_email"} + ), + "invite_request_text": forms.Textarea( + attrs={"aria-describedby": "desc_invite_request_text"} + ), + } + + +class ThemeForm(CustomForm): + class Meta: + model = models.Theme + fields = ["name", "path"] + widgets = { + "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), + "path": forms.TextInput( + attrs={ + "aria-describedby": "desc_path", + "placeholder": "css/themes/theme-name.scss", + } + ), + } + + +class AnnouncementForm(CustomForm): + class Meta: + model = models.Announcement + exclude = ["remote_id"] + widgets = { + "preview": forms.TextInput(attrs={"aria-describedby": "desc_preview"}), + "content": forms.Textarea(attrs={"aria-describedby": "desc_content"}), + "event_date": forms.SelectDateWidget( + attrs={"aria-describedby": "desc_event_date"} + ), + "start_date": forms.SelectDateWidget( + attrs={"aria-describedby": "desc_start_date"} + ), + "end_date": forms.SelectDateWidget( + attrs={"aria-describedby": "desc_end_date"} + ), + "active": forms.CheckboxInput(attrs={"aria-describedby": "desc_active"}), + } + + +class EmailBlocklistForm(CustomForm): + class Meta: + model = models.EmailBlocklist + fields = ["domain"] + widgets = { + "avatar": forms.TextInput(attrs={"aria-describedby": "desc_domain"}), + } + + +class IPBlocklistForm(CustomForm): + class Meta: + model = models.IPBlocklist + fields = ["address"] + + +class ServerForm(CustomForm): + class Meta: + model = models.FederatedServer + exclude = ["remote_id"] + + +class AutoModRuleForm(CustomForm): + class Meta: + model = models.AutoMod + fields = ["string_match", "flag_users", "flag_statuses", "created_by"] diff --git a/bookwyrm/forms/author.py b/bookwyrm/forms/author.py new file mode 100644 index 000000000..ca59426de --- /dev/null +++ b/bookwyrm/forms/author.py @@ -0,0 +1,47 @@ +""" using django model forms """ +from django import forms + +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class AuthorForm(CustomForm): + class Meta: + model = models.Author + fields = [ + "last_edited_by", + "name", + "aliases", + "bio", + "wikipedia_link", + "born", + "died", + "openlibrary_key", + "inventaire_id", + "librarything_key", + "goodreads_key", + "isni", + ] + widgets = { + "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), + "aliases": forms.TextInput(attrs={"aria-describedby": "desc_aliases"}), + "bio": forms.Textarea(attrs={"aria-describedby": "desc_bio"}), + "wikipedia_link": forms.TextInput( + attrs={"aria-describedby": "desc_wikipedia_link"} + ), + "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}), + "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}), + "oepnlibrary_key": forms.TextInput( + attrs={"aria-describedby": "desc_oepnlibrary_key"} + ), + "inventaire_id": forms.TextInput( + attrs={"aria-describedby": "desc_inventaire_id"} + ), + "librarything_key": forms.TextInput( + attrs={"aria-describedby": "desc_librarything_key"} + ), + "goodreads_key": forms.TextInput( + attrs={"aria-describedby": "desc_goodreads_key"} + ), + } diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py new file mode 100644 index 000000000..64b85d0b2 --- /dev/null +++ b/bookwyrm/forms/books.py @@ -0,0 +1,81 @@ +""" using django model forms """ +from django import forms + +from bookwyrm import models +from bookwyrm.models.fields import ClearableFileInputWithWarning +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class CoverForm(CustomForm): + class Meta: + model = models.Book + fields = ["cover"] + help_texts = {f: None for f in fields} + + +class EditionForm(CustomForm): + class Meta: + model = models.Edition + exclude = [ + "remote_id", + "origin_id", + "created_date", + "updated_date", + "edition_rank", + "authors", + "parent_work", + "shelves", + "connector", + "search_vector", + "links", + "file_links", + ] + widgets = { + "title": forms.TextInput(attrs={"aria-describedby": "desc_title"}), + "subtitle": forms.TextInput(attrs={"aria-describedby": "desc_subtitle"}), + "description": forms.Textarea( + attrs={"aria-describedby": "desc_description"} + ), + "series": forms.TextInput(attrs={"aria-describedby": "desc_series"}), + "series_number": forms.TextInput( + attrs={"aria-describedby": "desc_series_number"} + ), + "languages": forms.TextInput( + attrs={"aria-describedby": "desc_languages_help desc_languages"} + ), + "subjects": forms.TextInput( + attrs={"aria-describedby": "desc_subjects_help desc_subjects"} + ), + "publishers": forms.TextInput( + attrs={"aria-describedby": "desc_publishers_help desc_publishers"} + ), + "first_published_date": forms.SelectDateWidget( + attrs={"aria-describedby": "desc_first_published_date"} + ), + "published_date": forms.SelectDateWidget( + attrs={"aria-describedby": "desc_published_date"} + ), + "cover": ClearableFileInputWithWarning( + attrs={"aria-describedby": "desc_cover"} + ), + "physical_format": forms.Select( + attrs={"aria-describedby": "desc_physical_format"} + ), + "physical_format_detail": forms.TextInput( + attrs={"aria-describedby": "desc_physical_format_detail"} + ), + "pages": forms.NumberInput(attrs={"aria-describedby": "desc_pages"}), + "isbn_13": forms.TextInput(attrs={"aria-describedby": "desc_isbn_13"}), + "isbn_10": forms.TextInput(attrs={"aria-describedby": "desc_isbn_10"}), + "openlibrary_key": forms.TextInput( + attrs={"aria-describedby": "desc_openlibrary_key"} + ), + "inventaire_id": forms.TextInput( + attrs={"aria-describedby": "desc_inventaire_id"} + ), + "oclc_number": forms.TextInput( + attrs={"aria-describedby": "desc_oclc_number"} + ), + "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}), + } diff --git a/bookwyrm/forms/custom_form.py b/bookwyrm/forms/custom_form.py new file mode 100644 index 000000000..74a3417a2 --- /dev/null +++ b/bookwyrm/forms/custom_form.py @@ -0,0 +1,26 @@ +""" Overrides django's default form class """ +from collections import defaultdict +from django.forms import ModelForm +from django.forms.widgets import Textarea + + +class CustomForm(ModelForm): + """add css classes to the forms""" + + def __init__(self, *args, **kwargs): + css_classes = defaultdict(lambda: "") + css_classes["text"] = "input" + css_classes["password"] = "input" + css_classes["email"] = "input" + css_classes["number"] = "input" + css_classes["checkbox"] = "checkbox" + css_classes["textarea"] = "textarea" + # pylint: disable=super-with-arguments + super(CustomForm, self).__init__(*args, **kwargs) + for visible in self.visible_fields(): + if hasattr(visible.field.widget, "input_type"): + input_type = visible.field.widget.input_type + if isinstance(visible.field.widget, Textarea): + input_type = "textarea" + visible.field.widget.attrs["rows"] = 5 + visible.field.widget.attrs["class"] = css_classes[input_type] diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py new file mode 100644 index 000000000..d609f15dc --- /dev/null +++ b/bookwyrm/forms/edit_user.py @@ -0,0 +1,68 @@ +""" using django model forms """ +from django import forms + +from bookwyrm import models +from bookwyrm.models.fields import ClearableFileInputWithWarning +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class EditUserForm(CustomForm): + class Meta: + model = models.User + fields = [ + "avatar", + "name", + "email", + "summary", + "show_goal", + "show_suggested_users", + "manually_approves_followers", + "default_post_privacy", + "discoverable", + "hide_follows", + "preferred_timezone", + "preferred_language", + "theme", + ] + help_texts = {f: None for f in fields} + widgets = { + "avatar": ClearableFileInputWithWarning( + attrs={"aria-describedby": "desc_avatar"} + ), + "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), + "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}), + "email": forms.EmailInput(attrs={"aria-describedby": "desc_email"}), + "discoverable": forms.CheckboxInput( + attrs={"aria-describedby": "desc_discoverable"} + ), + } + + +class LimitedEditUserForm(CustomForm): + class Meta: + model = models.User + fields = [ + "avatar", + "name", + "summary", + "manually_approves_followers", + "discoverable", + ] + help_texts = {f: None for f in fields} + widgets = { + "avatar": ClearableFileInputWithWarning( + attrs={"aria-describedby": "desc_avatar"} + ), + "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), + "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}), + "discoverable": forms.CheckboxInput( + attrs={"aria-describedby": "desc_discoverable"} + ), + } + + +class DeleteUserForm(CustomForm): + class Meta: + model = models.User + fields = ["password"] diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py index ff35a9486..8af8fb812 100644 --- a/bookwyrm/forms/forms.py +++ b/bookwyrm/forms/forms.py @@ -1,212 +1,14 @@ """ using django model forms """ -import datetime -from collections import defaultdict -from urllib.parse import urlparse - from django import forms -from django.forms import ModelForm, PasswordInput, widgets, ChoiceField -from django.forms.widgets import Textarea -from django.utils import timezone +from django.forms import widgets from django.utils.translation import gettext_lazy as _ from bookwyrm import models -from bookwyrm.models.fields import ClearableFileInputWithWarning from bookwyrm.models.user import FeedFilterChoices - - -class CustomForm(ModelForm): - """add css classes to the forms""" - - def __init__(self, *args, **kwargs): - css_classes = defaultdict(lambda: "") - css_classes["text"] = "input" - css_classes["password"] = "input" - css_classes["email"] = "input" - css_classes["number"] = "input" - css_classes["checkbox"] = "checkbox" - css_classes["textarea"] = "textarea" - # pylint: disable=super-with-arguments - super(CustomForm, self).__init__(*args, **kwargs) - for visible in self.visible_fields(): - if hasattr(visible.field.widget, "input_type"): - input_type = visible.field.widget.input_type - if isinstance(visible.field.widget, Textarea): - input_type = "textarea" - visible.field.widget.attrs["rows"] = 5 - visible.field.widget.attrs["class"] = css_classes[input_type] +from .custom_form import CustomForm # pylint: disable=missing-class-docstring -class LoginForm(CustomForm): - class Meta: - model = models.User - fields = ["localname", "password"] - help_texts = {f: None for f in fields} - widgets = { - "password": PasswordInput(), - } - - -class RegisterForm(CustomForm): - class Meta: - model = models.User - fields = ["localname", "email", "password"] - help_texts = {f: None for f in fields} - widgets = {"password": PasswordInput()} - - def clean(self): - """Check if the username is taken""" - cleaned_data = super().clean() - localname = cleaned_data.get("localname").strip() - if models.User.objects.filter(localname=localname).first(): - self.add_error("localname", _("User with this username already exists")) - - -class RatingForm(CustomForm): - class Meta: - model = models.ReviewRating - fields = ["user", "book", "rating", "privacy"] - - -class ReviewForm(CustomForm): - class Meta: - model = models.Review - fields = [ - "user", - "book", - "name", - "content", - "rating", - "content_warning", - "sensitive", - "privacy", - ] - - -class CommentForm(CustomForm): - class Meta: - model = models.Comment - fields = [ - "user", - "book", - "content", - "content_warning", - "sensitive", - "privacy", - "progress", - "progress_mode", - "reading_status", - ] - - -class QuotationForm(CustomForm): - class Meta: - model = models.Quotation - fields = [ - "user", - "book", - "quote", - "content", - "content_warning", - "sensitive", - "privacy", - "position", - "position_mode", - ] - - -class ReplyForm(CustomForm): - class Meta: - model = models.Status - fields = [ - "user", - "content", - "content_warning", - "sensitive", - "reply_parent", - "privacy", - ] - - -class StatusForm(CustomForm): - class Meta: - model = models.Status - fields = ["user", "content", "content_warning", "sensitive", "privacy"] - - -class DirectForm(CustomForm): - class Meta: - model = models.Status - fields = ["user", "content", "content_warning", "sensitive", "privacy"] - - -class EditUserForm(CustomForm): - class Meta: - model = models.User - fields = [ - "avatar", - "name", - "email", - "summary", - "show_goal", - "show_suggested_users", - "manually_approves_followers", - "default_post_privacy", - "discoverable", - "hide_follows", - "preferred_timezone", - "preferred_language", - "theme", - ] - help_texts = {f: None for f in fields} - widgets = { - "avatar": ClearableFileInputWithWarning( - attrs={"aria-describedby": "desc_avatar"} - ), - "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), - "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}), - "email": forms.EmailInput(attrs={"aria-describedby": "desc_email"}), - "discoverable": forms.CheckboxInput( - attrs={"aria-describedby": "desc_discoverable"} - ), - } - - -class LimitedEditUserForm(CustomForm): - class Meta: - model = models.User - fields = [ - "avatar", - "name", - "summary", - "manually_approves_followers", - "discoverable", - ] - help_texts = {f: None for f in fields} - widgets = { - "avatar": ClearableFileInputWithWarning( - attrs={"aria-describedby": "desc_avatar"} - ), - "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), - "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}), - "discoverable": forms.CheckboxInput( - attrs={"aria-describedby": "desc_discoverable"} - ), - } - - -class DeleteUserForm(CustomForm): - class Meta: - model = models.User - fields = ["password"] - - -class UserGroupForm(CustomForm): - class Meta: - model = models.User - fields = ["groups"] - - class FeedStatusTypesForm(CustomForm): class Meta: model = models.User @@ -219,217 +21,10 @@ class FeedStatusTypesForm(CustomForm): } -class CoverForm(CustomForm): - class Meta: - model = models.Book - fields = ["cover"] - help_texts = {f: None for f in fields} - - -class LinkDomainForm(CustomForm): - class Meta: - model = models.LinkDomain - fields = ["name"] - - -class FileLinkForm(CustomForm): - class Meta: - model = models.FileLink - fields = ["url", "filetype", "availability", "book", "added_by"] - - def clean(self): - """make sure the domain isn't blocked or pending""" - cleaned_data = super().clean() - url = cleaned_data.get("url") - filetype = cleaned_data.get("filetype") - book = cleaned_data.get("book") - domain = urlparse(url).netloc - if models.LinkDomain.objects.filter(domain=domain).exists(): - status = models.LinkDomain.objects.get(domain=domain).status - if status == "blocked": - # pylint: disable=line-too-long - self.add_error( - "url", - _( - "This domain is blocked. Please contact your administrator if you think this is an error." - ), - ) - elif models.FileLink.objects.filter( - url=url, book=book, filetype=filetype - ).exists(): - # pylint: disable=line-too-long - self.add_error( - "url", - _( - "This link with file type has already been added for this book. If it is not visible, the domain is still pending." - ), - ) - - -class EditionForm(CustomForm): - class Meta: - model = models.Edition - exclude = [ - "remote_id", - "origin_id", - "created_date", - "updated_date", - "edition_rank", - "authors", - "parent_work", - "shelves", - "connector", - "search_vector", - "links", - "file_links", - ] - widgets = { - "title": forms.TextInput(attrs={"aria-describedby": "desc_title"}), - "subtitle": forms.TextInput(attrs={"aria-describedby": "desc_subtitle"}), - "description": forms.Textarea( - attrs={"aria-describedby": "desc_description"} - ), - "series": forms.TextInput(attrs={"aria-describedby": "desc_series"}), - "series_number": forms.TextInput( - attrs={"aria-describedby": "desc_series_number"} - ), - "languages": forms.TextInput( - attrs={"aria-describedby": "desc_languages_help desc_languages"} - ), - "subjects": forms.TextInput( - attrs={"aria-describedby": "desc_subjects_help desc_subjects"} - ), - "publishers": forms.TextInput( - attrs={"aria-describedby": "desc_publishers_help desc_publishers"} - ), - "first_published_date": forms.SelectDateWidget( - attrs={"aria-describedby": "desc_first_published_date"} - ), - "published_date": forms.SelectDateWidget( - attrs={"aria-describedby": "desc_published_date"} - ), - "cover": ClearableFileInputWithWarning( - attrs={"aria-describedby": "desc_cover"} - ), - "physical_format": forms.Select( - attrs={"aria-describedby": "desc_physical_format"} - ), - "physical_format_detail": forms.TextInput( - attrs={"aria-describedby": "desc_physical_format_detail"} - ), - "pages": forms.NumberInput(attrs={"aria-describedby": "desc_pages"}), - "isbn_13": forms.TextInput(attrs={"aria-describedby": "desc_isbn_13"}), - "isbn_10": forms.TextInput(attrs={"aria-describedby": "desc_isbn_10"}), - "openlibrary_key": forms.TextInput( - attrs={"aria-describedby": "desc_openlibrary_key"} - ), - "inventaire_id": forms.TextInput( - attrs={"aria-describedby": "desc_inventaire_id"} - ), - "oclc_number": forms.TextInput( - attrs={"aria-describedby": "desc_oclc_number"} - ), - "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}), - } - - -class AuthorForm(CustomForm): - class Meta: - model = models.Author - fields = [ - "last_edited_by", - "name", - "aliases", - "bio", - "wikipedia_link", - "born", - "died", - "openlibrary_key", - "inventaire_id", - "librarything_key", - "goodreads_key", - "isni", - ] - widgets = { - "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), - "aliases": forms.TextInput(attrs={"aria-describedby": "desc_aliases"}), - "bio": forms.Textarea(attrs={"aria-describedby": "desc_bio"}), - "wikipedia_link": forms.TextInput( - attrs={"aria-describedby": "desc_wikipedia_link"} - ), - "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}), - "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}), - "oepnlibrary_key": forms.TextInput( - attrs={"aria-describedby": "desc_oepnlibrary_key"} - ), - "inventaire_id": forms.TextInput( - attrs={"aria-describedby": "desc_inventaire_id"} - ), - "librarything_key": forms.TextInput( - attrs={"aria-describedby": "desc_librarything_key"} - ), - "goodreads_key": forms.TextInput( - attrs={"aria-describedby": "desc_goodreads_key"} - ), - } - - class ImportForm(forms.Form): csv_file = forms.FileField() -class ExpiryWidget(widgets.Select): - def value_from_datadict(self, data, files, name): - """human-readable exiration time buckets""" - selected_string = super().value_from_datadict(data, files, name) - - if selected_string == "day": - interval = datetime.timedelta(days=1) - elif selected_string == "week": - interval = datetime.timedelta(days=7) - elif selected_string == "month": - interval = datetime.timedelta(days=31) # Close enough? - elif selected_string == "forever": - return None - else: - return selected_string # This will raise - - return timezone.now() + interval - - -class InviteRequestForm(CustomForm): - def clean(self): - """make sure the email isn't in use by a registered user""" - cleaned_data = super().clean() - email = cleaned_data.get("email") - if email and models.User.objects.filter(email=email).exists(): - self.add_error("email", _("A user with this email already exists.")) - - class Meta: - model = models.InviteRequest - fields = ["email"] - - -class CreateInviteForm(CustomForm): - class Meta: - model = models.SiteInvite - exclude = ["code", "user", "times_used", "invitees"] - widgets = { - "expiry": ExpiryWidget( - choices=[ - ("day", _("One Day")), - ("week", _("One Week")), - ("month", _("One Month")), - ("forever", _("Does Not Expire")), - ] - ), - "use_limit": widgets.Select( - choices=[(i, _(f"{i} uses")) for i in [1, 5, 10, 25, 50, 100]] - + [(None, _("Unlimited"))] - ), - } - - class ShelfForm(CustomForm): class Meta: model = models.Shelf @@ -442,126 +37,12 @@ class GoalForm(CustomForm): fields = ["user", "year", "goal", "privacy"] -class SiteForm(CustomForm): - class Meta: - model = models.SiteSettings - exclude = ["admin_code", "install_mode"] - widgets = { - "instance_short_description": forms.TextInput( - attrs={"aria-describedby": "desc_instance_short_description"} - ), - "require_confirm_email": forms.CheckboxInput( - attrs={"aria-describedby": "desc_require_confirm_email"} - ), - "invite_request_text": forms.Textarea( - attrs={"aria-describedby": "desc_invite_request_text"} - ), - } - - -class SiteThemeForm(CustomForm): - class Meta: - model = models.SiteSettings - fields = ["default_theme"] - - -class ThemeForm(CustomForm): - class Meta: - model = models.Theme - fields = ["name", "path"] - widgets = { - "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), - "path": forms.TextInput( - attrs={ - "aria-describedby": "desc_path", - "placeholder": "css/themes/theme-name.scss", - } - ), - } - - -class AnnouncementForm(CustomForm): - class Meta: - model = models.Announcement - exclude = ["remote_id"] - widgets = { - "preview": forms.TextInput(attrs={"aria-describedby": "desc_preview"}), - "content": forms.Textarea(attrs={"aria-describedby": "desc_content"}), - "event_date": forms.SelectDateWidget( - attrs={"aria-describedby": "desc_event_date"} - ), - "start_date": forms.SelectDateWidget( - attrs={"aria-describedby": "desc_start_date"} - ), - "end_date": forms.SelectDateWidget( - attrs={"aria-describedby": "desc_end_date"} - ), - "active": forms.CheckboxInput(attrs={"aria-describedby": "desc_active"}), - } - - -class ListForm(CustomForm): - class Meta: - model = models.List - fields = ["user", "name", "description", "curation", "privacy", "group"] - - -class ListItemForm(CustomForm): - class Meta: - model = models.ListItem - fields = ["user", "book", "book_list", "notes"] - - -class GroupForm(CustomForm): - class Meta: - model = models.Group - fields = ["user", "privacy", "name", "description"] - - class ReportForm(CustomForm): class Meta: model = models.Report fields = ["user", "reporter", "status", "links", "note"] -class EmailBlocklistForm(CustomForm): - class Meta: - model = models.EmailBlocklist - fields = ["domain"] - widgets = { - "avatar": forms.TextInput(attrs={"aria-describedby": "desc_domain"}), - } - - -class IPBlocklistForm(CustomForm): - class Meta: - model = models.IPBlocklist - fields = ["address"] - - -class ServerForm(CustomForm): - class Meta: - model = models.FederatedServer - exclude = ["remote_id"] - - -class SortListForm(forms.Form): - sort_by = ChoiceField( - choices=( - ("order", _("List Order")), - ("title", _("Book Title")), - ("rating", _("Rating")), - ), - label=_("Sort By"), - ) - direction = ChoiceField( - choices=( - ("ascending", _("Ascending")), - ("descending", _("Descending")), - ), - ) - - class ReadThroughForm(CustomForm): def clean(self): """make sure the email isn't in use by a registered user""" @@ -576,9 +57,3 @@ class ReadThroughForm(CustomForm): class Meta: model = models.ReadThrough fields = ["user", "book", "start_date", "finish_date"] - - -class AutoModRuleForm(CustomForm): - class Meta: - model = models.AutoMod - fields = ["string_match", "flag_users", "flag_statuses", "created_by"] diff --git a/bookwyrm/forms/groups.py b/bookwyrm/forms/groups.py new file mode 100644 index 000000000..15b27c0ae --- /dev/null +++ b/bookwyrm/forms/groups.py @@ -0,0 +1,16 @@ +""" using django model forms """ +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class UserGroupForm(CustomForm): + class Meta: + model = models.User + fields = ["groups"] + + +class GroupForm(CustomForm): + class Meta: + model = models.Group + fields = ["user", "privacy", "name", "description"] diff --git a/bookwyrm/forms/landing.py b/bookwyrm/forms/landing.py new file mode 100644 index 000000000..61b92ee83 --- /dev/null +++ b/bookwyrm/forms/landing.py @@ -0,0 +1,45 @@ +""" Forms for the landing pages """ +from django.forms import PasswordInput +from django.utils.translation import gettext_lazy as _ + +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class LoginForm(CustomForm): + class Meta: + model = models.User + fields = ["localname", "password"] + help_texts = {f: None for f in fields} + widgets = { + "password": PasswordInput(), + } + + +class RegisterForm(CustomForm): + class Meta: + model = models.User + fields = ["localname", "email", "password"] + help_texts = {f: None for f in fields} + widgets = {"password": PasswordInput()} + + def clean(self): + """Check if the username is taken""" + cleaned_data = super().clean() + localname = cleaned_data.get("localname").strip() + if models.User.objects.filter(localname=localname).first(): + self.add_error("localname", _("User with this username already exists")) + + +class InviteRequestForm(CustomForm): + def clean(self): + """make sure the email isn't in use by a registered user""" + cleaned_data = super().clean() + email = cleaned_data.get("email") + if email and models.User.objects.filter(email=email).exists(): + self.add_error("email", _("A user with this email already exists.")) + + class Meta: + model = models.InviteRequest + fields = ["email"] diff --git a/bookwyrm/forms/links.py b/bookwyrm/forms/links.py new file mode 100644 index 000000000..de229bc2d --- /dev/null +++ b/bookwyrm/forms/links.py @@ -0,0 +1,48 @@ +""" using django model forms """ +from urllib.parse import urlparse + +from django.utils.translation import gettext_lazy as _ + +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class LinkDomainForm(CustomForm): + class Meta: + model = models.LinkDomain + fields = ["name"] + + +class FileLinkForm(CustomForm): + class Meta: + model = models.FileLink + fields = ["url", "filetype", "availability", "book", "added_by"] + + def clean(self): + """make sure the domain isn't blocked or pending""" + cleaned_data = super().clean() + url = cleaned_data.get("url") + filetype = cleaned_data.get("filetype") + book = cleaned_data.get("book") + domain = urlparse(url).netloc + if models.LinkDomain.objects.filter(domain=domain).exists(): + status = models.LinkDomain.objects.get(domain=domain).status + if status == "blocked": + # pylint: disable=line-too-long + self.add_error( + "url", + _( + "This domain is blocked. Please contact your administrator if you think this is an error." + ), + ) + elif models.FileLink.objects.filter( + url=url, book=book, filetype=filetype + ).exists(): + # pylint: disable=line-too-long + self.add_error( + "url", + _( + "This link with file type has already been added for this book. If it is not visible, the domain is still pending." + ), + ) diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py new file mode 100644 index 000000000..647db3bfe --- /dev/null +++ b/bookwyrm/forms/lists.py @@ -0,0 +1,37 @@ +""" using django model forms """ +from django import forms +from django.forms import ChoiceField +from django.utils.translation import gettext_lazy as _ + +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class ListForm(CustomForm): + class Meta: + model = models.List + fields = ["user", "name", "description", "curation", "privacy", "group"] + + +class ListItemForm(CustomForm): + class Meta: + model = models.ListItem + fields = ["user", "book", "book_list", "notes"] + + +class SortListForm(forms.Form): + sort_by = ChoiceField( + choices=( + ("order", _("List Order")), + ("title", _("Book Title")), + ("rating", _("Rating")), + ), + label=_("Sort By"), + ) + direction = ChoiceField( + choices=( + ("ascending", _("Ascending")), + ("descending", _("Descending")), + ), + ) diff --git a/bookwyrm/forms/status.py b/bookwyrm/forms/status.py new file mode 100644 index 000000000..0800166bf --- /dev/null +++ b/bookwyrm/forms/status.py @@ -0,0 +1,82 @@ +""" using django model forms """ +from bookwyrm import models +from .custom_form import CustomForm + + +# pylint: disable=missing-class-docstring +class RatingForm(CustomForm): + class Meta: + model = models.ReviewRating + fields = ["user", "book", "rating", "privacy"] + + +class ReviewForm(CustomForm): + class Meta: + model = models.Review + fields = [ + "user", + "book", + "name", + "content", + "rating", + "content_warning", + "sensitive", + "privacy", + ] + + +class CommentForm(CustomForm): + class Meta: + model = models.Comment + fields = [ + "user", + "book", + "content", + "content_warning", + "sensitive", + "privacy", + "progress", + "progress_mode", + "reading_status", + ] + + +class QuotationForm(CustomForm): + class Meta: + model = models.Quotation + fields = [ + "user", + "book", + "quote", + "content", + "content_warning", + "sensitive", + "privacy", + "position", + "position_mode", + ] + + +class ReplyForm(CustomForm): + class Meta: + model = models.Status + fields = [ + "user", + "content", + "content_warning", + "sensitive", + "reply_parent", + "privacy", + ] + + +class StatusForm(CustomForm): + class Meta: + model = models.Status + fields = ["user", "content", "content_warning", "sensitive", "privacy"] + + +class DirectForm(CustomForm): + class Meta: + model = models.Status + fields = ["user", "content", "content_warning", "sensitive", "privacy"] From 19202e2cd77fddb0cd267e911d713e3562ba4617 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 12:12:51 -0700 Subject: [PATCH 44/49] Fixes name of user forms file --- bookwyrm/forms/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/forms/__init__.py b/bookwyrm/forms/__init__.py index a6f704339..075752936 100644 --- a/bookwyrm/forms/__init__.py +++ b/bookwyrm/forms/__init__.py @@ -3,10 +3,10 @@ from .admin import * from .author import * from .books import * +from .edit_user import * from .forms import * from .groups import * from .landing import * from .links import * from .lists import * from .status import * -from .user import * From 486f70c7fbd9147ca1ed4a58cee162676b7a5404 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 12:31:29 -0700 Subject: [PATCH 45/49] Adds scanner translation strings --- locale/de_DE/LC_MESSAGES/django.po | 122 +++++----- locale/en_US/LC_MESSAGES/django.po | 348 +++++++++++++++------------ locale/es_ES/LC_MESSAGES/django.mo | Bin 83719 -> 83594 bytes locale/es_ES/LC_MESSAGES/django.po | 130 +++++----- locale/fr_FR/LC_MESSAGES/django.po | 128 +++++----- locale/gl_ES/LC_MESSAGES/django.mo | Bin 89448 -> 89154 bytes locale/gl_ES/LC_MESSAGES/django.po | 126 +++++----- locale/it_IT/LC_MESSAGES/django.mo | Bin 90758 -> 90522 bytes locale/it_IT/LC_MESSAGES/django.po | 126 +++++----- locale/lt_LT/LC_MESSAGES/django.mo | Bin 84886 -> 84689 bytes locale/lt_LT/LC_MESSAGES/django.po | 122 +++++----- locale/no_NO/LC_MESSAGES/django.mo | Bin 79871 -> 79689 bytes locale/no_NO/LC_MESSAGES/django.po | 122 +++++----- locale/pt_BR/LC_MESSAGES/django.mo | Bin 90058 -> 89997 bytes locale/pt_BR/LC_MESSAGES/django.po | 124 +++++----- locale/pt_PT/LC_MESSAGES/django.mo | Bin 72909 -> 72742 bytes locale/pt_PT/LC_MESSAGES/django.po | 124 +++++----- locale/sv_SE/LC_MESSAGES/django.mo | Bin 87935 -> 87729 bytes locale/sv_SE/LC_MESSAGES/django.po | 122 +++++----- locale/zh_Hans/LC_MESSAGES/django.po | 126 +++++----- locale/zh_Hant/LC_MESSAGES/django.po | 122 +++++----- 21 files changed, 909 insertions(+), 933 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index f7ed0969d..31e44a7b9 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:52\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Follower*innen" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Zitate" msgid "Everything else" msgstr "Alles andere" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Start-Zeitleiste" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Startseite" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Bücher-Zeitleiste" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Bücher" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Englisch)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (Spanisch)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Galizisch)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (Italienisch)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Französisch)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisch)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegisch)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianisches Portugiesisch)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugiesisch)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Schwedisch)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (vereinfachtes Chinesisch)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinesisch, traditionell)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Speichern" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Abbrechen" @@ -770,9 +770,9 @@ msgstr "Abbrechen" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Das Laden von Daten wird eine Verbindung zu %(source_name)s aufbauen und überprüfen, ob Autor*in-Informationen vorliegen, die hier noch nicht bekannt sind. Bestehende Informationen werden nicht überschrieben." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Zur Liste hinzufügen" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Aktionen" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Spam melden" @@ -1216,7 +1216,7 @@ msgstr "BookWyrm verlassen" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Dieser Link führt zu: %(link_url)s.
    Möchtest du dorthin wechseln?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Weiter" @@ -1292,7 +1292,7 @@ msgstr "Bestätigungscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Absenden" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Keine Benutzer*innen für „%(query)s“ gefunden" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Gruppe erstellen" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "Diese Gruppe löschen?" msgid "This action cannot be un-done" msgstr "Diese Aktion kann nicht rückgängig gemacht werden" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "\"%(title)s\" zu dieser Liste hinzufügen" msgid "Suggest \"%(title)s\" for this list" msgstr "\"%(title)s\" für diese Liste vorschlagen" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Vorschlagen" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Listenposition" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Übernehmen" @@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4200,7 +4201,8 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Regal erstellen" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4216,10 +4218,6 @@ msgstr "Benutzer*inprofil" msgid "All books" msgstr "Alle Bücher" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Regal erstellen" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Antworten" msgid "Content" msgstr "Inhalt" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Inhaltswarnung:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Spoileralarm!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Spoileralarm aktivieren" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Spoileralarm!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Kommentar:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Veröffentlichen" @@ -4851,10 +4849,6 @@ msgstr "Deine Gruppen" msgid "Groups: %(username)s" msgstr "Gruppen: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Gruppe erstellen" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Benutzer*inprofil" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 76cfb32bd..c5d3ad3fa 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"POT-Creation-Date: 2022-03-14 19:30+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,77 +18,77 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:62 -msgid "User with this username already exists" -msgstr "" - -#: bookwyrm/forms.py:254 -msgid "This domain is blocked. Please contact your administrator if you think this is an error." -msgstr "" - -#: bookwyrm/forms.py:264 -msgid "This link with file type has already been added for this book. If it is not visible, the domain is still pending." -msgstr "" - -#: bookwyrm/forms.py:403 -msgid "A user with this email already exists." -msgstr "" - -#: bookwyrm/forms.py:417 +#: bookwyrm/forms/admin.py:40 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:418 +#: bookwyrm/forms/admin.py:41 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:419 +#: bookwyrm/forms/admin.py:42 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:420 +#: bookwyrm/forms/admin.py:43 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:424 +#: bookwyrm/forms/admin.py:47 #, python-brace-format msgid "{i} uses" msgstr "" -#: bookwyrm/forms.py:425 +#: bookwyrm/forms/admin.py:48 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:543 +#: bookwyrm/forms/forms.py:54 +msgid "Reading finish date cannot be before start date." +msgstr "" + +#: bookwyrm/forms/landing.py:32 +msgid "User with this username already exists" +msgstr "" + +#: bookwyrm/forms/landing.py:41 +msgid "A user with this email already exists." +msgstr "" + +#: bookwyrm/forms/links.py:36 +msgid "This domain is blocked. Please contact your administrator if you think this is an error." +msgstr "" + +#: bookwyrm/forms/links.py:46 +msgid "This link with file type has already been added for this book. If it is not visible, the domain is still pending." +msgstr "" + +#: bookwyrm/forms/lists.py:26 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:544 +#: bookwyrm/forms/lists.py:27 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:545 bookwyrm/templates/shelf/shelf.html:155 +#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:155 #: bookwyrm/templates/shelf/shelf.html:187 #: bookwyrm/templates/snippets/create_status/review.html:32 msgid "Rating" msgstr "" -#: bookwyrm/forms.py:547 bookwyrm/templates/lists/list.html:185 +#: bookwyrm/forms/lists.py:30 bookwyrm/templates/lists/list.html:185 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:551 +#: bookwyrm/forms/lists.py:34 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:552 +#: bookwyrm/forms/lists.py:35 msgid "Descending" msgstr "" -#: bookwyrm/forms.py:565 -msgid "Reading finish date cannot be before start date." -msgstr "" - #: bookwyrm/importers/importer.py:145 bookwyrm/importers/importer.py:167 msgid "Error loading book" msgstr "" @@ -188,7 +188,7 @@ msgstr "" msgid "%(value)s is not a valid username" msgstr "" -#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:171 +#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:179 #: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "" @@ -246,7 +246,7 @@ msgstr "" msgid "Approved" msgstr "" -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:272 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:281 msgid "Reviews" msgstr "" @@ -400,7 +400,7 @@ msgstr "" msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132 +#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:140 msgid "Admin" msgstr "" @@ -431,7 +431,7 @@ msgid "Software version:" msgstr "" #: bookwyrm/templates/about/layout.html:30 -#: bookwyrm/templates/embed-layout.html:34 bookwyrm/templates/layout.html:230 +#: bookwyrm/templates/embed-layout.html:34 bookwyrm/templates/layout.html:238 #, python-format msgid "About %(site_name)s" msgstr "" @@ -534,7 +534,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:155 #: bookwyrm/templates/annual_summary/layout.html:176 #: bookwyrm/templates/annual_summary/layout.html:245 -#: bookwyrm/templates/book/book.html:47 +#: bookwyrm/templates/book/book.html:56 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -619,18 +619,18 @@ msgstr "" #: bookwyrm/templates/author/author.html:83 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:122 +#: bookwyrm/templates/book/book.html:131 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:87 -#: bookwyrm/templates/book/book.html:126 +#: bookwyrm/templates/book/book.html:135 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:102 -#: bookwyrm/templates/book/book.html:140 +#: bookwyrm/templates/book/book.html:149 msgid "View on Inventaire" msgstr "" @@ -667,7 +667,7 @@ msgid "Last edited by:" msgstr "" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:16 +#: bookwyrm/templates/book/edit/edit_book_form.html:17 msgid "Metadata" msgstr "" @@ -679,8 +679,9 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:75 -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 +#: bookwyrm/templates/book/edit/edit_book_form.html:88 +#: bookwyrm/templates/book/edit/edit_book_form.html:107 msgid "Separate multiple values with commas." msgstr "" @@ -709,7 +710,7 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:84 -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:278 msgid "Inventaire ID:" msgstr "" @@ -726,7 +727,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:115 -#: bookwyrm/templates/book/book.html:193 +#: bookwyrm/templates/book/book.html:202 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 @@ -748,7 +749,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:194 +#: bookwyrm/templates/book/book.html:203 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -760,6 +761,7 @@ msgstr "" #: bookwyrm/templates/lists/delete_list_modal.html:16 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 +#: bookwyrm/templates/search/barcode_modal.html:45 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 @@ -780,87 +782,91 @@ msgstr "" msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 +#: bookwyrm/templates/book/book.html:19 +msgid "Unable to connect to remote source." +msgstr "" + +#: bookwyrm/templates/book/book.html:64 bookwyrm/templates/book/book.html:65 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:79 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:88 bookwyrm/templates/book/book.html:91 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:88 +#: bookwyrm/templates/book/book.html:97 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:99 +#: bookwyrm/templates/book/book.html:108 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:170 +#: bookwyrm/templates/book/book.html:179 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:182 +#: bookwyrm/templates/book/book.html:191 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:189 -#: bookwyrm/templates/book/edit/edit_book_form.html:39 +#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/edit/edit_book_form.html:40 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:203 +#: bookwyrm/templates/book/book.html:212 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book/book.html:211 +#: bookwyrm/templates/book/book.html:220 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:226 +#: bookwyrm/templates/book/book.html:235 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:237 +#: bookwyrm/templates/book/book.html:246 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:243 +#: bookwyrm/templates/book/book.html:252 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:251 +#: bookwyrm/templates/book/book.html:260 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:277 +#: bookwyrm/templates/book/book.html:286 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:289 +#: bookwyrm/templates/book/book.html:298 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:325 +#: bookwyrm/templates/book/book.html:334 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:337 +#: bookwyrm/templates/book/book.html:346 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:348 -#: bookwyrm/templates/groups/group.html:19 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:357 +#: bookwyrm/templates/groups/group.html:19 bookwyrm/templates/layout.html:83 #: bookwyrm/templates/lists/curate.html:8 bookwyrm/templates/lists/list.html:12 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 @@ -869,11 +875,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:369 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:370 +#: bookwyrm/templates/book/book.html:379 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -887,12 +893,12 @@ msgid "ISBN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:274 +#: bookwyrm/templates/book/edit/edit_book_form.html:287 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:283 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "ASIN:" msgstr "" @@ -901,12 +907,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:173 +#: bookwyrm/templates/book/edit/edit_book_form.html:186 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:179 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Load cover from url:" msgstr "" @@ -976,110 +982,114 @@ msgstr "" msgid "Back" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:21 +#: bookwyrm/templates/book/edit/edit_book_form.html:22 #: bookwyrm/templates/snippets/create_status/review.html:15 msgid "Title:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:30 +#: bookwyrm/templates/book/edit/edit_book_form.html:31 msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:50 +#: bookwyrm/templates/book/edit/edit_book_form.html:51 msgid "Series:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:60 +#: bookwyrm/templates/book/edit/edit_book_form.html:61 msgid "Series number:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:71 +#: bookwyrm/templates/book/edit/edit_book_form.html:72 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:85 +#: bookwyrm/templates/book/edit/edit_book_form.html:84 +msgid "Subjects:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:90 +#: bookwyrm/templates/book/edit/edit_book_form.html:103 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:102 +#: bookwyrm/templates/book/edit/edit_book_form.html:115 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:111 +#: bookwyrm/templates/book/edit/edit_book_form.html:124 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:135 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:131 +#: bookwyrm/templates/book/edit/edit_book_form.html:144 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:134 +#: bookwyrm/templates/book/edit/edit_book_form.html:147 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:142 +#: bookwyrm/templates/book/edit/edit_book_form.html:155 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:145 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:158 +#: bookwyrm/templates/book/edit/edit_book_form.html:161 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:146 -#: bookwyrm/templates/book/edit/edit_book_form.html:149 +#: bookwyrm/templates/book/edit/edit_book_form.html:159 +#: bookwyrm/templates/book/edit/edit_book_form.html:162 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:165 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 #: bookwyrm/templates/shelf/shelf.html:146 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:192 +#: bookwyrm/templates/book/edit/edit_book_form.html:205 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:212 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:211 +#: bookwyrm/templates/book/edit/edit_book_form.html:224 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:222 +#: bookwyrm/templates/book/edit/edit_book_form.html:235 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:246 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:238 +#: bookwyrm/templates/book/edit/edit_book_form.html:251 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:247 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:256 +#: bookwyrm/templates/book/edit/edit_book_form.html:269 msgid "Openlibrary ID:" msgstr "" @@ -1168,7 +1178,7 @@ msgstr "" #: bookwyrm/templates/settings/federation/instance_list.html:46 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:44 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:34 +#: bookwyrm/templates/settings/users/user_admin.html:52 #: bookwyrm/templates/settings/users/user_info.html:20 msgid "Status" msgstr "" @@ -1177,7 +1187,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 #: bookwyrm/templates/settings/reports/report_links_table.html:6 -#: bookwyrm/templates/settings/themes.html:118 +#: bookwyrm/templates/settings/themes.html:100 msgid "Actions" msgstr "" @@ -1321,16 +1331,18 @@ msgid "Community" msgstr "" #: bookwyrm/templates/directory/community_filter.html:8 +#: bookwyrm/templates/settings/users/user_admin.html:25 msgid "Local users" msgstr "" #: bookwyrm/templates/directory/community_filter.html:12 +#: bookwyrm/templates/settings/users/user_admin.html:29 msgid "Federated community" msgstr "" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:101 +#: bookwyrm/templates/layout.html:109 msgid "Directory" msgstr "" @@ -1450,7 +1462,7 @@ msgstr "" #: bookwyrm/templates/discover/discover.html:4 #: bookwyrm/templates/discover/discover.html:10 -#: bookwyrm/templates/layout.html:78 +#: bookwyrm/templates/layout.html:86 msgid "Discover" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "%(site_name)s home page" msgstr "" -#: bookwyrm/templates/embed-layout.html:40 bookwyrm/templates/layout.html:234 +#: bookwyrm/templates/embed-layout.html:40 bookwyrm/templates/layout.html:242 msgid "Contact site admin" msgstr "" @@ -1587,7 +1599,7 @@ msgid "Direct Messages with %(username)s" msgstr "" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:111 +#: bookwyrm/templates/layout.html:119 msgid "Direct Messages" msgstr "" @@ -1624,7 +1636,7 @@ msgid "Updates" msgstr "" #: bookwyrm/templates/feed/suggested_books.html:6 -#: bookwyrm/templates/layout.html:106 +#: bookwyrm/templates/layout.html:114 msgid "Your Books" msgstr "" @@ -2176,7 +2188,7 @@ msgid "Login" msgstr "" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:187 #: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "" @@ -2185,7 +2197,7 @@ msgstr "" msgid "Success! Email address confirmed." msgstr "" -#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:178 #: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" @@ -2193,12 +2205,12 @@ msgstr "" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 +#: bookwyrm/templates/layout.html:182 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:45 msgid "Password:" msgstr "" -#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:184 #: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "" @@ -2230,19 +2242,23 @@ msgstr "" msgid "Search for a book, user, or list" msgstr "" -#: bookwyrm/templates/layout.html:64 -msgid "Main navigation menu" +#: bookwyrm/templates/layout.html:61 bookwyrm/templates/layout.html:62 +msgid "Scan Barcode" msgstr "" #: bookwyrm/templates/layout.html:72 +msgid "Main navigation menu" +msgstr "" + +#: bookwyrm/templates/layout.html:80 msgid "Feed" msgstr "" -#: bookwyrm/templates/layout.html:116 bookwyrm/templates/setup/config.html:52 +#: bookwyrm/templates/layout.html:124 bookwyrm/templates/setup/config.html:52 msgid "Settings" msgstr "" -#: bookwyrm/templates/layout.html:125 +#: bookwyrm/templates/layout.html:133 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:15 #: bookwyrm/templates/settings/invites/manage_invites.html:3 #: bookwyrm/templates/settings/invites/manage_invites.html:15 @@ -2250,42 +2266,42 @@ msgstr "" msgid "Invites" msgstr "" -#: bookwyrm/templates/layout.html:139 +#: bookwyrm/templates/layout.html:147 msgid "Log out" msgstr "" -#: bookwyrm/templates/layout.html:147 bookwyrm/templates/layout.html:148 +#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:156 #: bookwyrm/templates/notifications/notifications_page.html:5 #: bookwyrm/templates/notifications/notifications_page.html:10 msgid "Notifications" msgstr "" -#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 +#: bookwyrm/templates/layout.html:183 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "" -#: bookwyrm/templates/layout.html:187 +#: bookwyrm/templates/layout.html:195 msgid "Join" msgstr "" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:229 msgid "Successfully posted status" msgstr "" -#: bookwyrm/templates/layout.html:222 +#: bookwyrm/templates/layout.html:230 msgid "Error posting status" msgstr "" -#: bookwyrm/templates/layout.html:238 +#: bookwyrm/templates/layout.html:246 msgid "Documentation" msgstr "" -#: bookwyrm/templates/layout.html:245 +#: bookwyrm/templates/layout.html:253 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "" -#: bookwyrm/templates/layout.html:249 +#: bookwyrm/templates/layout.html:257 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "" @@ -3013,6 +3029,44 @@ msgstr "" msgid "Report" msgstr "" +#: bookwyrm/templates/search/barcode_modal.html:5 +msgid "" +"\n" +" Scan Barcode\n" +" " +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:23 +msgid "Requesting camera..." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:24 +msgid "Grant access to the camera to scan a book's barcode." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:29 +msgid "Could not access camera" +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:33 +msgctxt "barcode scanner" +msgid "Scanning..." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:34 +msgid "Align your book's barcode with the camera." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:38 +msgctxt "barcode scanner" +msgid "ISBN scanned" +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:39 +msgctxt "followed by ISBN" +msgid "Searching for book:" +msgstr "" + #: bookwyrm/templates/search/book.html:44 msgid "Results from" msgstr "" @@ -3046,8 +3100,9 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:27 #: bookwyrm/templates/settings/federation/instance_list.html:44 #: bookwyrm/templates/settings/layout.html:36 -#: bookwyrm/templates/settings/users/user_admin.html:3 -#: bookwyrm/templates/settings/users/user_admin.html:10 +#: bookwyrm/templates/settings/users/user.html:13 +#: bookwyrm/templates/settings/users/user_admin.html:5 +#: bookwyrm/templates/settings/users/user_admin.html:12 msgid "Users" msgstr "" @@ -3514,6 +3569,7 @@ msgid "Date accepted" msgstr "" #: bookwyrm/templates/settings/invites/manage_invite_requests.html:42 +#: bookwyrm/templates/settings/users/email_filter.html:5 msgid "Email" msgstr "" @@ -3932,7 +3988,7 @@ msgid "Add the file name using the form below to make it available in the applic msgstr "" #: bookwyrm/templates/settings/themes.html:42 -#: bookwyrm/templates/settings/themes.html:101 +#: bookwyrm/templates/settings/themes.html:83 msgid "Add theme" msgstr "" @@ -3940,28 +3996,24 @@ msgstr "" msgid "Unable to save theme" msgstr "" -#: bookwyrm/templates/settings/themes.html:61 -msgid "No available theme files detected" -msgstr "" - -#: bookwyrm/templates/settings/themes.html:69 -#: bookwyrm/templates/settings/themes.html:112 +#: bookwyrm/templates/settings/themes.html:64 +#: bookwyrm/templates/settings/themes.html:94 msgid "Theme name" msgstr "" -#: bookwyrm/templates/settings/themes.html:79 +#: bookwyrm/templates/settings/themes.html:74 msgid "Theme filename" msgstr "" -#: bookwyrm/templates/settings/themes.html:107 +#: bookwyrm/templates/settings/themes.html:89 msgid "Available Themes" msgstr "" -#: bookwyrm/templates/settings/themes.html:115 +#: bookwyrm/templates/settings/themes.html:97 msgid "File" msgstr "" -#: bookwyrm/templates/settings/themes.html:130 +#: bookwyrm/templates/settings/themes.html:112 msgid "Remove theme" msgstr "" @@ -3979,43 +4031,39 @@ msgstr "" msgid "Your password:" msgstr "" -#: bookwyrm/templates/settings/users/user.html:7 -msgid "Back to users" -msgstr "" - -#: bookwyrm/templates/settings/users/user_admin.html:7 +#: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format msgid "Users: %(instance_name)s" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:22 +#: bookwyrm/templates/settings/users/user_admin.html:40 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:26 +#: bookwyrm/templates/settings/users/user_admin.html:44 msgid "Date Added" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:30 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Last Active" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:38 +#: bookwyrm/templates/settings/users/user_admin.html:57 msgid "Remote instance" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:47 +#: bookwyrm/templates/settings/users/user_admin.html:67 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Active" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:47 +#: bookwyrm/templates/settings/users/user_admin.html:67 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Inactive" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:73 #: bookwyrm/templates/settings/users/user_info.html:120 msgid "Not set" msgstr "" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 43db15d9d564c104654b5a2f27f668fb4ecbd918..ff4ad1d4996bb4a39f8a210854b7bfa648db2dfc 100644 GIT binary patch delta 21021 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

    a9#mi11c-y{CqNu9aRMX+W>0`b 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 delta 21094 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\n" "Language-Team: Spanish\n" "Language: es\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Seguidores" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citas" msgid "Everything else" msgstr "Todo lo demás" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Línea de tiempo principal" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Línea temporal de libros" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Gallego)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (Noruego)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileño)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chino simplificado)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chino tradicional)" @@ -598,11 +598,11 @@ msgstr "Alias:" #: bookwyrm/templates/author/author.html:48 msgid "Born:" -msgstr "Nacido:" +msgstr "Fecha de nacimiento:" #: bookwyrm/templates/author/author.html:55 msgid "Died:" -msgstr "Muerto:" +msgstr "Fecha de defunción:" #: bookwyrm/templates/author/author.html:65 msgid "External links" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Guardar" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Cancelar" @@ -770,9 +770,9 @@ msgstr "Cancelar" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "La carga de datos se conectará a %(source_name)s y comprobará si hay metadatos sobre este autor que no están presentes aquí. Los metadatos existentes no serán sobrescritos." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Agregar a lista" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Acciones" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Denunciar spam" @@ -1216,7 +1216,7 @@ msgstr "Saliendo de BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Este enlace te lleva a: %(link_url)s.
    ¿Es ahí adonde quieres ir?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Continuar" @@ -1292,7 +1292,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1326,7 +1326,7 @@ msgstr "Usuarios locales" #: bookwyrm/templates/directory/community_filter.html:12 msgid "Federated community" -msgstr "Comunidad federalizada" +msgstr "Comunidad federada" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\"" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Crear grupo" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "¿Eliminar este grupo?" msgid "This action cannot be un-done" msgstr "Esta acción no se puede deshacer" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Añadir «%(title)s» a esta lista" msgid "Suggest \"%(title)s\" for this list" msgstr "Sugerir «%(title)s» para esta lista" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Sugerir" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Posición" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Establecido" @@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4200,8 +4201,9 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" -msgstr "Crear Estantería" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" +msgstr "Crear estantería" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 msgid "Edit Shelf" @@ -4216,10 +4218,6 @@ msgstr "Perfil de usuario" msgid "All books" msgstr "Todos los libros" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Crear estantería" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Responder" msgid "Content" msgstr "Contenido" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Advertencia de contenido:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "¡Advertencia, ya vienen spoilers!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Incluir alerta de spoiler" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "¡Advertencia, ya vienen spoilers!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Comentario:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Compartir" @@ -4851,10 +4849,6 @@ msgstr "Tus grupos" msgid "Groups: %(username)s" msgstr "Grupos: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Crear grupo" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Perfil de usuario" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 6c5d17c4d..4e3d049b6 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-14 16:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Abonné(e)s" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citations" msgid "Everything else" msgstr "Tout le reste" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Mon fil d’actualité" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Accueil" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Actualité de mes livres" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livres" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Galicien)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (italien)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituanien)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (norvégien)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugais brésilien)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugais européen)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Suédois)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简化字" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "Infos supplémentaires :" @@ -727,14 +727,14 @@ msgstr "ISNI :" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Annuler" @@ -770,9 +770,9 @@ msgstr "Annuler" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Le chargement des données se connectera à %(source_name)s et vérifiera les métadonnées de cet auteur ou autrice qui ne sont pas présentes ici. Les métadonnées existantes ne seront pas écrasées." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Ajouter à la liste" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Actions" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Signaler un spam" @@ -1216,7 +1216,7 @@ msgstr "Vous quittez BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Ce lien vous amène à %(link_url)s.
    Est-ce là que vous souhaitez aller ?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Continuer" @@ -1292,7 +1292,7 @@ msgstr "Code de confirmation :" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Valider" @@ -1806,8 +1806,9 @@ msgid "No users found for \"%(query)s\"" msgstr "Aucun compte trouvé pour « %(query)s »" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" -msgstr "Créer un Groupe" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" +msgstr "Créer un groupe" #: bookwyrm/templates/groups/created_text.html:4 #, python-format @@ -1824,9 +1825,9 @@ msgstr "Supprimer ce groupe ?" msgid "This action cannot be un-done" msgstr "Cette action ne peut pas être annulée" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Ajouter « %(title)s » à cette liste" msgid "Suggest \"%(title)s\" for this list" msgstr "Suggérer « %(title)s » pour cette liste" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Suggérer" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Position" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Appliquer" @@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "Copiez le fichier de thème dans le répertoire bookwyrm/static/css/themes de votre serveur depuis la ligne de commande." #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." -msgstr "Exécutez ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." +msgstr "Exécutez ./bw-dev collectstatic." #: bookwyrm/templates/settings/themes.html:35 msgid "Add the file name using the form below to make it available in the application interface." @@ -4200,7 +4201,8 @@ msgid "Need help?" msgstr "Besoin d’aide ?" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Créer une étagère" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4216,10 +4218,6 @@ msgstr "Profil utilisateur·rice" msgid "All books" msgstr "Tous les livres" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Créer une étagère" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Répondre" msgid "Content" msgstr "Contenu" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Avertissement sur le contenu :" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Attention spoilers !" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Afficher une alerte spoiler" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "Avertissements de contenu/spoilers :" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Attention spoilers !" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Commentaire :" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Publier" @@ -4497,7 +4495,7 @@ msgstr "Critique de « %(book_title)s » : %(review_title)s" #: bookwyrm/templates/snippets/goal_form.html:4 #, python-format msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year." -msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année." +msgstr "Définissez un nombre de livres à lire comme objectif pour %(year)s, et suivez votre progression au fil de l’année." #: bookwyrm/templates/snippets/goal_form.html:16 msgid "Reading goal:" @@ -4851,10 +4849,6 @@ msgstr "Vos Groupes" msgid "Groups: %(username)s" msgstr "Groupes : %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Créer un groupe" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Profil" diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index 691d4246e087603ac0f44e63c0f842b22202e1a0..8958c625aa2159fb6d31240e3ad57c6309aa0a96 100644 GIT binary patch delta 22785 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

    8dD(RabWR!28MK~K*bbD&^1nh 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 C4P(Fn delta 23057 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 diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 1f45a6890..bf0fc1218 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:52\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Seguidoras" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citas" msgid "Everything else" msgstr "As outras cousas" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Cronoloxía de Inicio" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Cronoloxía de libros" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Alemán (Alemaña)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (España)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (Italian)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Francés (Francia)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithuanian)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Noruegués (Norwegian)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileiro)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Sueco (Swedish)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinés simplificado)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinés tradicional)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Gardar" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Cancelar" @@ -770,9 +770,9 @@ msgstr "Cancelar" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Ao cargar os datos vas conectar con %(source_name)s e comprobar se existen metadatos desta persoa autora que non están aquí presentes. Non se sobrescribirán os datos existentes." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Engadir a listaxe" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Accións" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Denunciar spam" @@ -1216,7 +1216,7 @@ msgstr "Saír de BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Esta ligazón vaite levar a: %(link_url)s.
    É ahí a onde queres ir?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Continuar" @@ -1292,7 +1292,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Non se atopan usuarias para \"%(query)s\"" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Crear grupo" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "Eliminar este grupo?" msgid "This action cannot be un-done" msgstr "Esta acción non ten volta atrás" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Engadir \"%(title)s\" a esta lista" msgid "Suggest \"%(title)s\" for this list" msgstr "Suxerir \"%(title)s\" para esta lista" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Suxire" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Posición da lista" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Establecer" @@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "Copia o ficheiro do decorado no cartafol bookwyrm/static/css/themes do teu servidor usando a liña de comandos." #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." -msgstr "Executa ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." +msgstr "" #: bookwyrm/templates/settings/themes.html:35 msgid "Add the file name using the form below to make it available in the application interface." @@ -4200,8 +4201,9 @@ msgid "Need help?" msgstr "Precisas axuda?" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" -msgstr "Crear Estante" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" +msgstr "Crear estante" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 msgid "Edit Shelf" @@ -4216,10 +4218,6 @@ msgstr "Perfil da usuaria" msgid "All books" msgstr "Tódolos libros" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Crear estante" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Responder" msgid "Content" msgstr "Contido" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Aviso sobre o contido:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Contén Spoilers!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Incluír alerta de spoiler" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Contén Spoilers!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Comentario:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Publicación" @@ -4851,10 +4849,6 @@ msgstr "Os teus grupos" msgid "Groups: %(username)s" msgstr "Grupos: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Crear grupo" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Perfil da usuaria" diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo index 2be0c3ac01a7057cabd8b69e3f99520ca5e585ef..911ed76e7d249a6e33903385d49658f07dc52aed 100644 GIT binary patch delta 22663 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 delta 22885 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 diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index 245387351..fbeaf64b7 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:52\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Followers" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citazioni" msgid "Everything else" msgstr "Tutto il resto" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "La tua timeline" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Home" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Timeline dei libri" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libri" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Inglese)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch (Tedesco)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (Spagnolo)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Galiziano)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Francese)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegese)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portoghese Brasiliano)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portoghese europeo)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Svedese)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Cinese Semplificato)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Cinese Tradizionale)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Salva" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Cancella" @@ -770,9 +770,9 @@ msgstr "Cancella" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Il caricamento dei dati si collegherà a %(source_name)s e verificherà eventuali metadati relativi a questo autore che non sono presenti qui. I metadati esistenti non vengono sovrascritti." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Aggiungi all'elenco" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Azioni" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Segnala come spam" @@ -1216,7 +1216,7 @@ msgstr "Esci da BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Questo link ti sta portando a: %(link_url)s.
    È qui che vuoi andare?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Continua" @@ -1292,7 +1292,7 @@ msgstr "Codice di conferma:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Invia" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Nessun utente trovato per \"%(query)s\"" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Crea gruppo" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "Eliminare questo gruppo?" msgid "This action cannot be un-done" msgstr "Questa azione non può essere annullata" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Aggiungi \"%(title)s\" a questa lista" msgid "Suggest \"%(title)s\" for this list" msgstr "Suggerisci \"%(title)s\" per questa lista" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Suggerisci" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Posizione elenco" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Imposta" @@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "Copia il file del tema nella directory bookwyrm/static/css/themes sul tuo server dalla riga di comando." #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." -msgstr "Esegui ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." +msgstr "" #: bookwyrm/templates/settings/themes.html:35 msgid "Add the file name using the form below to make it available in the application interface." @@ -4200,8 +4201,9 @@ msgid "Need help?" msgstr "Hai bisogno di aiuto?" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" -msgstr "Crea Scaffale" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" +msgstr "Crea scaffale" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 msgid "Edit Shelf" @@ -4216,10 +4218,6 @@ msgstr "Profilo utente" msgid "All books" msgstr "Tutti i libri" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Crea scaffale" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Rispondi" msgid "Content" msgstr "Contenuto" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Avviso sul contenuto:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Attenzione Spoiler!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Includi avviso spoiler" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Attenzione Spoiler!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Commenta:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Pubblica" @@ -4851,10 +4849,6 @@ msgstr "I tuoi gruppi" msgid "Groups: %(username)s" msgstr "Gruppi: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Crea gruppo" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Profilo utente" diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index b4885e93b693c8909b1476f861f3aaecba0a2b0a..08a3fe6ac5ff76c87f1cb315f558e204008ad0bd 100644 GIT binary patch delta 21120 zcmbO>o%P~W*7|!wEK?a67#OZFGcd?7Ffi>gE0dGLv9!Yg98Ht!@@8Ih5!ZzhDTu#2O5VnFvv47 zFr!7#KJ*Ar@L>LK0(ECL|Zk&4h&1=1fS`9?Jx$iF$@V znG6hOphS}eaX?5GBm@$(AP&jTf;gZqi-94Vfq|hZ3zE&=WkD~f%7IvXH3t%>PjVO- zBp4VN-seCp;K+qoD3A+LFP94uH_T;VU}0cju*`+1x66fuP&ib5I#j+i7vg}bTm}YK zQ2uYrh4{P&YS2umhK0G1xLltLanM1i0T*&1ad>^WEnalpyKdWeNLp%RY@AwGBoRq(wKQmL>PL42TI1Sw#2iy#hgEP}+P ze-R`|ql+L8%qoJIQv;Rngz~3C^)D)dMAf$XB1jSYu?Uj76^bDi_7p>cYE3c3#hZ&E z2JbG0gvi-qNZem9hFJ6n%70%Bao8^?pQ8lgFyRtN;#4YuR9fmK5Qo>>lt46iltAJ- ztOR0l4pd`t3B-aXsD^&10kfgv8=(64mOyIF(AaQP30SQTm3Wx^-DeUG zCB&gYl@JF+R5H|qtH;DjNVdv`()E>)AfH?b3BnnbkX*4C%0CP>;2hN8>rj37p%#Cx zgm?th$^f+kl&Tns)EFEcNHYa7FIzVwxWuGAsp0j zsA6DHVPIeosfPH>vKkWPe$|jvA6E@gUtSFfk?v|pTA2)0x3n6PMz&T%9I(G0DsZkE z60|p<5>Kij4*3k#$XNq1P_hORHHtNm5HhKO1f^vS#3H8}hyy}uAR(7g1IY!&H4qCM zq5KIokf^Ai2Q_d>4a5Q4YZ$=I@WVBb5cpOD@#)_hh|7g)A+2JWT8IOzY9ZqGwGjQD zQ1Q@Oh{aL05d9fY`C6!aXD!&_^$dLw2E+7Ph>I3L>1DMH3?86%do9EvUuz+8_y@`t zse_11*FmCAsSc9pjO!p4JJdnil74lNkV&nBIIz49QV=!QfugRSfnk0f*d+|>>mWhA zqmF^$7y|>t0jP#{Xd0PZ57NNEFsB|8HEZf21|O=2Sa_u#62y<7;vb>vm>VDtlx%>g z(`tZ(m<5Oi<$tFJh(@0Vh>xNhAQmMxK!UEQ0phUs21q-WvWd4H}{O-=PtbSiBk`K@{2u@mV5NVR0h^gC7F}Lvte} z8(xAM_z9|>u?gZs-X=)M$TdOqn>0b9z^w`5u-GPu`AJZIUK2w-xVc>1#K5qgfq|i+ z3DTJ~Xoj?4YMLPqyVeZx!NX=q5PoQeq?Lcokkro7!oXn7z`!8U0tvB@7Dy0hwm`aO z#VrgB8yFZErnN9ItYctcaBqd^|JGU$anYYvhy@&NkSGvugScF-4bqo0ZG%KXNE<|B zOdCXB5|p3U2C=xL4dV08Hb{ufZiBRx*0ezq=aV*Qbq_U9p}rlWL8Bc~rdzc`QfFv8 zq^vG%hs0T5JH){0?U3g43aI!!sQ7az|3^C{#27muA;8lCNh4xVTC)S&?E`1B7e?bjm?}YeVuoDvG;+>GF(C&ojv+RV#aabp$=#B1#c&xS) z;(-26NQf@#goO0YPH@Q9Go0vzbS9s7LVPOP1u0yHu>Ed2U+Gy^DIAlsMWTa$HFQiv} zp%-GYU?0R`Qhg8)DE2|~zjhx)qiG++#kPHr#OU1z3F@>yNSxR8K|){>l)nUO;Eq1X z2*>_Dhy!o-F)(N_Ffe@TV_?u`U|^8$hgj&|5AjG~KO{uL`l0zhxgS#L6!b%aba6k# zK|A^(E4txR%8N~a=#!fO(Wf>6;$Zy=5C=F;fP{ee1W1$z zO{j+?qPPi=dcAN0B+jQzfLO3;0wg;ff@(Mm<=>nDiJB)+17ATc{5S#P!(UMG|4;|9 zO@ug{Zz80ilAQ=q7g;|M5)^S0A){E?6CqJB2P(b_s&V^7h=Yzzg!u3pRQ}#XNYKBA z>SLV*@uBb}h&fVFzQ!boetjt49?GwGn*<5+ut|_0$%gXFCqaDJ1Jy8T5+sUdPJ$Fb zXC^_0W|$^J^0m%nh&j%aA=x)#GQ_;H$qOcOo15K0;MNUf#m;1Qy>-`nF6+e;mj0B2w$B7 z@z5hE|HTwgNYyhie1!`9nZm%($H2hAIh6rCiZx>@#Gs>4`s`H5K*ZIlkP*(CQz3CE zHVu+Hq^ChF(4Pizpy@P_1q=+1(;z|bF%6O!Bc?&hnJf?=l>fV@L0mX@8YBo;K@HeH z4U&&fL*@TZgZP+dIwWqTr$a2(oDQ+jb~?mCp3@<@!f!f6eaUo)N1CTY?CG8k@yLwn z3=H+T3=9l&rb7x4t{IRbS9%5{=q#YL;|z!oyk7JF4vh2ahSzyh=FdiA^QAgL*hIR%1@mQDM3qT zLlSW>RQ;CO5RdGshblZe8{&|wP>E+ygWk`Exbz!ToM8?mm2=L4|<-)qT5DOm8Wni#mU|{$-mx19T0|SHhJP7~qJV^F7pAV_-6X%0N zrkqd`RNBIG=&R3siYPY1;*m+OT5*q+r>;0IZSW>H-FaO$-bSZx=vv&4PuH z#J6=JWH9^0LP(q|FM=d$w?&Y&k-P|^e%T^Wl-4sa>|O*(#m5#w;_l2MNKjseir-!Y ziSvhx7#PYJ85rI!g7`FL2_(CfEMZ^>Wnf^aTms2f=b_@4mq0@529$mXrC%+9M9JqR z3=Hg`{QnokU|?WiT?#RncPS)a%Pxf&V7L?#^j1)Q;8KVIQBZ!$Qb=6qLe*76&6%_m z5=D!k>dr2Oc411SB;$Ct +1M5WWeN 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 delta 21291 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 B1xNq@ diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index b272ecf09..b74de2d2f 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:15\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:51\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Sekėjai" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citatos" msgid "Everything else" msgstr "Visa kita" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Pagrindinė siena" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Pagrindinis" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Knygų siena" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Knygos" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Anglų)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch (Vokiečių)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (Ispanų)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (galisų)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italų (Italian)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Prancūzų)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norvegų (Norwegian)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português brasileiro (Brazilijos portugalų)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europos portugalų)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Švedų)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Supaprastinta kinų)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicinė kinų)" @@ -735,14 +735,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -756,20 +756,20 @@ msgstr "Išsaugoti" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Atšaukti" @@ -778,9 +778,9 @@ msgstr "Atšaukti" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Duomenų įkėlimas prisijungs prie %(source_name)s ir patikrins ar nėra naujos informacijos. Esantys metaduomenys nebus perrašomi." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -883,8 +883,8 @@ msgid "Add to list" msgstr "Pridėti prie sąrašo" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1191,7 +1191,7 @@ msgid "Actions" msgstr "Veiksmai" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Pranešti apie brukalą" @@ -1225,7 +1225,7 @@ msgstr "Tęsti naršymą ne BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Nuoroda veda į: %(link_url)s.
    Ar tikrai norite ten nueiti?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Tęsti" @@ -1301,7 +1301,7 @@ msgstr "Patvirtinimo kodas:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Siųsti" @@ -1819,7 +1819,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Pagal paiešką „%(query)s“ nieko nerasta" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Sukurti grupę" #: bookwyrm/templates/groups/created_text.html:4 @@ -1837,9 +1838,9 @@ msgstr "Ištrinti šią grupę?" msgid "This action cannot be un-done" msgstr "Nebegalite atšaukti šio veiksmo" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2319,7 +2320,7 @@ msgstr "Pridėti \"%(title)s\" į šį sąrašą" msgid "Suggest \"%(title)s\" for this list" msgstr "Siūlyti \"%(title)s\" į šį sąrašą" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Siūlyti" @@ -2489,7 +2490,7 @@ msgid "List position" msgstr "Sąrašo pozicija" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Nustatyti" @@ -3952,7 +3953,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4229,7 +4230,8 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Sukurti lentyną" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4245,10 +4247,6 @@ msgstr "Nario paskyra" msgid "All books" msgstr "Visos knygos" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Sukurti lentyną" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4376,24 +4374,24 @@ msgstr "Atsakyti" msgid "Content" msgstr "Turinys" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Įspėjimas dėl turinio:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Galimas turinio atskleidimas!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Įdėti įspėjimą apie turinio atskleidimą" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Galimas turinio atskleidimas!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Komentuoti:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Publikuoti" @@ -4894,10 +4892,6 @@ msgstr "Jūsų grupės" msgid "Groups: %(username)s" msgstr "Grupės: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Sukurti grupę" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Nario paskyra" diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo index dbfe5ea07ba28095af217223c694380ae67f9888..7f23bb1a85ac630404dea8c769addd4f5b1fa79c 100644 GIT binary patch delta 21120 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 +1M5WWeN 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 QCvua2J`vh{@JUAy0MR`tS^xk5 diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po index a7626b284..2d4003e2b 100644 --- a/locale/no_NO/LC_MESSAGES/django.po +++ b/locale/no_NO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:51\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Følgere" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Sitater" msgid "Everything else" msgstr "Andre ting" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Lokal tidslinje" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Boktidslinja" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Bøker" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Engelsk)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch (Tysk)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (Spansk)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (Italiensk)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Fransk)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisk)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (Norsk)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português - Brasil (Brasiliansk portugisisk)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisisk)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Svensk)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Forenklet kinesisk)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradisjonelt kinesisk)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Lagre" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Avbryt" @@ -770,9 +770,9 @@ msgstr "Avbryt" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Laster inn data kobler til %(source_name)s og finner metadata om denne forfatteren som enda ikke finnes her. Eksisterende metadata vil ikke bli overskrevet." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Legg til i liste" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Handlinger" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Rapporter spam" @@ -1216,7 +1216,7 @@ msgstr "Forlater BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Denne lenka sender deg til: %(link_url)s.
    Er det dit du vil dra?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Fortsett" @@ -1292,7 +1292,7 @@ msgstr "Bekreftelseskode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Send inn" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Ingen medlemmer funnet for \"%(query)s\"" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Opprett gruppe" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "Slette denne gruppa?" msgid "This action cannot be un-done" msgstr "Denne handlingen er endelig" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Legg til \"%(title)s\" på denne lista" msgid "Suggest \"%(title)s\" for this list" msgstr "Foreslå \"%(title)s\" for denne lista" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Foreslå" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Listeposisjon" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Bruk" @@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4200,7 +4201,8 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Lag hylle" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4216,10 +4218,6 @@ msgstr "Brukerprofil" msgid "All books" msgstr "Alle bøker" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Lag hylle" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Svar" msgid "Content" msgstr "Innhold" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Innholdsadvarsel:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Spoilers forut!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Inkluder spoiler-varsel" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Spoilers forut!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Kommentar:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Innlegg" @@ -4851,10 +4849,6 @@ msgstr "Gruppene dine" msgid "Groups: %(username)s" msgstr "Grupper: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Opprett gruppe" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Brukerprofil" diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index 064c6caebac3129eca39164512621959f106f161..6ca75c4db9b5ada99f48b342c3be40dd2877a95c 100644 GIT binary patch delta 22778 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 delta 22809 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,}hA8H}O) zBt`}XJy1Q#$iVOvRO&G?Fz`an0b360$uTf6ltR_JegZYuK{8OR0?O8)jt>(9!+T~1 zhT}|-rMI9_EYSYY4-5_SEc1|MbyhDs=ZCj$e+3n+U!)UL&#b6G)+=Z}n#eKQ~nK$we#fng(PLoO&O zGeh>&)i5$Jbbz|%P)kAT@|YPIDxikuBZ;3!VuREjWMp8t0IH)w}; z>SG%Q1_oxRi^@QG4YXMk)Xf65xEUE3_A@asYy?@v%)p?`2sy~d4r(bIr~+ePU|0)k z{XxYpLe1I@>ivRj2OT2I$iT3MnSr5=nSp_cg@NG#GXq02BLhPkWb~VXp$*jOWM*JU z03}9H8x(5TGEmzK>YL}F#=vC32ystWCI*IGpk^@>1H%et28LUV4B&YR&|#;tQ0qZ9 zgO2tLWoBRqWCpF$W?(R4f~;ltfT}q>xiCVU_ZKq*gE~~?+Ty7ZDm\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Seguidores" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citações" msgid "Everything else" msgstr "Todo o resto" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Linha do tempo" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Página inicial" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Linha do tempo dos livros" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English (Inglês)" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português do Brasil)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Português Europeu)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Salvar" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Cancelar" @@ -770,9 +770,9 @@ msgstr "Cancelar" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Para carregar informações nos conectaremos a %(source_name)s e buscaremos metadados que ainda não temos sobre este/a autor/a. Metadados já existentes não serão substituídos." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Adicionar à lista" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Ações" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Denunciar spam" @@ -1216,7 +1216,7 @@ msgstr "Saindo da BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Este link te levará a: %(link_url)s.
    Você quer mesmo ir?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Continuar" @@ -1292,7 +1292,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Nenhum usuário encontrado para \"%(query)s\"" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Criar grupo" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "Deletar grupo?" msgid "This action cannot be un-done" msgstr "Esta ação não pode ser desfeita" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Adicionar \"%(title)s\" a esta lista" msgid "Suggest \"%(title)s\" for this list" msgstr "Sugerir \"%(title)s\" para esta lista" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Sugerir" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Posição na lista" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Definir" @@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "Copie o arquivo do tema para a pasta bookwyrm/static/css/themes em seu servidor pela linha de comando." #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." -msgstr "Execute ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." +msgstr "Execute ./bw-dev collectstatic." #: bookwyrm/templates/settings/themes.html:35 msgid "Add the file name using the form below to make it available in the application interface." @@ -4200,7 +4201,8 @@ msgid "Need help?" msgstr "Precisa de ajuda?" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Criar estante" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4216,10 +4218,6 @@ msgstr "Perfil do usuário" msgid "All books" msgstr "Todos os livros" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Criar estante" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Responder" msgid "Content" msgstr "Conteúdo" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Aviso de conteúdo:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Alerta de spoiler!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Incluir alerta de spoiler" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "Avisos de spoiler/conteúdo:" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Alerta de spoiler!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Comentário:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Publicar" @@ -4851,10 +4849,6 @@ msgstr "Seus grupos" msgid "Groups: %(username)s" msgstr "Grupos: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Criar grupo" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Perfil do usuário" diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo index 85e167660be76978d3eae5b1408af98292516f36..d943b0f6c1cfbde56d1ccb7ab5d70b864c5f4d81 100644 GIT binary patch delta 19660 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 delta 19770 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 C+{E4h diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index 32acf05c3..6f3d2e4b5 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:51\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Seguidores" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citações" msgid "Everything else" msgstr "Tudo o resto" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Cronograma Inicial" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Início" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Cronograma de Livros" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "Inglês" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituano)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português brasileiro)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português (Português Europeu)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Salvar" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Cancelar" @@ -770,9 +770,9 @@ msgstr "Cancelar" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Carregar os dados irá conectar a %(source_name)s e verificar se há metadados sobre este autor que não estão aqui presentes. Os metadados existentes não serão substituídos." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Adicionar à lista" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1180,7 +1180,7 @@ msgid "Actions" msgstr "Acções" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "" @@ -1214,7 +1214,7 @@ msgstr "" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "" @@ -1290,7 +1290,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Submeter" @@ -1804,8 +1804,9 @@ msgid "No users found for \"%(query)s\"" msgstr "Nenhum utilizador encontrado para \"%(query)s\"" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" -msgstr "Criar um Grupo" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" +msgstr "Criar grupo" #: bookwyrm/templates/groups/created_text.html:4 #, python-format @@ -1822,9 +1823,9 @@ msgstr "Apagar este grupo?" msgid "This action cannot be un-done" msgstr "Esta ação não pode ser desfeita" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2296,7 +2297,7 @@ msgstr "" msgid "Suggest \"%(title)s\" for this list" msgstr "" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Sugerir" @@ -2466,7 +2467,7 @@ msgid "List position" msgstr "Posição da lista" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Definir" @@ -3921,7 +3922,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4198,7 +4199,8 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Criar prateleira" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4214,10 +4216,6 @@ msgstr "" msgid "All books" msgstr "Todos os livros" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Criar prateleira" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4341,24 +4339,24 @@ msgstr "Responder" msgid "Content" msgstr "Conteúdo" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Aviso de Conteúdo:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Alerta de spoiler!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Incluir aviso de spoiler" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Alerta de spoiler!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Comentar:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Publicação" @@ -4849,10 +4847,6 @@ msgstr "Os Teus Grupos" msgid "Groups: %(username)s" msgstr "Grupos: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Criar grupo" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Perfil de Utilizador" diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo index eb44d9bf9529fbb561ab36fe4271c235c2e19ff6..d540a049d16db15db4469482f05fbdfed044b8b1 100644 GIT binary patch delta 22292 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 diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po index 303495c60..691eb7ccb 100644 --- a/locale/sv_SE/LC_MESSAGES/django.po +++ b/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:15\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:51\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "Följare" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "Citationer" msgid "Everything else" msgstr "Allt annat" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "Tidslinje för Hem" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "Hem" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "Tidslinjer för böcker" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Böcker" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "Engelska" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Tyska (Tysk)" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Spanska (Spansk)" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italienska (Italiensk)" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Franska (Fransk)" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Litauiska (Litauisk)" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norska (Norska)" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português d Brasil (Brasiliansk Portugisiska)" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisiska)" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska (Svenska)" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Förenklad Kinesiska)" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditionell Kinesiska)" @@ -727,14 +727,14 @@ msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -748,20 +748,20 @@ msgstr "Spara" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "Avbryt" @@ -770,9 +770,9 @@ msgstr "Avbryt" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "Att ladda in data kommer att ansluta till %(source_name)s och kontrollera eventuella metadata om den här författaren som inte finns här. Befintliga metadata kommer inte att skrivas över." -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -873,8 +873,8 @@ msgid "Add to list" msgstr "Lägg till i listan" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1182,7 +1182,7 @@ msgid "Actions" msgstr "Åtgärder" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "Rapportera skräppost" @@ -1216,7 +1216,7 @@ msgstr "Lämnar BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "Den här länken tar dig till: %(link_url)s.
    Är det dit du vill åka?" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "Fortsätt" @@ -1292,7 +1292,7 @@ msgstr "Bekräftelsekod:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Skicka in" @@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\"" msgstr "Ingen användare \"%(query)s\" hittades" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "Skapa grupp" #: bookwyrm/templates/groups/created_text.html:4 @@ -1824,9 +1825,9 @@ msgstr "Ta bort den här gruppen?" msgid "This action cannot be un-done" msgstr "Den här åtgärden kan inte ångras" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2298,7 +2299,7 @@ msgstr "Lägg till \"%(title)s\" i den här listan" msgid "Suggest \"%(title)s\" for this list" msgstr "Föreslå \"%(title)s\" för den här listan" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "Föreslå" @@ -2468,7 +2469,7 @@ msgid "List position" msgstr "Listans plats" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "Ställ in" @@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4200,7 +4201,8 @@ msgid "Need help?" msgstr "Behöver du hjälp?" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "Skapa hylla" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4216,10 +4218,6 @@ msgstr "Användarprofil" msgid "All books" msgstr "Alla böcker" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "Skapa hylla" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4343,24 +4341,24 @@ msgstr "Svara" msgid "Content" msgstr "Innehåll" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "Innehållsvarning:" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "Varning för spoiler!" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "Inkludera spoilervarning" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "Varning för spoiler!" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Kommentar:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "Inlägg" @@ -4851,10 +4849,6 @@ msgstr "Dina grupper" msgid "Groups: %(username)s" msgstr "Grupper: %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "Skapa grupp" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "Användarprofil" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 4acf1dce3..b4b67c957 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-14 00:10\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "关注者" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "引用" msgid "Everything else" msgstr "所有其它内容" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "主页时间线" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "主页" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "书目时间线" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "书目" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "Galego（加利西亚语）" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "Italiano（意大利语）" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français（法语）" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių（立陶宛语）" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "Norsk（挪威语）" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil（巴西葡萄牙语）" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu（欧洲葡萄牙语）" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "Svenska（瑞典语）" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文（繁体中文）" @@ -476,7 +476,7 @@ msgstr "共享状态：公开（需要密钥）" #: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." -msgstr "有完整地址的任何人都可以看到该页面。" +msgstr "任何有完整地址的人都可以看到该页面。" #: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" @@ -723,14 +723,14 @@ msgstr "ISNI：" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -744,20 +744,20 @@ msgstr "保存" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "取消" @@ -766,9 +766,9 @@ msgstr "取消" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "加载数据会连接到 %(source_name)s 并检查这里还没有记录的与作者相关的元数据。现存的元数据不会被覆盖。" -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -868,8 +868,8 @@ msgid "Add to list" msgstr "添加到列表" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1177,7 +1177,7 @@ msgid "Actions" msgstr "动作" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "举报垃圾信息" @@ -1211,7 +1211,7 @@ msgstr "离开 BookWyrm" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "此链接将跳转至：%(link_url)s。
    这是您想跳转的网址吗？" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "继续" @@ -1287,7 +1287,7 @@ msgstr "确认代码:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -1799,7 +1799,8 @@ msgid "No users found for \"%(query)s\"" msgstr "没有找到 \"%(query)s\" 的用户" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "创建群组" #: bookwyrm/templates/groups/created_text.html:4 @@ -1817,9 +1818,9 @@ msgstr "删除该群组？" msgid "This action cannot be un-done" msgstr "此操作无法被撤销" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2287,7 +2288,7 @@ msgstr "将 “%(title)s” 添加到这个列表" msgid "Suggest \"%(title)s\" for this list" msgstr "推荐 “%(title)s” 到这个列表" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "推荐" @@ -2457,7 +2458,7 @@ msgid "List position" msgstr "列表位置:" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "设定" @@ -3908,8 +3909,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "从命令行将主题文件复制到您服务器上的 bookwym/static/css/themes 目录。" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." -msgstr "运行 ./bw-dev compilescsss。" +msgid "Run ./bw-dev collectstatic." +msgstr "" #: bookwyrm/templates/settings/themes.html:35 msgid "Add the file name using the form below to make it available in the application interface." @@ -4185,7 +4186,8 @@ msgid "Need help?" msgstr "需要帮助？" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "创建书架" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4201,10 +4203,6 @@ msgstr "用户个人资料" msgid "All books" msgstr "所有书目" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "创建书架" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4326,24 +4324,24 @@ msgstr "回复" msgid "Content" msgstr "内容" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "内容警告：" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "前有剧透！" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "加入剧透警告" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "剧透/内容警告：" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "前有剧透！" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "评论:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "发布" @@ -4829,10 +4827,6 @@ msgstr "您的群组" msgid "Groups: %(username)s" msgstr "群组： %(username)s" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "创建群组" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "用户个人资料" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index a410c4fed..7e25b4b92 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-08 19:55+0000\n" -"PO-Revision-Date: 2022-03-08 21:16\n" +"POT-Creation-Date: 2022-03-13 18:56+0000\n" +"PO-Revision-Date: 2022-03-13 19:52\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -220,7 +220,7 @@ msgid "Followers" msgstr "關注者" #: bookwyrm/models/fields.py:208 -#: bookwyrm/templates/snippets/create_status/post_options_block.html:8 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:20 @@ -261,73 +261,73 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home Timeline" msgstr "主頁時間線" -#: bookwyrm/settings.py:207 +#: bookwyrm/settings.py:208 msgid "Home" msgstr "主頁" -#: bookwyrm/settings.py:208 +#: bookwyrm/settings.py:209 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "書目" -#: bookwyrm/settings.py:280 +#: bookwyrm/settings.py:281 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:281 +#: bookwyrm/settings.py:282 msgid "Deutsch (German)" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:282 +#: bookwyrm/settings.py:283 msgid "Español (Spanish)" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:283 +#: bookwyrm/settings.py:284 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:284 +#: bookwyrm/settings.py:285 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:285 +#: bookwyrm/settings.py:286 msgid "Français (French)" msgstr "Français（法語）" -#: bookwyrm/settings.py:286 +#: bookwyrm/settings.py:287 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:287 +#: bookwyrm/settings.py:288 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:288 +#: bookwyrm/settings.py:289 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:289 +#: bookwyrm/settings.py:290 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:290 +#: bookwyrm/settings.py:291 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:291 +#: bookwyrm/settings.py:292 msgid "简体中文 (Simplified Chinese)" msgstr "簡體中文" -#: bookwyrm/settings.py:292 +#: bookwyrm/settings.py:293 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文" @@ -723,14 +723,14 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:193 #: bookwyrm/templates/book/edit/edit_book.html:121 -#: bookwyrm/templates/book/file_links/add_link_modal.html:58 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:82 -#: bookwyrm/templates/groups/form.html:30 +#: bookwyrm/templates/groups/form.html:32 #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/edit_item_form.html:15 #: bookwyrm/templates/lists/form.html:130 #: bookwyrm/templates/preferences/edit_user.html:136 -#: bookwyrm/templates/readthrough/readthrough_modal.html:72 +#: bookwyrm/templates/readthrough/readthrough_modal.html:74 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 @@ -744,20 +744,20 @@ msgstr "儲存" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/author/sync_modal.html:23 #: bookwyrm/templates/book/book.html:194 -#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 -#: bookwyrm/templates/book/file_links/verification_modal.html:21 +#: bookwyrm/templates/book/file_links/verification_modal.html:25 #: bookwyrm/templates/book/sync_modal.html:23 -#: bookwyrm/templates/groups/delete_group_modal.html:17 -#: bookwyrm/templates/lists/add_item_modal.html:42 -#: bookwyrm/templates/lists/delete_list_modal.html:18 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:73 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 -#: bookwyrm/templates/snippets/report_modal.html:53 +#: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" msgstr "取消" @@ -766,9 +766,9 @@ msgstr "取消" msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." msgstr "" -#: bookwyrm/templates/author/sync_modal.html:22 +#: bookwyrm/templates/author/sync_modal.html:24 #: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/book/sync_modal.html:22 +#: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 @@ -868,8 +868,8 @@ msgid "Add to list" msgstr "新增到列表" #: bookwyrm/templates/book/book.html:370 -#: bookwyrm/templates/book/cover_add_modal.html:31 -#: bookwyrm/templates/lists/add_item_modal.html:37 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 @@ -1175,7 +1175,7 @@ msgid "Actions" msgstr "動作" #: bookwyrm/templates/book/file_links/edit_links.html:53 -#: bookwyrm/templates/book/file_links/verification_modal.html:25 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" msgstr "" @@ -1209,7 +1209,7 @@ msgstr "" msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" msgstr "" -#: bookwyrm/templates/book/file_links/verification_modal.html:20 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/setup/config.html:139 msgid "Continue" msgstr "" @@ -1285,7 +1285,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:73 #: bookwyrm/templates/settings/dashboard/dashboard.html:116 -#: bookwyrm/templates/snippets/report_modal.html:52 +#: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -1797,7 +1797,8 @@ msgid "No users found for \"%(query)s\"" msgstr "沒有找到 \"%(query)s\" 的使用者" #: bookwyrm/templates/groups/create_form.html:5 -msgid "Create Group" +#: bookwyrm/templates/user/groups.html:17 +msgid "Create group" msgstr "" #: bookwyrm/templates/groups/created_text.html:4 @@ -1815,9 +1816,9 @@ msgstr "" msgid "This action cannot be un-done" msgstr "" -#: bookwyrm/templates/groups/delete_group_modal.html:15 -#: bookwyrm/templates/lists/delete_list_modal.html:15 -#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21 +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 #: bookwyrm/templates/settings/announcements/announcement.html:23 #: bookwyrm/templates/settings/announcements/announcements.html:56 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 @@ -2285,7 +2286,7 @@ msgstr "" msgid "Suggest \"%(title)s\" for this list" msgstr "" -#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/add_item_modal.html:41 #: bookwyrm/templates/lists/list.html:257 msgid "Suggest" msgstr "推薦" @@ -2455,7 +2456,7 @@ msgid "List position" msgstr "列表位置:" #: bookwyrm/templates/lists/list.html:152 -#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" msgstr "設定" @@ -3906,7 +3907,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes dire msgstr "" #: bookwyrm/templates/settings/themes.html:32 -msgid "Run ./bw-dev compilescss." +msgid "Run ./bw-dev collectstatic." msgstr "" #: bookwyrm/templates/settings/themes.html:35 @@ -4183,7 +4184,8 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -msgid "Create Shelf" +#: bookwyrm/templates/shelf/shelf.html:72 +msgid "Create shelf" msgstr "建立書架" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 @@ -4199,10 +4201,6 @@ msgstr "" msgid "All books" msgstr "所有書目" -#: bookwyrm/templates/shelf/shelf.html:72 -msgid "Create shelf" -msgstr "建立書架" - #: bookwyrm/templates/shelf/shelf.html:96 #, python-format msgid "%(formatted_count)s book" @@ -4324,24 +4322,24 @@ msgstr "回覆" msgid "Content" msgstr "內容" -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10 -msgid "Content warning:" -msgstr "" - -#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 -msgid "Spoilers ahead!" -msgstr "前有劇透！" - -#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 msgid "Include spoiler alert" msgstr "加入劇透警告" -#: bookwyrm/templates/snippets/create_status/layout.html:47 +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "前有劇透！" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 #: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "評論:" -#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:18 msgid "Post" msgstr "釋出" @@ -4827,10 +4825,6 @@ msgstr "" msgid "Groups: %(username)s" msgstr "" -#: bookwyrm/templates/user/groups.html:17 -msgid "Create group" -msgstr "" - #: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10 msgid "User Profile" msgstr "使用者使用者資料" From a2f2104a08743610d85df3f0c30055ddc8a62813 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 10:42:53 -0700 Subject: [PATCH 46/49] Create non-functional UI for editing array fields --- .../templates/book/edit/edit_book_form.html | 70 ++++++++++++------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html index 38a7fe35d..d886d12f7 100644 --- a/bookwyrm/templates/book/edit/edit_book_form.html +++ b/bookwyrm/templates/book/edit/edit_book_form.html @@ -22,7 +22,7 @@ {% trans "Title:" %} - + {% include 'snippets/form_errors.html' with errors_list=form.title.errors id="desc_title" %}
    @@ -31,7 +31,7 @@ {% trans "Subtitle:" %} - + {% include 'snippets/form_errors.html' with errors_list=form.subtitle.errors id="desc_subtitle" %}
    • @@ -40,7 +40,7 @@ {% trans "Description:" %} {{ form.description }} - + {% include 'snippets/form_errors.html' with errors_list=form.description.errors id="desc_description" %}
    @@ -51,7 +51,7 @@ {% trans "Series:" %} - + {% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %} @@ -61,7 +61,7 @@ {% trans "Series number:" %} {{ form.series_number }} - + {% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %} @@ -75,21 +75,41 @@ {% trans "Separate multiple values with commas." %} - + {% include 'snippets/form_errors.html' with errors_list=form.languages.errors id="desc_languages" %} -
    -
    @@ -106,7 +126,7 @@ {% trans "Separate multiple values with commas." %} - + {% include 'snippets/form_errors.html' with errors_list=form.publishers.errors id="desc_publishers" %} @@ -115,7 +135,7 @@ {% trans "First published date:" %} - + {% include 'snippets/form_errors.html' with errors_list=form.first_published_date.errors id="desc_first_published_date" %} @@ -124,7 +144,7 @@ {% trans "Published date:" %} - + {% include 'snippets/form_errors.html' with errors_list=form.published_date.errors id="desc_published_date" %} @@ -193,7 +213,7 @@ - + {% include 'snippets/form_errors.html' with errors_list=form.cover.errors id="desc_cover" %} @@ -214,7 +234,7 @@
    {{ form.physical_format }}
    - + {% include 'snippets/form_errors.html' with errors_list=form.physical_format.errors id="desc_physical_format" %} @@ -224,7 +244,7 @@ {% trans "Format details:" %} {{ form.physical_format_detail }} - + {% include 'snippets/form_errors.html' with errors_list=form.physical_format_detail.errors id="desc_physical_format_detail" %} @@ -235,7 +255,7 @@ {% trans "Pages:" %} {{ form.pages }} - + {% include 'snippets/form_errors.html' with errors_list=form.pages.errors id="desc_pages" %} @@ -251,7 +271,7 @@ {% trans "ISBN 13:" %} {{ form.isbn_13 }} - + {% include 'snippets/form_errors.html' with errors_list=form.isbn_13.errors id="desc_isbn_13" %} @@ -260,7 +280,7 @@ {% trans "ISBN 10:" %} {{ form.isbn_10 }} - + {% include 'snippets/form_errors.html' with errors_list=form.isbn_10.errors id="desc_isbn_10" %} @@ -269,7 +289,7 @@ {% trans "Openlibrary ID:" %} {{ form.openlibrary_key }} - + {% include 'snippets/form_errors.html' with errors_list=form.openlibrary_key.errors id="desc_openlibrary_key" %} @@ -278,7 +298,7 @@ {% trans "Inventaire ID:" %} {{ form.inventaire_id }} - + {% include 'snippets/form_errors.html' with errors_list=form.inventaire_id.errors id="desc_inventaire_id" %} @@ -287,7 +307,7 @@ {% trans "OCLC Number:" %} {{ form.oclc_number }} - + {% include 'snippets/form_errors.html' with errors_list=form.oclc_number.errors id="desc_oclc_number" %} @@ -296,7 +316,7 @@ {% trans "ASIN:" %} {{ form.asin }} - + {% include 'snippets/form_errors.html' with errors_list=form.ASIN.errors id="desc_ASIN" %} From 35e6dede098b46c1d0b851281657b5e03c82061d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 11:34:14 -0700 Subject: [PATCH 47/49] Script to remove input fields --- bookwyrm/static/js/forms.js | 17 +++++++++++++++++ .../templates/book/edit/edit_book_form.html | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/bookwyrm/static/js/forms.js b/bookwyrm/static/js/forms.js index 7d946d147..998873898 100644 --- a/bookwyrm/static/js/forms.js +++ b/bookwyrm/static/js/forms.js @@ -1,6 +1,19 @@ (function () { "use strict"; + /** + * Remoev input field + * + * @param {event} the button click event + */ + function removeInput(event) { + const trigger = event.currentTarget; + const input_id = trigger.dataset.remove; + const input = document.getElementById(input_id); + + input.remove(); + } + /** * Duplicate an input field * @@ -29,4 +42,8 @@ document .querySelectorAll("[data-duplicate]") .forEach((node) => node.addEventListener("click", duplicateInput)); + + document + .querySelectorAll("[data-remove]") + .forEach((node) => node.addEventListener("click", removeInput)); })(); diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html index d886d12f7..fc15d26ae 100644 --- a/bookwyrm/templates/book/edit/edit_book_form.html +++ b/bookwyrm/templates/book/edit/edit_book_form.html @@ -87,12 +87,16 @@ -
    +
    -
    {% endfor %} - + {% include 'snippets/form_errors.html' with errors_list=form.subjects.errors id="desc_subjects" %}
    @@ -186,7 +201,12 @@ {% endfor %} - + + + From a37f83c458594219efc9722c1fe182ddf6520a77 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Mar 2022 14:55:41 -0700 Subject: [PATCH 49/49] Get the field working --- bookwyrm/forms/books.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py index 91d9b8f00..72df1371c 100644 --- a/bookwyrm/forms/books.py +++ b/bookwyrm/forms/books.py @@ -14,6 +14,14 @@ class CoverForm(CustomForm): help_texts = {f: None for f in fields} +class ArrayWidget(forms.widgets.TextInput): + # pylint: disable=unused-argument + # pylint: disable=no-self-use + def value_from_datadict(self, data, files, name): + """get all values for this name""" + return [i for i in data.getlist(name) if i] + + class EditionForm(CustomForm): class Meta: model = models.Edition @@ -41,12 +49,10 @@ class EditionForm(CustomForm): "series_number": forms.TextInput( attrs={"aria-describedby": "desc_series_number"} ), + "subjects": ArrayWidget(), "languages": forms.TextInput( attrs={"aria-describedby": "desc_languages_help desc_languages"} ), - "subjects": forms.TextInput( - attrs={"aria-describedby": "desc_subjects"} - ), "publishers": forms.TextInput( attrs={"aria-describedby": "desc_publishers_help desc_publishers"} ),