Merge branch 'develop' of https://github.com/libremesh/lime-app into …

…develop

i18n/generic.json

@@ -6,19 +6,31 @@
     "applying_changes_the_system_takes_a_minute_to_get__189a700d": "Applying changes. The system takes a minute to get back online.",
     "back_to_base_443797cb": "Back to base",
     "base_host_a17d45a4": "Base Host",
+    "cancel_caeb1e68": "Cancel",
     "change_dcaa253a": "Change",
+    "checking_connection_863b319e": "Checking connection",
+    "choose_a_name_for_this_node_f491aa8d": "Choose a name for this node",
+    "choose_a_name_for_your_network_69df41e3": "Choose a name for your network",
+    "community_name_115a617": "Community name",
     "config_4877f466": "Config",
+    "configure_your_network_7736471d": "Configure your network",
+    "configure_your_new_community_network_a6daad12": "Configure your new community network",
+    "congratulations_ffe43bf9": "Congratulations",
     "connected_host_91e11459": "Connected Host",
     "connection_fail_57f84354": "Connection fail",
+    "create_network_d229d642": "Create network",
+    "create_new_network_28805f92": "Create new network",
     "current_status_830c5a75": "Current status",
     "from_fdd4956d": "From",
     "full_path_metrics_2859608f": "Full path metrics",
     "ground_routing_12ab04c9": "Ground Routing",
     "ground_routing_configuration_3f4fa9c1": "Ground Routing configuration",
+    "host_name_d865cef3": "Host name",
     "interface_177dac54": "Interface",
     "interfaces_44f8a99c": "Interfaces",
     "internet_connection_fda60ffa": "Internet connection",
     "ip_addresses_440ac240": "IP Addresses",
+    "join_the_mesh_653219c6": "Join the mesh",
     "load_last_known_internet_path_677f6229": "load_last_known_internet_path",
     "loading_node_status_547ed318": "Loading node status...",
     "locate_5f6685db": "Locate",
@@ -28,25 +40,47 @@
     "metrics_status_path_905a8d22": "metrics_status_path",
     "metrics_status_stations_464641e8": "metrics_status_stations",
     "most_active_2d5a3cae": "Most Active",
+    "must_select_a_network_and_a_name_5226b9a6": "Must select a network and a name",
+    "no_network_found_try_realigning_your_node_and_resc_176a9b3e": "No network found, try realigning your node and rescanning.",
     "notes_c42e0fd5": "Notes",
     "notes_of_a44a4158": "Notes of",
+    "ok_ff1b646a": "Ok",
     "only_gateway_727b1656": "Only gateway",
     "packet_loss_1afe48a8": "Packet loss",
+    "please_configure_your_network_d6eb8b76": "Please configure your network",
+    "please_wait_62914c7c": "Please wait",
     "reload_3e45154f": "Reload",
+    "reload_page_2d381199": "Reload page",
+    "rescan_dff042fc": "Rescan",
     "save_notes_616850ea": "Save notes",
+    "scan_for_existing_networks_f7f485c": "Scan for existing networks",
+    "scanning_for_existing_networks_195ddb9b": "Scanning for existing networks",
+    "seconds_aee2098": "seconds",
+    "select_a_network_to_join_b7040672": "Select a network to join",
     "select_new_base_station_3652ae73": "Select new base station",
+    "select_one_b647b384": "Select one",
+    "set_network_bcd0ea96": "Set network",
+    "setting_network_21ebac51": "Setting network",
     "station_75bce853": "Station",
     "station_ip_v4_3158a957": "Station IP v4",
     "station_name_7d67417c": "Station name",
     "stations_18122820": "Stations",
     "status_e7fdbe06": "Status",
     "system_55b0ca91": "System",
     "this_node_does_not_see_other_nodes_in_the_network_f281b047": "This node does not see other nodes in the network.",
+    "this_node_is_not_compatible_with_limeapp_f241477d": "This node is not compatible with LimeApp",
+    "this_node_is_the_gateway_1e20aaff": "This node is the gateway",
     "to_internet_494eb85c": "To Internet",
     "traffic_bfe536d2": "Traffic",
     "try_thisnode_info_1ee1bfe2": "Try thisnode.info",
     "trying_to_connect_ff82bf9f": "Trying to connect",
     "uptime_c1d2415d": "Uptime",
-    "you_don_t_have_a_location_please_select_one_2d10649": "You don't have a location, please select one"
+    "you_are_connected_to_another_node_in_the_network_t_a423710a": "You are connected to another node in the network, try connecting to",
+    "you_are_now_part_of_90f2585a": "You are now part of ",
+    "you_can_search_for_mesh_networks_around_you_to_add_e6fbf1c5": "You can search for mesh networks around you to add or to create a new one.",
+    "you_don_t_go_through_any_paths_to_get_here_25203ed3": "You don't go through any paths to get here.",
+    "you_don_t_have_a_location_please_select_one_2d10649": "You don't have a location, please select one",
+    "you_have_successfuly_connected_to_ddb8c613": "You have successfuly connected to",
+    "your_router_has_not_yet_been_configured_you_can_us_2b40cea3": "Your router has not yet been configured, \n\t\t\t\t\tyou can use our wizard to incorporate it into an existing network or create a new one.\n\t\t\t\t\tIf you ignore this message it will continue to work with the default configuration."
   }
 }

i18n/translations/es.json

