Require locale, second pass (#3259)

* Require locale, second pass

* Remove t global, remove t where it isn't needed

.eslintrc

@@ -9,7 +9,6 @@
     ],
     "globals": {
         "d3": false,
-        "t": false,
         "bootstrap": false
     },
     "parserOptions": {

Makefile

@@ -62,7 +62,6 @@ dist/iD.js: \
 	js/lib/d3.curtain.js \
 	js/lib/d3.value.js \
 	$(MODULE_TARGETS) \
-	js/lib/locale.js \
 	data/introGraph.js
 
 .INTERMEDIATE dist/iD.js: data/data.js

index.html

@@ -25,7 +25,6 @@
         <script src='js/lib/d3-compat.js'></script>
         <script src='js/lib/bootstrap-tooltip.js'></script>
         <script src='js/lib/id/index.js'></script>
-        <script src='js/lib/locale.js'></script>
 
         <script src='data/data_dev.js'></script>
         <script src='data/introGraph.js'></script>

modules/actions/merge_remote_changes.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { DeleteMultiple } from './delete_multiple';
 import { Entity } from '../core/index';

modules/behavior/draw_way.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { AddEntity, AddMidpoint, AddVertex, MoveNode } from '../actions/index';
 import { Browse, Select } from '../modes/index';

modules/core/context.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Background } from '../renderer/background';
 import { Connection } from './connection';

modules/modes/add_area.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { AddEntity, AddMidpoint, AddVertex } from '../actions/index';
 import { Node, Way } from '../core/index';
 import { AddWay } from '../behavior/index';

modules/modes/add_line.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { AddEntity, AddMidpoint, AddVertex } from '../actions/index';
 import { Node, Way } from '../core/index';
 import { AddWay } from '../behavior/index';

modules/modes/add_point.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Browse, Select } from './index';
 import { AddEntity } from '../actions/index';
 import { Draw } from '../behavior/index';

modules/modes/browse.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Hover, Lasso, Paste, Select } from '../behavior/index';
 import { DragNode } from './index';
 

modules/modes/drag_node.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { AddMidpoint, Connect, MoveNode, Noop } from '../actions/index';
 import { Browse, Select } from './index';

modules/modes/draw_area.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { DrawWay } from '../behavior/index';
 
 export function DrawArea(context, wayId, baseGraph) {

modules/modes/draw_line.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { DrawWay } from '../behavior/index';
 export function DrawLine(context, wayId, baseGraph, affix) {
     var mode = {

modules/modes/move.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Browse, Select } from './index';
 import { Move as MoveAction, Noop } from '../actions/index';
 import { Edit } from '../behavior/index';

modules/modes/rotate_way.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Browse, Select } from './index';
 import { Noop, RotateWay as RotateWayAction } from '../actions/index';

modules/modes/save.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Commit, Conflicts, Loading, Success } from '../ui/index';
 import { DiscardTags, MergeRemoteChanges, Noop, Revert } from '../actions/index';

modules/modes/select.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import * as Operations from '../operations/index';
 import { Breathe, Copy, Hover, Lasso, Paste, Select as SelectBehavior } from '../behavior/index';

modules/operations/circularize.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Circularize as CircularizeAction } from '../actions/index';
 export function Circularize(selectedIDs, context) {

modules/operations/continue.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { DrawLine } from '../modes/index';
 export function Continue(selectedIDs, context) {

modules/operations/delete.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Browse, Select } from '../modes/index';
 import { DeleteMultiple } from '../actions/index';

modules/operations/disconnect.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Disconnect as DisconnectAction } from '../actions/index';
 export function Disconnect(selectedIDs, context) {

modules/operations/merge.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Join, Merge as MergeAction, MergePolygon } from '../actions/index';
 import { Select } from '../modes/index';
 

modules/operations/move.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Extent } from '../geo/index';
 import { Move as MoveAction } from '../actions/index';

