dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32090
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16403: PT DV client side i18n.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16403 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-08-13 16:37:24 +0200
message:
PT DV client side i18n.
removed:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json
added:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n/
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n/en.json
renamed:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n/i18n_en.json => dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n/en.json
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json 2014-08-11 15:07:49 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json 1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
-[
-"dimensions",
-"row",
-"column",
-"filter",
-"table_layout",
-"show_subtotals",
-"hide_empty_rows",
-"display_density",
-"font_size",
-"digit_group_separator",
-"comfortable",
-"compact",
-"large",
-"small_",
-"normal",
-"reporting_period",
-"organisation_unit",
-"organisation_units",
-"parent_organisation_unit",
-"user_organisation_unit",
-"user_organisation_unit_children",
-"table_options",
-"create",
-"update",
-"cancel",
-"delete_",
-"save",
-"hide",
-"add_new",
-"manage_favorites",
-"search_for_favorites",
-"overwrite_favorite",
-"delete_favorite",
-"prev",
-"next",
-"rename",
-"overwrite",
-"share_with_other_people",
-"sharing_settings",
-"can_view",
-"can_edit_and_view",
-"none",
-"public_access",
-"search_for_user_groups",
-"available",
-"selected",
-"indicators",
-"all_indicator_groups",
-"select_indicator_group",
-"data_elements",
-"all_data_element_groups",
-"select_data_element_group",
-"data_sets",
-"reporting_rates",
-"periods",
-"select_period_type",
-"weeks",
-"last_week",
-"last_4_weeks",
-"last_12_weeks",
-"months",
-"last_month",
-"last_3_months",
-"last_12_months",
-"bimonths",
-"last_bimonth",
-"last_6_bimonths",
-"quarters",
-"last_quarter",
-"last_4_quarters",
-"sixmonths",
-"last_sixmonth",
-"last_2_sixmonths",
-"years",
-"this_year",
-"last_year",
-"last_5_years",
-"financial_years",
-"last_financial_year",
-"last_5_financial_years",
-"prev_year",
-"next_year",
-"select_all_children",
-"table",
-"chart",
-"map",
-"home",
-"data",
-"categories",
-"style",
-"parameters",
-"for_standard_reports_only",
-"please_create_a_table_first",
-"indicators_cannot_be_specified_as_filter",
-"categories_cannot_be_specified_as_filter",
-"data_element_group_sets_cannot_be_specified_together_with_data_sets",
-"at_least_one_dimension_must_be_specified_as_row_or_column",
-"at_least_one_period_must_be_specified_as_column_row_or_filter",
-"example1",
-"example2",
-"example3",
-"example4",
-"example5",
-"example6",
-"example7",
-"example8",
-"layout",
-"options",
-"download",
-"favorites",
-"include_regression",
-"include_cumulative",
-"sort_order",
-"low_to_high",
-"high_to_low",
-"top_limit",
-"plain_data_sources",
-"graphics",
-"data_sets_cannot_be_specified_as_filter",
-"share",
-"interpretation",
-"write_your_interpretation",
-"legend_set",
-"select_organisation_units",
-"select_boundaries_and_levels",
-"select_organisation_unit_levels",
-"totals",
-"details",
-"select_boundaries_and_groups",
-"select_organisation_unit_groups",
-"user_organisation_unit_grandchildren",
-"allow_external_access",
-"show_hierarchy",
-"all_indicators",
-"all_data_elements",
-"daily",
-"weekly",
-"monthly",
-"bimonthly",
-"quarterly",
-"sixmonthly",
-"sixmonthly_april",
-"yearly",
-"financial_oct",
-"financial_july",
-"financial_april",
-"plugin_config",
-"default_",
-"aggregation_type",
-"count",
-"sum",
-"min",
-"max",
-"by_data_element",
-"stddev",
-"variance",
-"go_to_charts",
-"open_this_table_as_chart",
-"open_last_chart",
-"go_to_maps",
-"open_this_table_as_map",
-"open_last_map",
-"show_row_totals",
-"show_col_totals",
-"assigned_categories"
-]
=== renamed file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n/i18n_en.json' => 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n/en.json'
=== added directory 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n'
=== removed file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json 2014-08-11 15:32:26 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json 1970-01-01 00:00:00 +0000
@@ -1,230 +0,0 @@
-[
-"title",
-"chart_type",
-"column_chart",
-"stacked_column_chart",
-"bar_chart",
-"stacked_bar_chart",
-"line_chart",
-"area_chart",
-"pie_chart",
-"series",
-"category",
-"filter",
-"example_chart",
-"loading",
-"no_data",
-"value",
-"indicators",
-"select_group",
-"data_elements",
-"all_indicator_groups",
-"available",
-"selected",
-"periods",
-"months",
-"last_month",
-"last_12_months",
-"quarters",
-"last_quarter",
-"last_4_quarters",
-"six_months",
-"last_six_month",
-"last_two_six_month",
-"years",
-"last_year",
-"last_5_years",
-"organisation_units",
-"select_all_children",
-"chart_options",
-"png_only",
-"trend_line",
-"hide_subtitle",
-"hide_legend",
-"domain_axis_label",
-"range_axis_label",
-"target",
-"target_line_value",
-"target_line_label",
-"show_hide_chart_settings",
-"update",
-"data_table",
-"favorites",
-"manage_favorites",
-"save_favorite",
-"sort_by",
-"system",
-"name",
-"last_updated",
-"rename",
-"rename_favorite",
-"cancel",
-"name_already_in_use",
-"delete_object",
-"delete_favorite",
-"are_you_sure",
-"save",
-"create_chart_before_saving",
-"overwrite",
-"download",
-"no_svg_format",
-"image_png",
-"hide_data_table",
-"saving",
-"renaming",
-"deleting",
-"data",
-"indicator",
-"data_element",
-"period",
-"organisation_unit",
-"system_favorite_overwrite_not_allowed",
-"favorite_no_orgunits",
-"this_year",
-"trend",
-"chart_options",
-"dataset",
-"datasets",
-"reporting_rates",
-"base_line_value",
-"base_line_label",
-"base",
-"group_sets",
-"none",
-"et_no_data",
-"em_no_data",
-"et_invalid_dimension_setup",
-"em_invalid_dimension_setup",
-"et_no_indicators_dataelements_datasets",
-"em_no_indicators_dataelements_datasets",
-"et_no_periods",
-"em_no_periods",
-"et_no_orgunits",
-"em_no_orgunits",
-"et_no_orgunitgroups",
-"em_no_orgunitgroups",
-"et_line_area_categories",
-"em_line_area_categories",
-"et_invalid_uid",
-"em_invalid_uid",
-"et_svg_browser",
-"em_svg_browser",
-"wm_trendline_deactivated",
-"wm_targetline_deactivated",
-"wm_baseline_deactivated",
-"wm_not_applicable",
-"wm_stacked_chart",
-"wm_pie_chart",
-"wm_required_categories",
-"wm_multiple_filter_ind_de_ds",
-"wm_multiple_filter_period",
-"wm_multiple_filter_orgunit",
-"wm_multiple_filter_groups",
-"wm_first_filter_used",
-"show_data",
-"share",
-"interpretation",
-"write_your_interpretation",
-"interpretation_was_shared",
-"save_load_favorite_before_sharing",
-"create_chart_before_datatable",
-"organisation_unit_groups",
-"groups_replace_orgunits",
-"fixed_periods",
-"relative_periods",
-"periods",
-"select_type",
-"last_3_months",
-"show_values",
-"select_indicator_group",
-"select_data_element_group",
-"table",
-"chart",
-"map",
-"home",
-"table_options",
-"style",
-"select_period_type",
-"weeks",
-"last_week",
-"last_4_weeks",
-"last_12_weeks",
-"bimonths",
-"last_bimonth",
-"last_6_bimonths",
-"sixmonths",
-"last_sixmonth",
-"last_2_sixmonths",
-"financial_years",
-"last_financial_year",
-"last_5_financial_years",
-"prev_year",
-"next_year",
-"user_organisation_unit",
-"user_organisation_unit_children",
-"user_organisation_unit_grandchildren",
-"filters",
-"at_least_one_dimension_must_be_specified_as_row_or_column",
-"at_least_one_period_must_be_specified_as_column_row_or_filter",
-"indicators_cannot_be_specified_as_filter",
-"all_data_element_groups",
-"hide",
-"layout",
-"options",
-"download",
-"favorites",
-"chart_title",
-"hide_chart_title",
-"search_for_favorites",
-"overwrite_favorite",
-"please_create_a_table_first",
-"delete_",
-"share_with_other_people",
-"totals",
-"details",
-"prev",
-"next",
-"create",
-"add_new",
-"can_view",
-"can_edit_and_view",
-"search_for_user_groups",
-"public_access",
-"detailed_data_elements_cannot_be_specified_as_filter",
-"plain_data_sources",
-"graphics",
-"sharing_settings",
-"select_organisation_units",
-"select_boundaries_and_levels",
-"select_organisation_unit_levels",
-"radar_chart",
-"select_boundaries_and_groups",
-"select_organisation_unit_groups",
-"user_organisation_unit_grandchildren",
-"allow_external_access",
-"daily",
-"weekly",
-"monthly",
-"bimonthly",
-"quarterly",
-"sixmonthly",
-"sixmonthly_april",
-"yearly",
-"financial_oct",
-"financial_july",
-"financial_april",
-"all_indicators",
-"all_data_elements",
-"hide_empty_category_items",
-"axes",
-"general",
-"go_to_pivot_tables",
-"open_this_chart_as_pivot_table",
-"open_last_pivot_table",
-"go_to_maps",
-"open_this_chart_as_map",
-"open_last_map",
-"dimensions",
-"table_layout",
-"assigned_categories"
-]
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n/en.json 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n/en.json 2014-08-13 14:12:10 +0000
@@ -0,0 +1,225 @@
+{
+ "cancel": "Cancel",
+ "can_edit_and_view": "Can edit and view",
+ "last_12_weeks": "Last 12 weeks",
+ "select_data_element_group": "Select data element group",
+ "prev": "Prev",
+ "show_hide_chart_settings": "Show/hide chart settings",
+ "bimonths": "Bi-months",
+ "at_least_one_period_must_be_specified_as_column_row_or_filter": "At least one period must be specified as column, row or filter",
+ "wm_stacked_chart": "stacked charts",
+ "fixed_periods": "Fixed periods",
+ "select_group": "Select group",
+ "last_two_six_month": "Last 2 six-months",
+ "overwrite": "Overwrite",
+ "renaming": "Renaming",
+ "last_updated": "Last updated",
+ "last_month": "Last month",
+ "indicators": "Indicators",
+ "sixmonthly_april": "Six-monthly April",
+ "save_load_favorite_before_sharing": "Please save or load a favorite before sharing",
+ "groups_replace_orgunits": "Note: Groups will replace the selected organisation units",
+ "open_this_chart_as_pivot_table": "Open this chart as pivot table",
+ "data_elements": "Data elements",
+ "interpretation": "interpretation",
+ "open_last_map": "Open last map",
+ "select_indicator_group": "Select indicator group",
+ "manage_favorites": "Manage favorites",
+ "weeks": "Weeks",
+ "go_to_pivot_tables": "Go to pivot tables",
+ "last_year": "Last year",
+ "select_type": "Select type",
+ "datasets": "Data sets",
+ "em_invalid_dimension_setup": "Please select series/category/filter dimensions.",
+ "rename_favorite": "Rename favorite",
+ "weekly": "Weekly",
+ "all_data_elements": "All data elements",
+ "no_svg_format": "No SVG format",
+ "last_bimonth": "Last bi-month",
+ "group_sets": "Group sets",
+ "table_options": "Table options",
+ "last_5_years": "Last 5 years",
+ "series": "Series",
+ "chart_options": "Chart options",
+ "data_table": "Data table",
+ "et_invalid_uid": "Invalid uid",
+ "bar_chart": "Bar chart",
+ "select_organisation_units": "Select organisation units",
+ "dataset": "Data set",
+ "chart": "Chart",
+ "delete_": "Delete",
+ "create_chart_before_datatable": "Please create a chart before showing the datatable",
+ "delete_favorite": "Delete favorite",
+ "next_year": "Next year",
+ "available": "Available",
+ "detailed_data_elements_cannot_be_specified_as_filter": "Detailed data elements cannot be specified as filter",
+ "financial_april": "Financial April",
+ "pie_chart": "Pie chart",
+ "graphics": "Graphics",
+ "area_chart": "Area chart",
+ "add_new": "Add new",
+ "chart_type": "Chart type",
+ "system_favorite_overwrite_not_allowed": "* You are not allowed to overwrite a system favorite",
+ "wm_trendline_deactivated": "Trend line deactivated",
+ "wm_targetline_deactivated": "Target line deactivated",
+ "em_invalid_uid": "Please provide a valid chart uid.",
+ "details": "Details",
+ "stacked_column_chart": "Stacked column chart",
+ "show_values": "Show values",
+ "example_chart": "Example chart",
+ "png_only": "For the PNG version only",
+ "relative_periods": "Relative periods",
+ "em_no_orgunitgroups": "Please add at least one organisation unit group.",
+ "bimonthly": "Bi-monthly",
+ "no_data": "No data",
+ "all_data_element_groups": "All data element groups",
+ "write_your_interpretation": "Write a comment, question or interpretation",
+ "select_boundaries_and_groups": "Select boundaries and groups",
+ "favorite_no_orgunits": "Favorite has no organisation units",
+ "name": "Name",
+ "wm_required_categories": "at least two categories required",
+ "sixmonthly": "Six-monthly",
+ "create_chart_before_saving": "Please create a chart before saving",
+ "em_no_data": "Please ensure that there is data stored in the database and that data mart has been run properly. ",
+ "yearly": "Yearly",
+ "hide_legend": "Hide chart legend",
+ "next": "Next",
+ "em_no_periods": "Please select at least one relative or fixed period.",
+ "et_svg_browser": "SVG not supported by browser",
+ "search_for_user_groups": "Search for user group",
+ "update": "Update",
+ "title": "DHIS 2 Data Visualizer",
+ "et_no_indicators_dataelements_datasets": "No data units selected",
+ "last_12_months": "Last 12 months",
+ "base_line_value": "Base line value",
+ "hide_data_table": "Hide data table",
+ "domain_axis_label": "Domain axis title",
+ "range_axis_label": "Range axis title",
+ "quarters": "Quarters",
+ "image_png": "Image",
+ "last_sixmonth": "Last six-month",
+ "filters": "Filters",
+ "target": "Target",
+ "home": "Home",
+ "layout": "Layout",
+ "reporting_rates": "Reporting rates",
+ "em_no_orgunits": "Please select at least one organisation unit.",
+ "wm_baseline_deactivated": "Base line deactivated",
+ "last_quarter": "Last quarter",
+ "base": "Base",
+ "sixmonths": "Six-months",
+ "trend": "Trend",
+ "hide_empty_category_items": "Hide empty category items",
+ "axes": "Axes",
+ "none": "None",
+ "years": "Years",
+ "stacked_bar_chart": "Stacked bar chart",
+ "prev_year": "Prev year",
+ "at_least_one_dimension_must_be_specified_as_row_or_column": "At least one dimension must be specified as row or column",
+ "share_with_other_people": "Share with other people",
+ "options": "Options",
+ "column_chart": "Column chart",
+ "select_all_children": "Select all children",
+ "are_you_sure": "Are you sure?",
+ "select_organisation_unit_groups": "Select organisation unit groups",
+ "period": "Period",
+ "wm_multiple_filter_ind_de_ds": "Multiple indicators/data elements/data sets selected as filter.",
+ "user_organisation_unit_grandchildren": "Org unit grand children",
+ "organisation_unit_groups": "Organisation unit groups",
+ "assigned_categories": "Assigned categories",
+ "organisation_units": "Organisation units",
+ "select_organisation_unit_levels": "Select organisation unit levels",
+ "show_data": "Show series data",
+ "all_indicators": "All indicators",
+ "loading": "Loading...",
+ "name_already_in_use": "* Name already in use",
+ "em_no_indicators_dataelements_datasets": "Please select at least one indicator, data element or data set.",
+ "saving": "Saving",
+ "system": "System",
+ "public_access": "Public access",
+ "organisation_unit": "Organisation unit",
+ "wm_not_applicable": "not applicable for",
+ "wm_multiple_filter_groups": "Multiple organisation unit groups selected as filter.",
+ "style": "Style",
+ "allow_external_access": "Allow external access",
+ "last_six_month": "Last six-month",
+ "save": "Save",
+ "target_line_label": "Target line label",
+ "select_period_type": "Select period type",
+ "quarterly": "Quarterly",
+ "last_4_weeks": "Last 4 weeks",
+ "delete_object": "Delete",
+ "wm_pie_chart": "pie charts",
+ "periods": "Periods",
+ "share": "Share",
+ "map": "Map",
+ "table": "Table",
+ "financial_july": "Financial July",
+ "open_this_chart_as_map": "Open this chart as map",
+ "all_indicator_groups": "All indicator groups",
+ "overwrite_favorite": "Overwrite favorite",
+ "filter": "Filter",
+ "hide": "Hide",
+ "deleting": "Deleting",
+ "rename": "Rename",
+ "go_to_maps": "Go to maps",
+ "target_line_value": "Target line value",
+ "dimensions": "Dimensions",
+ "indicator": "Indicator",
+ "et_no_periods": "No periods selected",
+ "et_no_orgunitgroups": "No organisation unit groups found",
+ "plain_data_sources": "Plain data source",
+ "data": "Data",
+ "last_6_bimonths": "Last 6 bi-months",
+ "sharing_settings": "Sharing settings",
+ "last_2_sixmonths": "Last 2 six-months",
+ "financial_years": "Financial years",
+ "save_favorite": "Save favorite",
+ "last_financial_year": "Last financial year",
+ "hide_subtitle": "Hide chart subtitle",
+ "interpretation_was_shared": "Interpretation was shared",
+ "download": "Download",
+ "last_3_months": "Last 3 months",
+ "et_no_data": "No data returned from server",
+ "search_for_favorites": "Search for favorites",
+ "et_invalid_dimension_setup": "Invalid dimension setup",
+ "create": "Create",
+ "radar_chart": "Radar chart",
+ "selected": "Selected",
+ "months": "Months",
+ "this_year": "This year",
+ "em_line_area_categories": "Please select at least two categories for line and area charts.",
+ "et_line_area_categories": "Not enough categories selected",
+ "six_months": "Six months",
+ "base_line_label": "Base line label",
+ "line_chart": "Line chart",
+ "daily": "Daily",
+ "monthly": "Monthly",
+ "open_last_pivot_table": "Open last pivot table",
+ "please_create_a_table_first": "Please create a chart first",
+ "trend_line": "Show trend lines",
+ "favorites": "Favorites",
+ "can_view": "Can view",
+ "hide_chart_title": "Hide chart title",
+ "chart_title": "Chart title",
+ "sort_by": "Sort by",
+ "wm_multiple_filter_orgunit": "Multiple organisation units selected as filter.",
+ "user_organisation_unit_children": "Org unit children",
+ "general": "General",
+ "em_svg_browser": "Please use Chrome, Firefox, Opera or Safari to export images.",
+ "data_element": "Data element",
+ "indicators_cannot_be_specified_as_filter": "Indicators cannot be specified as filter",
+ "financial_oct": "Financial October",
+ "wm_multiple_filter_period": "Multiple periods selected as filter.",
+ "select_boundaries_and_levels": "Select boundaries and levels",
+ "value": "Value",
+ "et_no_orgunits": "No organisation units selected",
+ "totals": "Totals",
+ "wm_first_filter_used": "The first one is being used.",
+ "last_5_financial_years": "Last 5 financial years",
+ "user_organisation_unit": "User org unit",
+ "category": "Category",
+ "last_week": "Last week",
+ "last_4_quarters": "Last 4 quarters",
+ "table_layout": "Table layout"
+}
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-11 15:32:26 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-13 14:12:10 +0000
@@ -5948,130 +5948,130 @@
success: function(r) {
init.contextPath = Ext.decode(r.responseText).activities.dhis.href;
- Ext.Ajax.request({
- url: 'i18n.json',
- success: function(r) {
- var i18nArray = Ext.decode(r.responseText);
-
- Ext.Ajax.request({
- url: init.contextPath + '/api/system/info.json',
- success: function(r) {
- var info = Ext.decode(r.responseText),
- dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
- defaultCalendarId = 'gregorian',
- calendarIdMap = {'iso8601': defaultCalendarId},
- calendarId = calendarIdMap[info.calendar] || info.calendar || defaultCalendarId,
- calendarIds = ['coptic', 'ethiopian', 'islamic', 'julian', 'nepali', 'thai'],
- calendarScriptUrl,
- createGenerator;
-
- // calendar
- init.dateFormat = info.dateFormat || 'yyyy-mm-dd';
-
- createGenerator = function() {
- init.calendar = $.calendars.instance(calendarId);
- init.periodGenerator = new dhis2.period.PeriodGenerator(init.calendar, init.dateFormat);
- };
-
- if (Ext.Array.contains(calendarIds, calendarId)) {
- calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
-
- Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
- Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);
- });
- }
- else {
+ // system info
+ Ext.Ajax.request({
+ url: init.contextPath + '/api/system/info.json',
+ success: function(r) {
+ var info = Ext.decode(r.responseText);
+
+ // context path
+ init.contextPath = info.contextPath || init.contextPath;
+
+ // calendars
+ init.dateFormat = info.dateFormat || 'yyyy-mm-dd';
+
+ (function() {
+ var dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
+ defaultCalendarId = 'gregorian',
+ calendarIdMap = {'iso8601': defaultCalendarId},
+ calendarId = calendarIdMap[info.calendar] || info.calendar || defaultCalendarId,
+ calendarIds = ['coptic', 'ethiopian', 'islamic', 'julian', 'nepali', 'thai'],
+ calendarScriptUrl,
+ createGenerator;
+
+ // calendar
+ createGenerator = function() {
+ init.calendar = $.calendars.instance(calendarId);
+ init.periodGenerator = new dhis2.period.PeriodGenerator(init.calendar, init.dateFormat);
+ };
+
+ if (Ext.Array.contains(calendarIds, calendarId)) {
+ calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
+
+ Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);
- }
-
- // context path
- init.contextPath = info.contextPath || init.contextPath;
-
- // i18n
- requests.push({
- url: init.contextPath + '/api/i18n?package=org.hisp.dhis.visualizer',
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'Accepts': 'application/json'
- },
- params: Ext.encode(i18nArray),
- success: function(r) {
- NS.i18n = Ext.decode(r.responseText);
- fn();
- }
- });
-
- // root nodes
- requests.push({
- url: init.contextPath + '/api/organisationUnits.json?userDataViewFallback=true&paging=false&fields=id,name,children[id,name]',
- success: function(r) {
- init.rootNodes = Ext.decode(r.responseText).organisationUnits || [];
- fn();
- }
- });
-
- // organisation unit levels
- requests.push({
- url: init.contextPath + '/api/organisationUnitLevels.json?fields=id,name,level&paging=false',
- success: function(r) {
- init.organisationUnitLevels = Ext.decode(r.responseText).organisationUnitLevels || [];
-
- if (!init.organisationUnitLevels.length) {
- alert('No organisation unit levels');
- }
-
- fn();
- }
- });
-
- // user orgunits and children
- requests.push({
- url: init.contextPath + '/api/organisationUnits.json?userOnly=true&fields=id,name,children[id,name]&paging=false',
- success: function(r) {
- var organisationUnits = Ext.decode(r.responseText).organisationUnits || [],
- ou = [],
- ouc = [];
-
- if (organisationUnits.length) {
- for (var i = 0, org; i < organisationUnits.length; i++) {
- org = organisationUnits[i];
-
- ou.push(org.id);
-
- if (org.children) {
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
- }
- }
-
- init.user = init.user || {};
- init.user.ou = ou;
- init.user.ouc = ouc;
- }
- else {
- alert('User is not assigned to any organisation units');
- }
-
- fn();
- }
- });
-
- // dimensions
- requests.push({
- url: init.contextPath + '/api/dimensions.json?links=false&paging=false',
- success: function(r) {
- init.dimensions = Ext.decode(r.responseText).dimensions || [];
- fn();
- }
- });
-
- for (var i = 0; i < requests.length; i++) {
- Ext.Ajax.request(requests[i]);
- }
- }
- });
- }
- });
+ });
+ }
+ else {
+ Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);
+ }
+ }());
+
+ // user info
+ requests.push({
+ url: init.contextPath + '/api/me/user-account.json',
+ success: function(r) {
+ init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || 'en';
+
+ // i18n
+ Ext.Ajax.request({
+ url: 'i18n/' + init.keyUiLocale + '.json',
+ success: function(r) {
+ NS.i18n = Ext.decode(r.responseText);
+ fn();
+ }
+ });
+ }
+ });
+
+ // root nodes
+ requests.push({
+ url: init.contextPath + '/api/organisationUnits.json?userDataViewFallback=true&paging=false&fields=id,name,children[id,name]',
+ success: function(r) {
+ init.rootNodes = Ext.decode(r.responseText).organisationUnits || [];
+ fn();
+ }
+ });
+
+ // organisation unit levels
+ requests.push({
+ url: init.contextPath + '/api/organisationUnitLevels.json?fields=id,name,level&paging=false',
+ success: function(r) {
+ init.organisationUnitLevels = Ext.decode(r.responseText).organisationUnitLevels || [];
+
+ if (!init.organisationUnitLevels.length) {
+ alert('No organisation unit levels');
+ }
+
+ fn();
+ }
+ });
+
+ // user orgunits and children
+ requests.push({
+ url: init.contextPath + '/api/organisationUnits.json?userOnly=true&fields=id,name,children[id,name]&paging=false',
+ success: function(r) {
+ var organisationUnits = Ext.decode(r.responseText).organisationUnits || [],
+ ou = [],
+ ouc = [];
+
+ if (organisationUnits.length) {
+ for (var i = 0, org; i < organisationUnits.length; i++) {
+ org = organisationUnits[i];
+
+ ou.push(org.id);
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
+ }
+
+ init.user = init.user || {};
+ init.user.ou = ou;
+ init.user.ouc = ouc;
+ }
+ else {
+ alert('User is not assigned to any organisation units');
+ }
+
+ fn();
+ }
+ });
+
+ // dimensions
+ requests.push({
+ url: init.contextPath + '/api/dimensions.json?links=false&paging=false',
+ success: function(r) {
+ init.dimensions = Ext.decode(r.responseText).dimensions || [];
+ fn();
+ }
+ });
+
+ for (var i = 0; i < requests.length; i++) {
+ Ext.Ajax.request(requests[i]);
+ }
+ }
+ });
}
});
}());
