Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 68573200C42 for ; Sat, 25 Mar 2017 11:53:00 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6726E160B7B; Sat, 25 Mar 2017 10:53:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AD560160B9B for ; Sat, 25 Mar 2017 11:52:59 +0100 (CET) Received: (qmail 61792 invoked by uid 500); 25 Mar 2017 10:52:58 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 61749 invoked by uid 99); 25 Mar 2017 10:52:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Mar 2017 10:52:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 1F98D1A071C for ; Sat, 25 Mar 2017 10:52:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id rr6__xMzfkWk for ; Sat, 25 Mar 2017 10:52:57 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 6E33060CD8 for ; Sat, 25 Mar 2017 10:52:55 +0000 (UTC) Received: (qmail 61488 invoked by uid 99); 25 Mar 2017 10:52:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Mar 2017 10:52:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64D3CE0EE6; Sat, 25 Mar 2017 10:52:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Sat, 25 Mar 2017 10:53:00 -0000 Message-Id: <504838cb39ba4af8a94337da2376593b@git.apache.org> In-Reply-To: <0bdccab03a4443ccac4fca935b647c6f@git.apache.org> References: <0bdccab03a4443ccac4fca935b647c6f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] incubator-freemarker git commit: JavaDoc improved/fixed for getLocale/setLocale archived-at: Sat, 25 Mar 2017 10:53:00 -0000 JavaDoc improved/fixed for getLocale/setLocale Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a05998df Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a05998df Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a05998df Branch: refs/heads/2.3 Commit: a05998df23a4557cad7f046c07afd49b957f9efe Parents: ec1e52b Author: ddekany Authored: Sat Mar 25 11:46:26 2017 +0100 Committer: ddekany Committed: Sat Mar 25 11:46:26 2017 +0100 ---------------------------------------------------------------------- src/main/java/freemarker/core/Configurable.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a05998df/src/main/java/freemarker/core/Configurable.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/core/Configurable.java b/src/main/java/freemarker/core/Configurable.java index 1563a4e..f986c0f 100644 --- a/src/main/java/freemarker/core/Configurable.java +++ b/src/main/java/freemarker/core/Configurable.java @@ -619,8 +619,10 @@ public class Configurable { } /** - * Sets the default locale used for number and date formatting (among others), also the locale used for searching - * localized template variations when no locale was explicitly requested. + * Sets the locale used for number and date formatting (among others), also the locale used for searching + * localized template variations when no locale was explicitly requested. On the {@link Configuration} level it + * defaults to the default locale of system (of the JVM), for server-side application usually you should set it + * explicitly in the {@link Configuration} to use the preferred locale of your application instead. * * @see Configuration#getTemplate(String, Locale) */ @@ -631,8 +633,7 @@ public class Configurable { } /** - * Returns the assumed locale when searching for template files with no - * explicit requested locale. Defaults to system locale. + * Getter pair of {@link #setLocale(Locale)}. Not {@code null}. */ public Locale getLocale() { return locale != null ? locale : parent.getLocale();