Merge pull request #90 from emattias/issue87

Make i18n strings overridable via Tablesaw object

Gruntfile.js

@@ -26,9 +26,6 @@ module.exports = function(grunt) {
 		concat: {
 			options: {
 				banner: '<%= banner %>',
-				process: {
-					data: grunt.file.readJSON('src/i18n.json')
-				},
 				stripBanners: true
 			},
 			jsall: {

src/tables.columntoggle.js

@@ -21,11 +21,6 @@
 			toolbar: 'tablesaw-bar'
 		};
 
-		this.i18n = {
-			columnBtnText: '<%= columntoggle.buttonText %>',
-			columnsDialogError: '<%= columntoggle.dialogError %>'
-		};
-
 		// Expose headers and allHeaders properties on the widget
 		// headers references the THs within the first TR in the table
 		this.headers = this.$table.find( 'tr:first > th' );
@@ -49,7 +44,7 @@
 		id = tableId + "-popup";
 		$btnContain = $( "<div class='" + this.classes.columnBtnContain + "'></div>" );
 		$menuButton = $( "<a href='#" + id + "' class='btn btn-micro " + this.classes.columnBtn +"' data-popup-link>" +
-										"<span>" + this.i18n.columnBtnText + "</span></a>" );
+										"<span>" + Tablesaw.i18n.columnBtnText + "</span></a>" );
 		$popup = $( "<div class='dialog-table-coltoggle " + this.classes.popup + "' id='" + id + "'></div>" );
 		$menu = $( "<div class='btn-group'></div>" );
 
@@ -72,7 +67,7 @@
 		});
 
 		if( !hasNonPersistentHeaders ) {
-			$menu.append( '<label>' + this.i18n.columnsDialogError + '</label>' );
+			$menu.append( '<label>' + Tablesaw.i18n.columnsDialogError + '</label>' );
 		}
 
 		$menu.appendTo( $popup );

src/tables.js

@@ -8,7 +8,15 @@
 */
 
 if( typeof Tablesaw === "undefined" ) {
-	Tablesaw = {};
+	Tablesaw = {
+		i18n: {
+			modes: [ 'Stack', 'Swipe', 'Toggle' ],
+			columns: 'Col<span class=\"a11y-sm\">umn</span>s',
+			columnBtnText: 'Columns',
+			columnsDialogError: 'No eligible columns.',
+			sort: 'Sort'
+		}
+	};
 }
 if( !Tablesaw.config ) {
 	Tablesaw.config = {};

src/tables.modeswitch.js

@@ -19,17 +19,13 @@
 			toolbar: 'tablesaw-toolbar'
 		},
 		modes: [ 'stack', 'swipe', 'columntoggle' ],
-		i18n: {
-			modes: [ '<%= modeswitch.stack %>', '<%= modeswitch.swipe %>', '<%= modeswitch.columntoggle %>' ],
-			columns: '<%= modeswitch.columns %>'
-		},
 		init: function( table ) {
 			var $table = $( table ),
 				ignoreMode = $table.attr( S.attributes.excludeMode ),
 				$toolbar = $table.prev( '.tablesaw-bar' ),
 				modeVal = '',
 				$switcher = $( '<div>' ).addClass( S.classes.main + ' ' + S.classes.toolbar ).html(function() {
-					var html = [ '<label>' + S.i18n.columns + ':' ],
+					var html = [ '<label>' + Tablesaw.i18n.columns + ':' ],
 						dataMode = $table.attr( 'data-tablesaw-mode' ),
 						isSelected;
 
@@ -47,7 +43,7 @@
 
 						html.push( '<option' +
 							( isSelected ? ' selected' : '' ) +
-							' value="' + S.modes[ j ] + '">' + S.i18n.modes[ j ] + '</option>' );
+							' value="' + S.modes[ j ] + '">' + Tablesaw.i18n.modes[ j ] + '</option>' );
 					}
 					html.push( '</select></span></label>' );
 

src/tables.sortable.js

@@ -32,9 +32,6 @@
 			tableToolbar: 'tablesaw-toolbar',
 			sortButton: pluginName + "-btn"
 		},
-		i18n = {
-			sort: '<%= sort.label %>'
-		},
 		methods = {
 			_create: function( o ){
 				return $( this ).each(function() {
@@ -113,7 +110,7 @@
 					},
 					addSwitcher = function( heads ){
 						$switcher = $( '<div>' ).addClass( classes.switcher ).addClass( classes.tableToolbar ).html(function() {
-							var html = [ '<label>' + i18n.sort + ':' ];
+							var html = [ '<label>' + Tablesaw.i18n.sort + ':' ];
 
 							html.push( '<span class="btn btn-small">&#160;<select>' );
 							heads.each(function( j ) {