Repository: openmeetings Updated Branches: refs/heads/master 4262c72ee -> ffb5ae104
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffb5ae10/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml index bfd3701..fbb811d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml @@ -7,16 +7,16 @@ 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. - + --> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";> <properties> @@ -787,7 +787,6 @@ <entry key="771">éæ©ä¼è®®å®¤</entry> <entry key="772">æ£æ¥é³é¢è§é¢è®¾ç½®</entry> <entry key="773">å¼å§ä¼è®®</entry> - <entry key="774">åå è§é¢ä¼è®®çæ¥éª¤å¦ä¸:</entry> <entry key="775">å¼å§å½å¶</entry> <entry key="776">ä¸æ¬¡è¿å ¥ä¼è®®åä¸è¦åæ¾ç¤ºè§é¢é³é¢æµè¯ï¼å½å¶ï¼å¯¹è¯æ¡</entry> <entry key="777">å ¬å ±ä¼è®®å®¤</entry> @@ -817,7 +816,6 @@ <entry key="801">æ</entry> <entry key="802">æè¿°</entry> <entry key="803">ä¸ä¼è </entry> - <entry key="804">æ¬è¿ç¨è§é¢ä¼è®®ç³»ç»æ¯ä¸ä¸ªç¨æ¥å¬å¼è¿ç¨è§é¢ä¼è®®ãå¹è®æ¼è®²ã审æ¥æ件çå¹³å°ãæç §ä¸é¢çæå¼ï¼æä¸å¼å§æé®å¯ä»¥é©¬ä¸è¿å ¥ä¼è®®ãæè è¿å ¥æ¥åé¢çº¦ä¸ä¸ªä¼è®®è®¡å</entry> <entry key="805">é¢çº¦ä¼è®®</entry> <entry key="806">è¦å»ºç«ä¸ä¸ªä¼è®®ï¼æ¨å¯ä»¥æ·»å æ¥åä¸çä¸ä¸ªæ°çäºä»¶ã对äºæ¯ä¸ªæ¥åäºä»¶å°èªå¨å建ä¸ä¸ªä¼è®®å®¤ãä½ åæ¯ä¸ä¸ªä¸ä¼è å°è·å¾ä¸ä¸ªå°æ¿é´é¾æ¥ççµåé®ä»¶ã<br/><br/>æ¨å¯ä»¥éæ©ä¸åçæ¿é´ç±»åæä¸åçå¸å±åé度系ç»ãæ¨ä¹å¯ä»¥ä¸ºæ¯æ¥åäºä»¶éæ©ä¸åççµåé®ä»¶éç¥åéç±»å</entry> <entry key="807">éè¦å¸®å©åï¼</entry> @@ -1913,4 +1911,7 @@ <entry key="sound.enable">Enable sound</entry> <entry key="sound.mute">Mute sound</entry> <entry key="current.password">Current password</entry> + <entry key="widget.start.title">Getting Started</entry> + <entry key="widget.start.header">åå è§é¢ä¼è®®çæ¥éª¤å¦ä¸:</entry> + <entry key="widget.start.desc">{0}, æ¬è¿ç¨è§é¢ä¼è®®ç³»ç»æ¯ä¸ä¸ªç¨æ¥å¬å¼è¿ç¨è§é¢ä¼è®®ãå¹è®æ¼è®²ã审æ¥æ件çå¹³å°ãæç §ä¸é¢çæå¼ï¼æä¸å¼å§æé®å¯ä»¥é©¬ä¸è¿å ¥ä¼è®®ãæè è¿å ¥æ¥åé¢çº¦ä¸ä¸ªä¼è®®è®¡å.</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffb5ae10/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index 091b1cd..214145f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml @@ -7,16 +7,16 @@ 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. - + --> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";> <properties> @@ -787,7 +787,6 @@ <entry key="771">Choose Room</entry> <entry key="772">Check Setup</entry> <entry key="773">Start Conference</entry> - <entry key="774">How to conference</entry> <entry key="775">Start Recording</entry> <entry key="776">Do not show Audio / Video Test (Recording) before entering a Conference</entry> <entry key="777">Public Rooms</entry> @@ -817,7 +816,6 @@ <entry key="801">Month</entry> <entry key="802">Description</entry> <entry key="803">Attendees</entry> - <entry key="804">{0}, your Web Conferencing Platform. Either follow the Instructions, press the start button to start to conference immediatelly or you goto the Calendar and set up a Conference for the future.</entry> <entry key="805">Plan a Meeting</entry> <entry key="806">To set up a conference you can add a new Event in the Calendar.</entry> <entry key="807">Need help?</entry> @@ -1923,4 +1921,7 @@ <entry key="sound.enable">Enable sound</entry> <entry key="sound.mute">Mute sound</entry> <entry key="current.password">Current password</entry> + <entry key="widget.start.title">Getting Started</entry> + <entry key="widget.start.header">Create a conference, quickly!</entry> + <entry key="widget.start.desc">{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.</entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffb5ae10/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java index df1d775..85d702a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java @@ -33,14 +33,14 @@ public class StartWidget extends AbstractWidget { location = new WidgetLocation(1, 0); init(); } - + @Override public void init() { super.init(); - title = Application.getString(774L); + title = Application.getString("widget.start.title"); id = "StartWidget"; } - + @Override public WidgetView createView(String viewId) { return new StartWidgetView(viewId, new Model<Widget>(this)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffb5ae10/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java index 42905b9..bf107c2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java @@ -26,7 +26,7 @@ public class StartWidgetDescriptor implements WidgetDescriptor { @Override public String getName() { - return Application.getString(774L); + return Application.getString("widget.start.title"); } @Override @@ -36,7 +36,7 @@ public class StartWidgetDescriptor implements WidgetDescriptor { @Override public String getDescription() { - return Application.getString(804L); + return Application.getString("widget.start.desc"); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffb5ae10/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html index 8bda8c8..2072c0b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html @@ -7,20 +7,20 @@ 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. - + --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> - <h3><wicket:message key="774"/></h3> + <h3><wicket:message key="widget.start.header"/></h3> <div><div wicket:id="step1" class="clickable start_step1"><wicket:message key="768"/></div></div> <div><div wicket:id="step2" class="clickable start_step2"><wicket:message key="771"/></div></div> <div><div wicket:id="step3" class="clickable start_step3"><wicket:message key="772"/></div></div> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ffb5ae10/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java index df523b1..dae36ad 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java @@ -42,7 +42,7 @@ public class StartWidgetView extends WidgetView { add(new WebMarkupContainer("step2").add(new PublicRoomsEventBehavior())); add(new WebMarkupContainer("step3").add(new PublicRoomsEventBehavior())); add(new WebMarkupContainer("step4").add(new PublicRoomsEventBehavior())); - add(new Label("123msg", Application.getString(804)).setEscapeModelStrings(false)); + add(new Label("123msg", Application.getString("widget.start.desc")).setEscapeModelStrings(false)); add(new Button("start").add(new PublicRoomsEventBehavior())); add(new Button("calendar").add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; @@ -53,14 +53,14 @@ public class StartWidgetView extends WidgetView { } })); } - + private class PublicRoomsEventBehavior extends AjaxEventBehavior { private static final long serialVersionUID = 1L; public PublicRoomsEventBehavior() { super("click"); } - + @Override protected void onEvent(AjaxRequestTarget target) { ((MainPage)getPage()).updateContents(ROOMS_PUBLIC, target);
