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 0A9AE200C7D for ; Tue, 16 May 2017 22:21:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 090F3160BC1; Tue, 16 May 2017 20:21:23 +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 58DB5160BA6 for ; Tue, 16 May 2017 22:21:21 +0200 (CEST) Received: (qmail 17071 invoked by uid 500); 16 May 2017 20:21:20 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 17062 invoked by uid 99); 16 May 2017 20:21:20 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 May 2017 20:21:20 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2D7B7812CE; Tue, 16 May 2017 20:21:18 +0000 (UTC) Date: Tue, 16 May 2017 20:21:18 +0000 To: "commits@openwhisk.apache.org" Subject: [incubator-openwhisk-cli] branch master updated: Update the header pf license and i18n MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <149496607893.22430.5823735874893786720@gitbox.apache.org> From: houshengbo@apache.org Reply-To: "commits@openwhisk.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-openwhisk-cli X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4f274d30171a90dc2d4df2592892c3b60c19ccd3 X-Git-Newrev: b14df8542aa2bf078eb36496f18502426f25e819 X-Git-Rev: b14df8542aa2bf078eb36496f18502426f25e819 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated archived-at: Tue, 16 May 2017 20:21:23 -0000 This is an automated email from the ASF dual-hosted git repository. houshengbo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new b14df85 Update the header pf license and i18n b14df85 is described below commit b14df8542aa2bf078eb36496f18502426f25e819 Author: Vincent Hou AuthorDate: Tue May 16 16:15:48 2017 -0400 Update the header pf license and i18n --- commands/action.go | 13 +- commands/activation.go | 13 +- commands/api.go | 13 +- commands/commands.go | 13 +- commands/flags.go | 13 +- commands/namespace.go | 13 +- commands/package.go | 13 +- commands/property.go | 13 +- commands/rule.go | 13 +- commands/sdk.go | 13 +- commands/trigger.go | 13 +- commands/util.go | 13 +- commands/wsk.go | 13 +- wski18n/detection.go | 13 +- wski18n/i18n.go | 13 +- wski18n/i18n_resources.go | 525 ++++++++++++++++++++++++---------------------- 16 files changed, 376 insertions(+), 344 deletions(-) diff --git a/commands/action.go b/commands/action.go index 21373a1..2d8103f 100644 --- a/commands/action.go +++ b/commands/action.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/activation.go b/commands/activation.go index 1c0b94d..4584110 100644 --- a/commands/activation.go +++ b/commands/activation.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/api.go b/commands/api.go index 8587fef..da266fd 100644 --- a/commands/api.go +++ b/commands/api.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/commands.go b/commands/commands.go index bd7b90e..5020ea2 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/flags.go b/commands/flags.go index 7a7964a..d40e2aa 100644 --- a/commands/flags.go +++ b/commands/flags.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/namespace.go b/commands/namespace.go index b58c724..de4e877 100644 --- a/commands/namespace.go +++ b/commands/namespace.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/package.go b/commands/package.go index 0893902..33e9665 100644 --- a/commands/package.go +++ b/commands/package.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/property.go b/commands/property.go index 5905f84..4a2a7e7 100644 --- a/commands/property.go +++ b/commands/property.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/rule.go b/commands/rule.go index 17c7b85..14bf64b 100644 --- a/commands/rule.go +++ b/commands/rule.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/sdk.go b/commands/sdk.go index fe7b22e..aac6e51 100644 --- a/commands/sdk.go +++ b/commands/sdk.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/trigger.go b/commands/trigger.go index c5398d2..7b65e8c 100644 --- a/commands/trigger.go +++ b/commands/trigger.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/util.go b/commands/util.go index 5077aba..79af565 100644 --- a/commands/util.go +++ b/commands/util.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/commands/wsk.go b/commands/wsk.go index f86edca..236bf1c 100644 --- a/commands/wsk.go +++ b/commands/wsk.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/wski18n/detection.go b/wski18n/detection.go index 03d9be8..b442cc4 100644 --- a/wski18n/detection.go +++ b/wski18n/detection.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/wski18n/i18n.go b/wski18n/i18n.go index 3c68b5f..9991ac8 100644 --- a/wski18n/i18n.go +++ b/wski18n/i18n.go @@ -1,11 +1,12 @@ /* - * Copyright 2015-2016 IBM Corporation + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, diff --git a/wski18n/i18n_resources.go b/wski18n/i18n_resources.go index 6c33e8e..e269ec1 100644 --- a/wski18n/i18n_resources.go +++ b/wski18n/i18n_resources.go @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + // Code generated by go-bindata. // sources: // wski18n/resources/de_DE.all.json @@ -15,330 +32,330 @@ package wski18n import ( - "bytes" - "compress/gzip" - "fmt" - "io" - "io/ioutil" - "os" - "path/filepath" - "strings" - "time" + "bytes" + "compress/gzip" + "fmt" + "io" + "io/ioutil" + "os" + "path/filepath" + "strings" + "time" ) func bindataRead(data []byte, name string) ([]byte, error) { - gz, err := gzip.NewReader(bytes.NewBuffer(data)) - if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) - } + gz, err := gzip.NewReader(bytes.NewBuffer(data)) + if err != nil { + return nil, fmt.Errorf("Read %q: %v", name, err) + } - var buf bytes.Buffer - _, err = io.Copy(&buf, gz) - clErr := gz.Close() + var buf bytes.Buffer + _, err = io.Copy(&buf, gz) + clErr := gz.Close() - if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) - } - if clErr != nil { - return nil, err - } + if err != nil { + return nil, fmt.Errorf("Read %q: %v", name, err) + } + if clErr != nil { + return nil, err + } - return buf.Bytes(), nil + return buf.Bytes(), nil } type asset struct { - bytes []byte - info os.FileInfo + bytes []byte + info os.FileInfo } type bindataFileInfo struct { - name string - size int64 - mode os.FileMode - modTime time.Time + name string + size int64 + mode os.FileMode + modTime time.Time } func (fi bindataFileInfo) Name() string { - return fi.name + return fi.name } func (fi bindataFileInfo) Size() int64 { - return fi.size + return fi.size } func (fi bindataFileInfo) Mode() os.FileMode { - return fi.mode + return fi.mode } func (fi bindataFileInfo) ModTime() time.Time { - return fi.modTime + return fi.modTime } func (fi bindataFileInfo) IsDir() bool { - return false + return false } func (fi bindataFileInfo) Sys() interface{} { - return nil + return nil } var _wski18nResourcesDe_deAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesDe_deAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesDe_deAllJson, - "wski18n/resources/de_DE.all.json", - ) + return bindataRead( + _wski18nResourcesDe_deAllJson, + "wski18n/resources/de_DE.all.json", + ) } func wski18nResourcesDe_deAllJson() (*asset, error) { - bytes, err := wski18nResourcesDe_deAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesDe_deAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/de_DE.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/de_DE.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesEn_usAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x5d\x5f\x73\xdb\x38\x92\x7f\x9f\x4f\xd1\x95\x17\x3b\x55\xb6\xb3\xfb\x74\x75\x99\x9a\x07\x4d\xe2\xd9\x78\x93\xd8\xae\xc8\x99\xdd\xa9\x9b\xab\x11\x44\x42\x12\xc6\x14\xc0\x01\x40\x2b\x8a\xd7\xdf\xfd\x0a\x00\x49\x91\x12\xfe\x92\x72\x72\x4f\x71\xc4\xee\x5f\x37\xfe\x37\x1a\xdd\xc0\xff\xfc\x00\xf0\xf8\x03\x00\xc0\x0b\x92\xbf\x78\x0d\x2f\x26\x65\x59\x90\x0c\x49\xc2\x28\xe0\x2f\x44\xe2\x1c\x2a\x8a\xbf\x94\x38 [...] func wski18nResourcesEn_usAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesEn_usAllJson, - "wski18n/resources/en_US.all.json", - ) + return bindataRead( + _wski18nResourcesEn_usAllJson, + "wski18n/resources/en_US.all.json", + ) } func wski18nResourcesEn_usAllJson() (*asset, error) { - bytes, err := wski18nResourcesEn_usAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesEn_usAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/en_US.all.json", size: 47607, mode: os.FileMode(420), modTime: time.Unix(1494512852, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/en_US.all.json", size: 47607, mode: os.FileMode(420), modTime: time.Unix(1494965329, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesEs_esAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesEs_esAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesEs_esAllJson, - "wski18n/resources/es_ES.all.json", - ) + return bindataRead( + _wski18nResourcesEs_esAllJson, + "wski18n/resources/es_ES.all.json", + ) } func wski18nResourcesEs_esAllJson() (*asset, error) { - bytes, err := wski18nResourcesEs_esAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesEs_esAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/es_ES.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/es_ES.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesFr_frAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8a\xe6\x52\x50\xa8\xe6\x52\x50\x50\x50\x50\xca\x4c\x51\xb2\x52\x50\x4a\xaa\x2c\x48\x2c\x2e\x56\x48\x4e\x2d\x2a\xc9\x4c\xcb\x4c\x4e\x2c\x49\x55\x48\xce\x48\x4d\xce\xce\xcc\x4b\x57\xd2\x81\x28\x2c\x29\x4a\xcc\x2b\xce\x49\x2c\xc9\xcc\xcf\x03\xe9\x08\xce\xcf\x4d\x55\x40\x12\x53\xc8\xcc\x53\x70\x2b\x4a\xcd\x4b\xce\x50\xe2\x52\x50\xa8\xe5\x8a\xe5\x02\x04\x00\x00\xff\xff\x45\xa4\xe9\x62\x65\x00\x00\x00") func wski18nResourcesFr_frAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesFr_frAllJson, - "wski18n/resources/fr_FR.all.json", - ) + return bindataRead( + _wski18nResourcesFr_frAllJson, + "wski18n/resources/fr_FR.all.json", + ) } func wski18nResourcesFr_frAllJson() (*asset, error) { - bytes, err := wski18nResourcesFr_frAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesFr_frAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/fr_FR.all.json", size: 101, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/fr_FR.all.json", size: 101, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesIt_itAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesIt_itAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesIt_itAllJson, - "wski18n/resources/it_IT.all.json", - ) + return bindataRead( + _wski18nResourcesIt_itAllJson, + "wski18n/resources/it_IT.all.json", + ) } func wski18nResourcesIt_itAllJson() (*asset, error) { - bytes, err := wski18nResourcesIt_itAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesIt_itAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/it_IT.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/it_IT.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesJa_jaAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesJa_jaAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesJa_jaAllJson, - "wski18n/resources/ja_JA.all.json", - ) + return bindataRead( + _wski18nResourcesJa_jaAllJson, + "wski18n/resources/ja_JA.all.json", + ) } func wski18nResourcesJa_jaAllJson() (*asset, error) { - bytes, err := wski18nResourcesJa_jaAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesJa_jaAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/ja_JA.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/ja_JA.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesKo_krAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesKo_krAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesKo_krAllJson, - "wski18n/resources/ko_KR.all.json", - ) + return bindataRead( + _wski18nResourcesKo_krAllJson, + "wski18n/resources/ko_KR.all.json", + ) } func wski18nResourcesKo_krAllJson() (*asset, error) { - bytes, err := wski18nResourcesKo_krAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesKo_krAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/ko_KR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/ko_KR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesPt_brAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesPt_brAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesPt_brAllJson, - "wski18n/resources/pt_BR.all.json", - ) + return bindataRead( + _wski18nResourcesPt_brAllJson, + "wski18n/resources/pt_BR.all.json", + ) } func wski18nResourcesPt_brAllJson() (*asset, error) { - bytes, err := wski18nResourcesPt_brAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesPt_brAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/pt_BR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/pt_BR.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesZh_hansAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesZh_hansAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesZh_hansAllJson, - "wski18n/resources/zh_Hans.all.json", - ) + return bindataRead( + _wski18nResourcesZh_hansAllJson, + "wski18n/resources/zh_Hans.all.json", + ) } func wski18nResourcesZh_hansAllJson() (*asset, error) { - bytes, err := wski18nResourcesZh_hansAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesZh_hansAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/zh_Hans.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/zh_Hans.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } var _wski18nResourcesZh_hantAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x01\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00") func wski18nResourcesZh_hantAllJsonBytes() ([]byte, error) { - return bindataRead( - _wski18nResourcesZh_hantAllJson, - "wski18n/resources/zh_Hant.all.json", - ) + return bindataRead( + _wski18nResourcesZh_hantAllJson, + "wski18n/resources/zh_Hant.all.json", + ) } func wski18nResourcesZh_hantAllJson() (*asset, error) { - bytes, err := wski18nResourcesZh_hantAllJsonBytes() - if err != nil { - return nil, err - } + bytes, err := wski18nResourcesZh_hantAllJsonBytes() + if err != nil { + return nil, err + } - info := bindataFileInfo{name: "wski18n/resources/zh_Hant.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494512602, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil + info := bindataFileInfo{name: "wski18n/resources/zh_Hant.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1494965038, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil } // Asset loads and returns the asset for the given name. // It returns an error if the asset could not be found or // could not be loaded. func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) - } - return a.bytes, nil - } - return nil, fmt.Errorf("Asset %s not found", name) + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { + a, err := f() + if err != nil { + return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) + } + return a.bytes, nil + } + return nil, fmt.Errorf("Asset %s not found", name) } // MustAsset is like Asset but panics when Asset would return an error. // It simplifies safe initialization of global variables. func MustAsset(name string) []byte { - a, err := Asset(name) - if err != nil { - panic("asset: Asset(" + name + "): " + err.Error()) - } + a, err := Asset(name) + if err != nil { + panic("asset: Asset(" + name + "): " + err.Error()) + } - return a + return a } // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) - } - return a.info, nil - } - return nil, fmt.Errorf("AssetInfo %s not found", name) + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { + a, err := f() + if err != nil { + return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) + } + return a.info, nil + } + return nil, fmt.Errorf("AssetInfo %s not found", name) } // AssetNames returns the names of the assets. func AssetNames() []string { - names := make([]string, 0, len(_bindata)) - for name := range _bindata { - names = append(names, name) - } - return names + names := make([]string, 0, len(_bindata)) + for name := range _bindata { + names = append(names, name) + } + return names } // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "wski18n/resources/de_DE.all.json": wski18nResourcesDe_deAllJson, - "wski18n/resources/en_US.all.json": wski18nResourcesEn_usAllJson, - "wski18n/resources/es_ES.all.json": wski18nResourcesEs_esAllJson, - "wski18n/resources/fr_FR.all.json": wski18nResourcesFr_frAllJson, - "wski18n/resources/it_IT.all.json": wski18nResourcesIt_itAllJson, - "wski18n/resources/ja_JA.all.json": wski18nResourcesJa_jaAllJson, - "wski18n/resources/ko_KR.all.json": wski18nResourcesKo_krAllJson, - "wski18n/resources/pt_BR.all.json": wski18nResourcesPt_brAllJson, - "wski18n/resources/zh_Hans.all.json": wski18nResourcesZh_hansAllJson, - "wski18n/resources/zh_Hant.all.json": wski18nResourcesZh_hantAllJson, + "wski18n/resources/de_DE.all.json": wski18nResourcesDe_deAllJson, + "wski18n/resources/en_US.all.json": wski18nResourcesEn_usAllJson, + "wski18n/resources/es_ES.all.json": wski18nResourcesEs_esAllJson, + "wski18n/resources/fr_FR.all.json": wski18nResourcesFr_frAllJson, + "wski18n/resources/it_IT.all.json": wski18nResourcesIt_itAllJson, + "wski18n/resources/ja_JA.all.json": wski18nResourcesJa_jaAllJson, + "wski18n/resources/ko_KR.all.json": wski18nResourcesKo_krAllJson, + "wski18n/resources/pt_BR.all.json": wski18nResourcesPt_brAllJson, + "wski18n/resources/zh_Hans.all.json": wski18nResourcesZh_hansAllJson, + "wski18n/resources/zh_Hant.all.json": wski18nResourcesZh_hantAllJson, } // AssetDir returns the file names below a certain @@ -355,92 +372,92 @@ var _bindata = map[string]func() (*asset, error){ // AssetDir("foo.txt") and AssetDir("notexist") would return an error // AssetDir("") will return []string{"data"}. func AssetDir(name string) ([]string, error) { - node := _bintree - if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") - for _, p := range pathList { - node = node.Children[p] - if node == nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - } - } - if node.Func != nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - rv := make([]string, 0, len(node.Children)) - for childName := range node.Children { - rv = append(rv, childName) - } - return rv, nil + node := _bintree + if len(name) != 0 { + cannonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(cannonicalName, "/") + for _, p := range pathList { + node = node.Children[p] + if node == nil { + return nil, fmt.Errorf("Asset %s not found", name) + } + } + } + if node.Func != nil { + return nil, fmt.Errorf("Asset %s not found", name) + } + rv := make([]string, 0, len(node.Children)) + for childName := range node.Children { + rv = append(rv, childName) + } + return rv, nil } type bintree struct { - Func func() (*asset, error) - Children map[string]*bintree + Func func() (*asset, error) + Children map[string]*bintree } var _bintree = &bintree{nil, map[string]*bintree{ - "wski18n": &bintree{nil, map[string]*bintree{ - "resources": &bintree{nil, map[string]*bintree{ - "de_DE.all.json": &bintree{wski18nResourcesDe_deAllJson, map[string]*bintree{}}, - "en_US.all.json": &bintree{wski18nResourcesEn_usAllJson, map[string]*bintree{}}, - "es_ES.all.json": &bintree{wski18nResourcesEs_esAllJson, map[string]*bintree{}}, - "fr_FR.all.json": &bintree{wski18nResourcesFr_frAllJson, map[string]*bintree{}}, - "it_IT.all.json": &bintree{wski18nResourcesIt_itAllJson, map[string]*bintree{}}, - "ja_JA.all.json": &bintree{wski18nResourcesJa_jaAllJson, map[string]*bintree{}}, - "ko_KR.all.json": &bintree{wski18nResourcesKo_krAllJson, map[string]*bintree{}}, - "pt_BR.all.json": &bintree{wski18nResourcesPt_brAllJson, map[string]*bintree{}}, - "zh_Hans.all.json": &bintree{wski18nResourcesZh_hansAllJson, map[string]*bintree{}}, - "zh_Hant.all.json": &bintree{wski18nResourcesZh_hantAllJson, map[string]*bintree{}}, - }}, - }}, + "wski18n": &bintree{nil, map[string]*bintree{ + "resources": &bintree{nil, map[string]*bintree{ + "de_DE.all.json": &bintree{wski18nResourcesDe_deAllJson, map[string]*bintree{}}, + "en_US.all.json": &bintree{wski18nResourcesEn_usAllJson, map[string]*bintree{}}, + "es_ES.all.json": &bintree{wski18nResourcesEs_esAllJson, map[string]*bintree{}}, + "fr_FR.all.json": &bintree{wski18nResourcesFr_frAllJson, map[string]*bintree{}}, + "it_IT.all.json": &bintree{wski18nResourcesIt_itAllJson, map[string]*bintree{}}, + "ja_JA.all.json": &bintree{wski18nResourcesJa_jaAllJson, map[string]*bintree{}}, + "ko_KR.all.json": &bintree{wski18nResourcesKo_krAllJson, map[string]*bintree{}}, + "pt_BR.all.json": &bintree{wski18nResourcesPt_brAllJson, map[string]*bintree{}}, + "zh_Hans.all.json": &bintree{wski18nResourcesZh_hansAllJson, map[string]*bintree{}}, + "zh_Hant.all.json": &bintree{wski18nResourcesZh_hantAllJson, map[string]*bintree{}}, + }}, + }}, }} // RestoreAsset restores an asset under the given directory func RestoreAsset(dir, name string) error { - data, err := Asset(name) - if err != nil { - return err - } - info, err := AssetInfo(name) - if err != nil { - return err - } - err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) - if err != nil { - return err - } - err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) - if err != nil { - return err - } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil + data, err := Asset(name) + if err != nil { + return err + } + info, err := AssetInfo(name) + if err != nil { + return err + } + err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) + if err != nil { + return err + } + err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) + if err != nil { + return err + } + err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + if err != nil { + return err + } + return nil } // RestoreAssets restores an asset under the given directory recursively func RestoreAssets(dir, name string) error { - children, err := AssetDir(name) - // File - if err != nil { - return RestoreAsset(dir, name) - } - // Dir - for _, child := range children { - err = RestoreAssets(dir, filepath.Join(name, child)) - if err != nil { - return err - } - } - return nil + children, err := AssetDir(name) + // File + if err != nil { + return RestoreAsset(dir, name) + } + // Dir + for _, child := range children { + err = RestoreAssets(dir, filepath.Join(name, child)) + if err != nil { + return err + } + } + return nil } func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) + cannonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } -- To stop receiving notification emails like this one, please contact ['"commits@openwhisk.apache.org" '].