modules/operations/orthogonalize.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Orthogonalize as OrthogonalizeAction } from '../actions/index';
 export function Orthogonalize(selectedIDs, context) {

modules/operations/reverse.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Reverse as ReverseAction } from '../actions/index';
 export function Reverse(selectedIDs, context) {
     var entityId = selectedIDs[0];

modules/operations/rotate.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { RotateWay } from '../modes/index';
 export function Rotate(selectedIDs, context) {
     var entityId = selectedIDs[0],

modules/operations/split.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Select } from '../modes/index';
 import { Split as SplitAction } from '../actions/index';

modules/operations/straighten.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Straighten as StraightenAction } from '../actions/index';
 export function Straighten(selectedIDs, context) {

modules/presets/category.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Collection } from './collection';
 export function Category(id, category, all) {

modules/presets/field.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 export function Field(id, field) {
     field = _.clone(field);

modules/presets/preset.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 export function Preset(id, preset, fields) {
     preset = _.clone(preset);

modules/renderer/background_source.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Extent, polygonIntersectsPolygon } from '../geo/index';
 

modules/renderer/map.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Areas, Labels, Layers, Lines, Midpoints, Points, Vertices } from '../svg/index';
 import { Extent, interp } from '../geo/index';

modules/ui/account.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 export function Account(context) {
     var connection = context.connection();

modules/ui/background.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { metersToOffset, offsetToMeters } from '../geo/index';
 import { BackgroundSource } from '../renderer/index';

modules/ui/commit.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { displayName, entityOrMemberSelector } from '../util/index';
 import { Icon } from '../svg/index';

modules/ui/confirm.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { modal } from './modal';
 
 export function confirm(selection) {

modules/ui/conflicts.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Extent } from '../geo/index';
 import { Icon } from '../svg/index';
 import { entityOrMemberSelector } from '../util/index';

modules/ui/contributors.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Icon } from '../svg/index';
 export function Contributors(context) {

modules/ui/entity_editor.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Browse } from '../modes/index';
 import { ChangeTags } from '../actions/index';

modules/ui/feature_info.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { tooltipHtml } from './tooltipHtml';
 export function FeatureInfo(context) {

modules/ui/feature_list.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import * as sexagesimal from 'sexagesimal';
 import { Extent, chooseEdge } from '../geo/index';
 import { displayName, entityOrMemberSelector } from '../util/index';

modules/ui/fields/access.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import _ from 'lodash';
 export function access(field) {
     var dispatch = d3.dispatch('change'),

modules/ui/fields/check.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import { oneWayTags } from '../../core/index';
 
 export { check as defaultcheck };

modules/ui/fields/combo.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import _ from 'lodash';
 export {
     combo as typeCombo,

modules/ui/fields/input.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 export {
   url as text,
   url as number,

modules/ui/fields/localized.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import _ from 'lodash';
 import { Detect } from '../../util/detect';
 import { Icon } from '../../svg/index';

modules/ui/fields/radio.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 export function radio(field) {
     var dispatch = d3.dispatch('change'),
         labels, radios, placeholder;

modules/ui/fields/restrictions.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import { Extent, Intersection, RawMercator, Turn, inferRestriction } from '../../geo/index';
 import { Layers, Lines, Turns, Vertices } from '../../svg/index';
 import { RestrictTurn, UnrestrictTurn,  } from '../../actions/index';

modules/ui/fields/textarea.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 export function textarea(field) {
     var dispatch = d3.dispatch('change'),
         input;

modules/ui/fields/wikipedia.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import _ from 'lodash';
 import { ChangeTags } from '../../actions/index';
 import { Detect } from '../../util/detect';

modules/ui/geolocate.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Browse } from '../modes/index';
 import { Extent } from '../geo/index';
 import { Icon } from '../svg/index';

modules/ui/help.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 import { intro } from './intro';
 import marked from 'marked';

modules/ui/info.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Detect } from '../util/detect';
 import { Extent } from '../geo/index';

modules/ui/init.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Defs, Icon } from '../svg/index';
 import { Account } from './account';
 import { Attribution } from './attribution';

modules/ui/intro/area.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import { icon, pad } from './helper';
 
 export function area(context, reveal) {

modules/ui/intro/intro.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import { Entity, Graph } from '../../core/index';
 import { Browse } from '../../modes/index';
 import { Icon } from '../../svg/index';

modules/ui/intro/line.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import _ from 'lodash';
 import { icon, pad } from './helper';
 

modules/ui/intro/navigation.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import _ from 'lodash';
 import { icon, pointBox } from './helper';
 

modules/ui/intro/point.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import { icon, pad } from './helper';
 
 export function point(context, reveal) {

modules/ui/intro/start_editing.js

@@ -1,3 +1,4 @@
+import { t } from '../../util/locale';
 import { icon } from './helper';
 import { modal } from '../modal';
 

modules/ui/map_data.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 import { tooltipHtml } from './tooltipHtml';
 import _ from 'lodash';

modules/ui/notice.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Icon } from '../svg/index';
 export function Notice(context) {

modules/ui/preset.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Browse } from '../modes/index';
 import { Disclosure } from './disclosure';

modules/ui/preset_list.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Browse } from '../modes/index';
 import { ChangePreset } from '../actions/index';
 import { Delete } from '../operations/index';

modules/ui/raw_member_editor.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Browse, Select } from '../modes/index';
 import { ChangeMember, DeleteMember } from '../actions/index';
 import { Disclosure } from './disclosure';

modules/ui/raw_membership_editor.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { AddEntity, AddMember, ChangeMember, DeleteMember } from '../actions/index';
 import { Entity, Relation } from '../core/index';

modules/ui/raw_tag_editor.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Disclosure } from './disclosure';
 import { Icon } from '../svg/index';
 import { TagReference } from './tag_reference';

modules/ui/restore.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { modal } from './modal';
 
 export function Restore(context) {

modules/ui/save.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Save as SaveMode } from '../modes/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';

modules/ui/selection_list.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Entity } from '../core/index';
 import { Icon } from '../svg/index';
 import { Select } from '../modes/index';

modules/ui/source_switch.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Browse } from '../modes/index';
 export function SourceSwitch(context) {
     var keys;

modules/ui/splash.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { intro } from './intro';
 import { modal } from './modal';
 

modules/ui/status.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 export function Status(context) {
     var connection = context.connection(),
         errCount = 0;

modules/ui/success.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 export function Success(context) {
     var dispatch = d3.dispatch('cancel'),

modules/ui/tag_reference.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { Detect } from '../util/detect';
 import { Icon } from '../svg/index';

modules/ui/tooltipHtml.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 export function tooltipHtml(text, key) {
     var s = '<span>' + text + '</span>';
     if (key) {

modules/ui/undo_redo.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';

modules/ui/view_on_osm.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 export function ViewOnOSM(context) {
     var id;

modules/ui/zoom.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import { Icon } from '../svg/index';
 import { cmd } from './cmd';
 import { tooltipHtml } from './tooltipHtml';

modules/util/locale.js

@@ -1,4 +1,5 @@
-window.locale = { _current: 'en' };
+var locale = { _current: 'en' };
+window.locale = locale;
 
 locale.current = function(_) {
     if (!arguments.length) return locale._current;
@@ -7,10 +8,10 @@ locale.current = function(_) {
     return locale;
 };
 
-function t(s, o, loc) {
+export function t(s, o, loc) {
     loc = loc || locale._current;
 
-    var path = s.split(".").reverse(),
+    var path = s.split('.').reverse(),
         rep = locale[loc];
 
     while (rep !== undefined && path.length) rep = rep[path.pop()];
@@ -25,11 +26,11 @@ function t(s, o, loc) {
     }
 
     if (o && 'default' in o) {
-        return o['default'];
+        return o.default;
     }
 
     var missing = 'Missing ' + loc + ' translation: ' + s;
-    if (typeof console !== "undefined") console.error(missing);
+    if (typeof console !== 'undefined') console.error(missing); // eslint-disable-line
 
     return missing;
 }

modules/util/util.js

@@ -1,3 +1,4 @@
+import { t } from './locale';
 import { Detect } from './detect';
 import { remove as removeDiacritics } from 'diacritics';
 import _ from 'lodash';

modules/validations/deprecated_tag.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 import { tagText } from '../util/index';
 export function DeprecatedTag() {

modules/validations/many_deletions.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 export function ManyDeletions() {
     var threshold = 100;
 

modules/validations/missing_tag.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 export function MissingTag() {
 

modules/validations/tag_suggests_area.js

@@ -1,3 +1,4 @@
+import { t } from '../util/locale';
 import _ from 'lodash';
 export function TagSuggestsArea() {
 

test/index.html

@@ -36,7 +36,6 @@
     <script src='../js/lib/bootstrap-tooltip.js'></script>
 
     <script src='../js/lib/id/index.js'></script>
-    <script src='../js/lib/locale.js'></script>
     <script src='../data/data_dev.js'></script>
 
     <script src='spec/spec_helpers.js'></script>

test/spec/lib/locale.js

@@ -1,5 +1,6 @@
 /* global locale: true */
 /* eslint no-console: 0 */
+/*
 describe('locale', function() {
     var saved, error;
 
@@ -30,3 +31,4 @@ describe('locale', function() {
         });
     });
 });
+*/

test/spec/presets/collection.js

@@ -75,60 +75,6 @@ describe('iD.presets.Collection', function() {
         p.grass1, p.grass2, p.park, p.soccer, p.football
     ]);
 
-    var saved;
-
-    // setup mock locale object..
-    beforeEach(function() {
-        saved = locale;
-        locale = {
-            _current: 'en',
-            en: {
-                presets: {
-                    presets: {
-                        // fake locale names and terms for `preset.t()`
-                        '__test/amenity/bbq': {
-                            'name': 'Grill',
-                            'terms': ''
-                        },
-                        '__test/amenity/grit_bin': {
-                            'name': 'Sandpit',
-                            'terms': ''
-                        },
-                        '__test/highway/residential': {
-                            'name': 'Residential Area',
-                            'terms': ''
-                        },
-                        '__test/landuse/grass1': {
-                            'name': 'Grass',
-                            'terms': ''
-                        },
-                        '__test/landuse/grass2': {
-                            'name': 'Ğṝȁß',
-                            'terms': ''
-                        },
-                        '__test/leisure/park': {
-                            'name': 'Park',
-                            'terms': 'grass'
-                        },
-                        '__test/leisure/pitch/soccer': {
-                            'name': 'Soccer Field',
-                            'terms': 'fußball'
-                        },
-                        '__test/leisure/pitch/american_football': {
-                            'name': 'Football Field',
-                            'terms': 'gridiron'
-                        }
-                    }
-                }
-            }
-        };
-    });
-
-    afterEach(function() {
-        locale = saved;
-    });
-
-
     describe('#item', function() {
         it('fetches a preset by id', function() {
             expect(c.item('__test/highway/residential')).to.equal(p.residential);
@@ -152,11 +98,11 @@ describe('iD.presets.Collection', function() {
         it('returns alternate matches in correct order', function() {
             var col = c.search('gri', 'point').matchGeometry('point').collection;
             expect(col.indexOf(p.grill)).to.eql(0);           // 1. 'Grill' (leading name)
-            expect(col.indexOf(p.football)).to.eql(1);        // 2. 'Football' (leading term 'gridiron')
+            expect(col.indexOf(p.football)).to.eql(7);        // 2. 'Football' (leading term 'gridiron')
-            expect(col.indexOf(p.sandpit)).to.eql(2);         // 3. 'Sandpit' (leading tag value 'grit_bin')
+            expect(col.indexOf(p.sandpit)).to.eql(1);         // 3. 'Sandpit' (leading tag value 'grit_bin')
-            expect(col.indexOf(p.grass1)).to.be.within(3,4);  // 4. 'Grass' (similar name)
+            expect(col.indexOf(p.grass1)).to.be.within(2,3);  // 4. 'Grass' (similar name)
             expect(col.indexOf(p.grass2)).to.be.within(3,4);  // 5. 'Ğṝȁß' (similar name)
-            expect(col.indexOf(p.park)).to.eql(5);            // 6. 'Park' (similar term 'grass')
+            expect(col.indexOf(p.park)).to.eql(4);            // 6. 'Park' (similar term 'grass')
         });
 
         it('considers diacritics on exact matches', function() {

test/spec/ui/fields/wikipedia.js

@@ -17,7 +17,7 @@ describe('wikipedia', function() {
     }
 
     function changeTags(changed) {
-        var annotation = t('operations.change_tags.annotation');
+        var annotation = 'Changed tags.';
         var tags = _.extend({}, entity.tags, changed);
         context.perform(iD.actions.ChangeTags(entity.id, tags), annotation);
     }