Skip to content

Commit

Permalink
Merge pull request wso2#6251 from DilshanSenarath/pull-5634
Browse files Browse the repository at this point in the history
  • Loading branch information
pavinduLakshan authored May 14, 2024
2 parents dcc4d37 + e234460 commit ec043fa
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/lint-changed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GITHUB_PR_NUMBER=$1
ESLINT_SUPPORTED_EXT=(js jsx ts tsx)

# Excluding files that adhere to the specified patterns from the list of supported files.
PATHS_TO_EXCLUDE=("identity-apps-core/apps/**/*.js",".eslintrc.js")
PATHS_TO_EXCLUDE=("identity-apps-core/apps/**/*.js" ".eslintrc.js")

MAX_FILE_THRESHOLD_FOR_LINTER=30

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
<%@ page import="javax.servlet.http.HttpServletRequest" %>
<%@ page import="java.util.*" %>

<%-- TODO: UNIFICATION TASK: This block should be moved to a `locale-code-resolver.jsp` file. And used in `localize` as well. --%>
<%--
TODO: UNIFICATION TASK: This block should be moved to a `locale-code-resolver.jsp` file. And used in `localize` as well.
Tracked By: https://github.com/wso2/product-is/issues/20372
--%>
<%!
/**
* Get the user's preferred locale based on the request, cookies, and URL parameters.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,12 @@
}
Locale tempLocale = new Locale(langStr, langLocale);
// Trying to find out whether we have a resource bundle for the given locale
// Trying to find out whether we have a resource bundle for the given locale.
try {
ResourceBundle foundBundle = ResourceBundle.getBundle(BUNDLE, tempLocale);
// If so, setting the userLocale to that locale. If not, set the browser locale as user locale
// If the i18n bundle for the locale is found, set the userLocale to that locale. If not, set the
// browser locale as user locale.
// Currently, we only care about the language - we do not compare about country locales since our
// supported locale set is limited.
if (tempLocale.getLanguage().equals(foundBundle.getLocale().getLanguage())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -17,15 +17,15 @@
-->

<!--
This file defines class loading policy of the whole container. But this behaviour can be overridden by individual webapps by putting this file into the META-INF/ directory.
This file defines class loading policy of the whole container. But this behaviour can be overridden by individual webapps by putting this file into the META-INF/ directory.
-->
<Classloading xmlns="http://wso2.org/projects/as/classloading">

<!-- Parent-first or child-first. Default behaviour is child-first.-->
<ParentFirst>false</ParentFirst>

<!--
Default environments that contains provides to all the webapps. This can be overridden by individual webapps by specifing required environments
<!--
Default environments that contains provides to all the webapps. This can be overridden by individual webapps by specifing required environments
Tomcat environment is the default and every webapps gets it even if they didn't specify it.
e.g. If a webapps requires CXF, they will get both Tomcat and CXF.
-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
Expand Down Expand Up @@ -105,9 +105,9 @@
File headerFile = new File(getServletContext().getRealPath("extensions/header.jsp"));
if (headerFile.exists()) {
%>
<jsp:include page="extensions/header.jsp"/>
<jsp:include page="extensions/header.jsp"/>
<% } else { %>
<jsp:include page="includes/header.jsp"/>
<jsp:include page="includes/header.jsp"/>
<% } %>
<script src="js/scripts.js"></script>
<!--[if lt IE 9]>
Expand All @@ -123,9 +123,9 @@
File productTitleFile = new File(getServletContext().getRealPath("extensions/product-title.jsp"));
if (productTitleFile.exists()) {
%>
<jsp:include page="extensions/product-title.jsp"/>
<jsp:include page="extensions/product-title.jsp"/>
<% } else { %>
<jsp:include page="includes/product-title.jsp"/>
<jsp:include page="includes/product-title.jsp"/>
<% } %>
</layout:component>
<layout:component componentName="MainSection" >
Expand Down Expand Up @@ -172,9 +172,9 @@
File productFooterFile = new File(getServletContext().getRealPath("extensions/product-footer.jsp"));
if (productFooterFile.exists()) {
%>
<jsp:include page="extensions/product-footer.jsp"/>
<jsp:include page="extensions/product-footer.jsp"/>
<% } else { %>
<jsp:include page="includes/product-footer.jsp"/>
<jsp:include page="includes/product-footer.jsp"/>
<% } %>
</layout:component>
<layout:dynamicComponent filePathStoringVariableName="pathOfDynamicComponent">
Expand All @@ -187,9 +187,9 @@
File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp"));
if (footerFile.exists()) {
%>
<jsp:include page="extensions/footer.jsp"/>
<jsp:include page="extensions/footer.jsp"/>
<% } else { %>
<jsp:include page="includes/footer.jsp"/>
<jsp:include page="includes/footer.jsp"/>
<% } %>
</body>
</html>

0 comments on commit ec043fa

Please sign in to comment.