Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2920' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Oct 28, 2020
2 parents 9690ef7 + 10d88e8 commit 2479319
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions vendor/assets/iD/iD.js
Expand Up @@ -81075,7 +81075,9 @@
context.history().on('change.intro', function (changed) {
wasChanged = true;
timeout(function () {
if (context.history().undoAnnotation() === _t('operations.split.annotation.line')) {
if (context.history().undoAnnotation() === _t('operations.split.annotation.line', {
n: 1
})) {
_washingtonSegmentID = changed.created()[0].id;
continueTo(didSplit);
} else {
Expand Down Expand Up @@ -98094,7 +98096,7 @@

var _deferred = new Set();

context.version = '2.19.1';
context.version = '2.19.2';
context.privacyVersion = '20200407'; // iD will alter the hash so cache the parameters intended to setup the session

context.initialHashParams = window.location.hash ? utilStringQs(window.location.hash) : {};
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/imagery.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/locales.min.json
@@ -1 +1 @@
{"af":{"rtl":false,"pct":0.03},"ar":{"rtl":true,"pct":0.4},"ar-AA":{"rtl":true,"pct":0},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.29},"az":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.23},"bg":{"rtl":false,"pct":0.19},"bn":{"rtl":false,"pct":0.06},"bs":{"rtl":false,"pct":0.06},"ca":{"rtl":false,"pct":0.38},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":0.74},"cy":{"rtl":false,"pct":0.04},"da":{"rtl":false,"pct":0.65},"de":{"rtl":false,"pct":1},"dv":{"rtl":true,"pct":0.01},"el":{"rtl":false,"pct":0.37},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.31},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.81},"es":{"rtl":false,"pct":1},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.1},"fa":{"rtl":true,"pct":0.55},"fi":{"rtl":false,"pct":0.52},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.92},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.71},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.93},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.26},"hu":{"rtl":false,"pct":0.67},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.11},"is":{"rtl":false,"pct":0.5},"it":{"rtl":false,"pct":0.83},"ja":{"rtl":false,"pct":1},"jv":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0},"kn":{"rtl":false,"pct":0.07},"ko":{"rtl":false,"pct":0.5},"ku":{"rtl":false,"pct":0.01},"ky":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.23},"lv":{"rtl":false,"pct":0.41},"mg":{"rtl":false,"pct":0.05},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.72},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.19},"my":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.02},"nl":{"rtl":false,"pct":0.71},"nn":{"rtl":false,"pct":0.03},"no":{"rtl":false,"pct":0.75},"nv":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.97},"pt":{"rtl":false,"pct":0.87},"pt-BR":{"rtl":false,"pct":0.82},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.21},"ru":{"rtl":false,"pct":0.67},"sat":{"rtl":false,"pct":0.01},"sc":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.39},"sl":{"rtl":false,"pct":0.27},"so":{"rtl":false,"pct":0.02},"sq":{"rtl":false,"pct":0.08},"sr":{"rtl":false,"pct":0.25},"sv":{"rtl":false,"pct":0.98},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.17},"te":{"rtl":false,"pct":0.02},"th":{"rtl":false,"pct":0.01},"tl":{"rtl":false,"pct":0.04},"tr":{"rtl":false,"pct":0.66},"uk":{"rtl":false,"pct":0.83},"ur":{"rtl":true,"pct":0},"vi":{"rtl":false,"pct":0.89},"yue":{"rtl":false,"pct":0.12},"zh":{"rtl":false,"pct":0.03},"zh-CN":{"rtl":false,"pct":0.77},"zh-HK":{"rtl":false,"pct":0.36},"zh-TW":{"rtl":false,"pct":0.91}}
{"af":{"rtl":false,"pct":0.03},"ar":{"rtl":true,"pct":0.4},"ar-AA":{"rtl":true,"pct":0},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.29},"az":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.23},"bg":{"rtl":false,"pct":0.19},"bn":{"rtl":false,"pct":0.06},"bs":{"rtl":false,"pct":0.06},"ca":{"rtl":false,"pct":0.38},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":0.74},"cy":{"rtl":false,"pct":0.04},"da":{"rtl":false,"pct":0.65},"de":{"rtl":false,"pct":1},"dv":{"rtl":true,"pct":0.01},"el":{"rtl":false,"pct":0.37},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.31},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.81},"es":{"rtl":false,"pct":1},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.1},"fa":{"rtl":true,"pct":0.55},"fi":{"rtl":false,"pct":0.52},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.92},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.72},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.93},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.26},"hu":{"rtl":false,"pct":0.67},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.11},"is":{"rtl":false,"pct":0.5},"it":{"rtl":false,"pct":0.83},"ja":{"rtl":false,"pct":1},"jv":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0},"kn":{"rtl":false,"pct":0.07},"ko":{"rtl":false,"pct":0.5},"ku":{"rtl":false,"pct":0.01},"ky":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.23},"lv":{"rtl":false,"pct":0.41},"mg":{"rtl":false,"pct":0.05},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.72},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.19},"my":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.02},"nl":{"rtl":false,"pct":0.71},"nn":{"rtl":false,"pct":0.03},"no":{"rtl":false,"pct":0.75},"nv":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.97},"pt":{"rtl":false,"pct":0.87},"pt-BR":{"rtl":false,"pct":0.82},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.21},"ru":{"rtl":false,"pct":0.67},"sat":{"rtl":false,"pct":0.01},"sc":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.39},"sl":{"rtl":false,"pct":0.27},"so":{"rtl":false,"pct":0.02},"sq":{"rtl":false,"pct":0.08},"sr":{"rtl":false,"pct":0.25},"sv":{"rtl":false,"pct":0.98},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.17},"te":{"rtl":false,"pct":0.02},"th":{"rtl":false,"pct":0.01},"tl":{"rtl":false,"pct":0.04},"tr":{"rtl":false,"pct":0.66},"uk":{"rtl":false,"pct":0.83},"ur":{"rtl":true,"pct":0},"vi":{"rtl":false,"pct":0.89},"yue":{"rtl":false,"pct":0.12},"zh":{"rtl":false,"pct":0.03},"zh-CN":{"rtl":false,"pct":0.77},"zh-HK":{"rtl":false,"pct":0.36},"zh-TW":{"rtl":false,"pct":0.91}}
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/gl.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/sv.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/tr.json

Large diffs are not rendered by default.

0 comments on commit 2479319

Please sign in to comment.