@@ -52,6 +52,40 @@
     "station_ip_v4_3158a957": "IP v4",
     "station_name_7d67417c": "Nombre del nodo",
     "you_don_t_have_a_location_please_select_one_2d10649": "El nodo no tiene una ubicación asignada, selecciona una",
-    "this_node_does_not_see_other_nodes_in_the_network_f281b047": "Este nodo no ve a ningún otro nodo la red"
+    "this_node_does_not_see_other_nodes_in_the_network_f281b047": "Este nodo no ve a ningún otro nodo la red",
 
+    "cancel_caeb1e68": "Cancelar",
+   "checking_connection_863b319e": "Comprobando conexión",
+   "choose_a_name_for_this_node_f491aa8d": "Elije el nombre para el nodo",
+   "choose_a_name_for_your_network_69df41e3": "Elije el nombre para la red",
+   "community_name_115a617": "Nombre de la comunidad",
+   "configure_your_network_7736471d": "Configure su red",
+   "configure_your_new_community_network_a6daad12": "Configure su nueva red mesh",
+   "congratulations_ffe43bf9": "Felicitaciones",
+   "create_network_d229d642": "Crear red",
+   "create_new_network_28805f92": "Crear nueva red",
+   "host_name_d865cef3": "Nombre del nodo",
+   "join_the_mesh_653219c6": "Unirse a la red",
+   "must_select_a_network_and_a_name_5226b9a6": "Ingrese el nombre de red y de nodo",
+   "no_network_found_try_realigning_your_node_and_resc_176a9b3e": "No se encontraron redes, intente alinear el nodo y volver a escanear",
+   "please_wait_62914c7c": "Por favor espere",
+   "reload_page_2d381199": "Recargar página",
+   "rescan_dff042fc": "Volver a escanear",
+   "scan_for_existing_networks_f7f485c": "Buscar redes existentes",
+   "scanning_for_existing_networks_195ddb9b": "Buscando redes existentes",
+   "seconds_aee2098": "segundos",
+   "select_a_network_to_join_b7040672": "Seleccione una red a la que sumarse",
+   "select_one_b647b384": "Seleccionar una",
+   "set_network_bcd0ea96": "Sumarse a la red",
+   "setting_network_21ebac51": "Configurando red",
+   "this_node_is_not_compatible_with_limeapp_f241477d": "No se puede utilizar LiMeApp en este nodo",
+   "this_node_is_the_gateway_1e20aaff": "Este nodo es el gateway",
+   "you_are_connected_to_another_node_in_the_network_t_a423710a": "Está conectado a otro nodo de la red, intente conectarse a",
+   "you_are_now_part_of_90f2585a": "Usted es ahora parte de",
+   "you_can_search_for_mesh_networks_around_you_to_add_e6fbf1c5": "Puede buscar redes cercanas para sumarse o crear una nueva",
+   "you_don_t_go_through_any_paths_to_get_here_25203ed3": "No necesitas pasar por ningún nodo para llega hasta aquí",
+   "you_have_successfuly_connected_to_ddb8c613": "La conexión fué exitosa, está en la red",
+   "please_configure_your_network_d6eb8b76":"Por favor configure su conexión de red",
+   "your_router_has_not_yet_been_configured_you_can_us_2b40cea3":"Su router aún no ha sido configurado, puede utilizar nuestro asistente para incorporarlo a una red existente o crear una nueva. Si ignora este mensaje, continuará funcionando con la configuración predeterminada.",
+   "ok_ff1b646a": "Ok"
 }

plugins/lime-plugin-fbw/src/epics.js

@@ -2,6 +2,8 @@ import 'rxjs/add/operator/mergeMap';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/catch';
 
+import I18n from 'i18n-js';
+
 import {
 	searchNetworks,
 	getStatus,
@@ -50,10 +52,10 @@ const _showBanner = ( action$, state$, { wsAPI } ) =>
 	action$.ofType(...[FBW_STATUS_SUCCESS])
 		.map(action => (action.payload.lock && state$.value.firstbootwizard.status === null)?
 			{ type: BANNER_SET, payload: {
-				title: 'Please configure your network',
-				description: `Your router has not yet been configured, 
+				title: I18n.t('Please configure your network'),
+				description: I18n.t(`Your router has not yet been configured, 
 					you can use our wizard to incorporate it into an existing network or create a new one.
-					If you ignore this message it will continue to work with the default configuration.`,
+					If you ignore this message it will continue to work with the default configuration.`),
 				onOk: { type: 'GO_FBW' },
 				onCancel: { type: BANNER_HIDE }
 			} }: { type: '_' }

src/components/banner/index.js

@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 import { connect } from 'preact-redux';
 import style from './style';
-
+import I18n from 'i18n-js';
 class Banner extends Component {
 
 	onOk(){
@@ -35,8 +35,8 @@ class Banner extends Component {
 			>
 				<h3>{this.props.banner.title}</h3>
 				{this.props.banner.description? <p style={{ maxWidth: '400px', margin: '20px auto' }}>{this.props.banner.description}</p>: false}
-				<button onClick={this.onOk}>Ok</button>
-				<button onClick={this.onCancel}>Cancel</button>
+				<button onClick={this.onOk}>{I18n.t('Ok')}</button>
+				<button onClick={this.onCancel}>{I18n.t('Cancel')}</button>
 			</div>
 		): false;
 	}