fix(translations): updated field label and corrected default baseUrl (#…

…693)
dhis2 · May 21, 2019 · a8a697e · a8a697e
1 parent 5ec642d
commit a8a697e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/i18n/i18n_module_en.properties b/src/i18n/i18n_module_en.properties
@@ -2235,7 +2235,7 @@ bidirectional=Bidirectional
 from_to_name=Relationship name seen from initiating entity
 to_from_name=Relationship name seen from receiving entity
 enable_user_assignment=Allow user assignment of events
-output_combo=Output category combo
+output_combo=Output category option combo
 output_combo_loading=Loading category combo options...
 output_combo_error=Could not load category combo options
 stage_save_hint_text=An updated program stage is not saved until the program itself is saved. Not saving the program will discard all changes made to the program stage.

diff --git a/webpack.config.js b/webpack.config.js
@@ -23,7 +23,7 @@ try {
     console.warn(`\nWARNING! Failed to load DHIS config:`, e.message);
     console.info('Using default config');
     dhisConfig = {
-        baseUrl: 'http://localhost:8080/dhis',
+        baseUrl: 'http://localhost:8080',
         authorization: 'Basic YWRtaW46ZGlzdHJpY3Q=', // admin:district
     };
 }