Skip to content

Commit

Permalink
Adds some additional language-izing, including some javascript in the…
Browse files Browse the repository at this point in the history
… php code like the file manager & menu/page hierarchy [#296] [#394]
  • Loading branch information
dleffler committed Nov 17, 2011
1 parent c3aa80d commit 853926f
Show file tree
Hide file tree
Showing 109 changed files with 2,533 additions and 660 deletions.
330 changes: 321 additions & 9 deletions framework/core/lang/Cestina.php

Large diffs are not rendered by default.

330 changes: 321 additions & 9 deletions framework/core/lang/Dansk.php

Large diffs are not rendered by default.

332 changes: 322 additions & 10 deletions framework/core/lang/Deutsch.php

Large diffs are not rendered by default.

330 changes: 321 additions & 9 deletions framework/core/lang/English - US.php

Large diffs are not rendered by default.

374 changes: 343 additions & 31 deletions framework/core/lang/Espanol.php

Large diffs are not rendered by default.

388 changes: 350 additions & 38 deletions framework/core/lang/Norsk.php

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion framework/core/subsystems/expLang.php
Expand Up @@ -122,7 +122,8 @@ public static function saveCurrLangFile() {
fwrite($fp,"<?php\n");
fwrite($fp,"return array(\n");
foreach($cur_lang as $key => $value){
fwrite($fp,"\t\"".$key."\"=>\"".$value."\",\n");
$value = addslashes(stripslashes(strip_tags($value)));
fwrite($fp,"\t\"".$key."\"=>\"".$value."\",\n");
}
fwrite($fp,");\n");
fwrite($fp,"?>\n");
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/containermodule/views/Default.tpl
Expand Up @@ -38,7 +38,7 @@
<li><a href="{link _common=1 action=userperms}" class="user">{"User Permissions"|gettext}</a></li>
<li><a href="{link _common=1 action=groupperms}" class="group">{"Group Permissions"|gettext}</a></li>
{/if}
<li>{help text="Help with Containers"}</li>
<li>{help text="Help with Containers"|gettext}</li>
</ul>
</div>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/containermodule/views/_form_edit.tpl
Expand Up @@ -48,7 +48,7 @@
{control type=hidden name=rerank value=$rerank}
{control type=hidden name=current_section value=$current_section}

{control type=text size=31 label="Module Title" name=title value=$container->title}
{control type=text size=31 label="Module Title"|gettext name=title value=$container->title}

{control type=dropdown id="modcntrol" name=modcntrol items=$modules includeblank="Select a Module"|gettext label="Type of Content"|gettext disabled=1 value=$container->internal->mod}
{if $is_edit}{control type=hidden id="modcntrol" name=modcntrol value=$container->internal->mod}{/if}
Expand Down
42 changes: 21 additions & 21 deletions framework/modules-1/navigationmodule/views/_manager_hierarchy.tpl
Expand Up @@ -279,7 +279,7 @@ var YAHOO = Y.YUI2;
this.hide();
};

var message = "Deleting a page moves it to the Standalone Page Manager, removing it from the Site Hierarchy. If there are any sub-pages to this section, those will also be moved";
var message = "{/literal}{"Deleting a page moves it to the Standalone Page Manager, removing it from the Site Hierarchy. If there are any sub-pages to this section, those will also be moved"|gettext}{literal}";

// Instantiate the Dialog
var delpage = new YAHOO.widget.SimpleDialog("simpledialog1",
Expand All @@ -292,8 +292,8 @@ var YAHOO = Y.YUI2;
text: message,
icon: YAHOO.widget.SimpleDialog.ICON_HELP,
constraintoviewport: true,
buttons: [ { text:"Move to Standalone", handler:handleYes, isDefault:true },
{ text:"Cancel", handler:handleNo } ]
buttons: [ { text:"{/literal}{"Move to Standalone"|gettext}{literal}", handler:handleYes, isDefault:true },
{ text:"{/literal}{"Cancel"|gettext}{literal}", handler:handleNo } ]
} );
delpage.setHeader("Remove \""+currentMenuNode.data.name+"\" from hierarchy");

Expand Down Expand Up @@ -442,39 +442,39 @@ var YAHOO = Y.YUI2;

if (usr.is_acting_admin==1 || usr.is_admin==1) {
var navoptions = [
{ classname:"addsubpage", text: "Add A Subpage", onclick: { fn: addSubNode },
{ classname:"addsubpage", text: "{/literal}{"Add A Subpage"|gettext}{literal}", onclick: { fn: addSubNode },
submenu: {
id: "submenu1",
itemdata: [
{ classname:"addsubpage", text: "Add Content Page Here", onclick: { fn: addContentSubNode } },
{ classname:"addsubpage", text: "Add External Website Link Page Here", onclick: { fn: addInternalSubNode } },
{ classname:"addsubpage", text: "Add Internal Page Alias Page Here", onclick: { fn: addExternalSubNode } },
{ classname:"addsubpage", text: "Move Standalone Page to Here", onclick: { fn: addStandaloneSubNode } }
{ classname:"addsubpage", text: "{/literal}{"Add Content Page Here"|gettext}{literal}", onclick: { fn: addContentSubNode } },
{ classname:"addsubpage", text: "{/literal}{"Add External Website Link Page Here"|gettext}{literal}", onclick: { fn: addInternalSubNode } },
{ classname:"addsubpage", text: "{/literal}{"Add Internal Page Alias Page Here"|gettext}{literal}", onclick: { fn: addExternalSubNode } },
{ classname:"addsubpage", text: "{/literal}{"Move Standalone Page to Here"|gettext}{literal}", onclick: { fn: addStandaloneSubNode } }
]
}
},
{ classname:"viewpage", text: "View This Page", onclick: { fn: viewNode } },
{ classname:"editpage", text: "Edit This Page", onclick: { fn: editNode } },
{ classname:"deletepage", text: "Delete This Page", onclick: { fn: deleteNode } },
{ classname:"userperms", text: "Manage User Permissions", onclick: { fn: editUserPerms } },
{ classname:"groupperms", text: "Manage Group Permissions", onclick: { fn: editGroupPerms } }
{ classname:"viewpage", text: "{/literal}{"View This Page"|gettext}{literal}", onclick: { fn: viewNode } },
{ classname:"editpage", text: "{/literal}{"Edit This Page"|gettext}{literal}", onclick: { fn: editNode } },
{ classname:"deletepage", text: "{/literal}{"Delete This Page"|gettext}{literal}", onclick: { fn: deleteNode } },
{ classname:"userperms", text: "{/literal}{"Manage User Permissions"|gettext}{literal}", onclick: { fn: editUserPerms } },
{ classname:"groupperms", text: "{/literal}{"Manage Group Permissions"|gettext}{literal}", onclick: { fn: editGroupPerms } }
];
} else {
var navoptions = [
{ classname:"addsubpage", text: "Add A Subpage", onclick: { fn: addSubNode },
{ classname:"addsubpage", text: "{/literal}{"Add A Subpage"|gettext}{literal}", onclick: { fn: addSubNode },
submenu: {
id: "submenu1",
itemdata: [
{ classname:"addsubpage", text: "Add Content Page", onclick: { fn: addContentSubNode } },
{ classname:"addsubpage", text: "Add External Website Link", onclick: { fn: addInternalSubNode } },
{ classname:"addsubpage", text: "Add Internal Page Alias", onclick: { fn: addExternalSubNode } },
{ classname:"addsubpage", text: "Move Standalone Page", onclick: { fn: addStandaloneSubNode } }
{ classname:"addsubpage", text: "{/literal}{"Add Content Page"|gettext}{literal}", onclick: { fn: addContentSubNode } },
{ classname:"addsubpage", text: "{/literal}{"Add External Website Link"|gettext}{literal}", onclick: { fn: addInternalSubNode } },
{ classname:"addsubpage", text: "{/literal}{"Add Internal Page Alias"|gettext}{literal}", onclick: { fn: addExternalSubNode } },
{ classname:"addsubpage", text: "{/literal}{"Move Standalone Page"|gettext}{literal}", onclick: { fn: addStandaloneSubNode } }
]
}
},
{ classname:"viewpage", text: "View This Page", onclick: { fn: viewNode } },
{ classname:"editpage", text: "Edit This Page", onclick: { fn: editNode } },
{ classname:"deletepage", text: "Delete This Page", onclick: { fn: deleteNode } }
{ classname:"viewpage", text: "{/literal}{"View This Page"|gettext}{literal}", onclick: { fn: viewNode } },
{ classname:"editpage", text: "{/literal}{"Edit This Page"|gettext}{literal}", onclick: { fn: editNode } },
{ classname:"deletepage", text: "{/literal}{"Delete This Page"|gettext}{literal}", onclick: { fn: deleteNode } }
];
}
Expand Down
6 changes: 3 additions & 3 deletions framework/modules/addressbook/views/address/edit.tpl
Expand Up @@ -57,17 +57,17 @@ YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) {
{control type=text name=city label="<span class=\"required\">*</span>"|cat:"City"|gettext value=$record->city}

{if ($user->is_admin || $user->is_acting_admin) && $admin_config == true}
{control type=state name=state label="<span class=\"required\">*</span>"|cat:"State/Province"|gettext includeblank="-- "|cat:("Choose a State"|gettext)|cat:" -- " value=$record->state add_other=true}
{control type=state name=state label="<span class=\"required\">*</span>"|cat:"State/Province"|gettext includeblank="-- Choose a State --"|gettext value=$record->state add_other=true}
{control type=text name=non_us_state label="&nbsp;"|cat:"Non U.S. State/Province"|gettext value=$record->non_us_state}
{control type=country name=country label="&nbsp;"|cat:"Country"|gettext show_all=true value=$record->country|default:223}
{else}
{control type=state name=state label="<span class=\"required\">*</span>"|cat:"State/Province"|gettext includeblank="-- "|cat:("Choose a State"|gettext)|cat:" -- " value=$record->state}
{control type=state name=state label="<span class=\"required\">*</span>"|cat:"State/Province"|gettext includeblank="-- Choose a State --"|gettext value=$record->state}
{control type=country name=country label="&nbsp;"|cat:"Country"|gettext value=$record->country}
{/if}

{control type=text name=zip label="<span class=\"required\">*</span>"|cat:"Zip/Postal Code"|gettext value=$record->zip}
{control type="text" name="phone" label="<span class=\"required\">*</span>"|cat:("Phone Number"|gettext)|cat:" <span class=\"example\">ex: 480-555-4200</span>" value=$record->phone}
{control type="dropdown" name="address_type" label="Address Type"|gettext items="Business,Military,Residential" default=$record->address_type|default:"Residential"}
{control type="dropdown" name="address_type" label="Address Type"|gettext items="Business,Military,Residential"|gettext values="Business,Military,Residential" default=$record->address_type|default:"Residential"}
{control type="text" name="email" label="<span class=\"required\">*</span>"|cat:"Email Address"|gettext value=$record->email}
{if !$user->isLoggedIn()}

Expand Down
2 changes: 1 addition & 1 deletion framework/modules/blog/views/blog/configure/blog.tpl
Expand Up @@ -19,4 +19,4 @@
{"This is where you can configure the settings to be used by this Blog module.
These settings will only apply to this particular module."|gettext}
</p>
{control type="radiogroup" name="usebody" label="Body Text"|gettext value=$config.usebody|default:0 items="Full,Summary,None" values="0,1,2"}
{control type="radiogroup" name="usebody" label="Body Text"|gettext value=$config.usebody|default:0 items="Full,Summary,None"|gettext values="0,1,2"}
2 changes: 1 addition & 1 deletion framework/modules/common/views/configure/files.tpl
Expand Up @@ -17,7 +17,7 @@
<h2>{"Configure File Display Settings"|gettext}</h2>
{control id="filedisplay" type='filedisplay-types' name=filedisplay label="Display Files as"|gettext value=$config.filedisplay}
<div id="ff-options" style="display:none">
{control type="dropdown" name="ffloat" label="File Display Box Float"|gettext items="No Float,Left,Right" value=$config.ffloat}
{control type="dropdown" name="ffloat" label="File Display Box Float"|gettext items="No Float,Left,Right"|gettext values="No Float,Left,Right" value=$config.ffloat}
{control type="text" label="Width of File Display Box"|gettext name="fwidth" value=$config.fwidth size=5}
{control type="text" label="Width of Margin"|gettext name="fmargin" value=$config.fmargin size=5}
<hr />
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/common/views/configure/pagination.tpl
@@ -1,4 +1,4 @@
<h2>{"Pagination"|gettext}</h2>
{control type=text name=limit label="Items per page"|gettext value=$config.limit}
{control type=dropdown name=pagelinks label="Show page links"|gettext items="Top and Bottom,Top Only,Bottom Only,Don't show page links" checked=$config.pagelinks}
{control type=dropdown name=pagelinks label="Show page links"|gettext items="Top and Bottom,Top Only,Bottom Only,Don\'t show page links"|gettext values="Top and Bottom,Top Only,Bottom Only,Don\'t show page links" checked=$config.pagelinks}
{control type="checkbox" name="multipageonly" label="Disable page links until page limit is reached"|gettext value=1 checked=$config.multipageonly}
2 changes: 1 addition & 1 deletion framework/modules/common/views/file/configure/Gallery.tpl
Expand Up @@ -13,6 +13,6 @@ small {
{control type="checkbox" label="Only show primary image on listing pages"|gettext name="pio" value=1 checked=$config.pio}
{control type="text" name="thumb" label="Thumbnail Box Size"|gettext value=$config.thumb|default:100 size=5}
{control type="text" name="spacing" label="Thumbnail Spacing"|gettext value=$config.spacing|default:10 size=5}
{control type="dropdown" name="floatthumb" label="Float Thumbnails"|gettext items="No Float,Left,Right" value=$config.floatthumb}
{control type="dropdown" name="floatthumb" label="Float Thumbnails"|gettext items="No Float,Left,Right"|gettext values="No Float,Left,Right" value=$config.floatthumb}
{control type=text name="quality" label="Thumbnail JPEG Quality"|gettext|cat:" (0 - 95)" value=$config.quality|default:$smarty.const.THUMB_QUALITY size="5"}
{control type="text" name="tclass" label="Additional Thumbnail Class"|gettext value=$config.tclass}
2 changes: 1 addition & 1 deletion framework/modules/common/views/file/configure/Showcase.tpl
Expand Up @@ -14,7 +14,7 @@ small {
{control type="text" label="Listing page image width"|gettext name="listingwidth" value=$config.listingwidth|default:100 size=5}

<h4>{"Portolio landing page"|gettext}</h4>
{control type="dropdown" name="lpfloat" label="File Display Box Float"|gettext items="No Float,Left,Right" value=$config.lpfloat}
{control type="dropdown" name="lpfloat" label="File Display Box Float"|gettext items="No Float,Left,Right"|gettext values="No Float,Left,Right" value=$config.lpfloat}
{control type="text" label="Width of Landing Page File Display Box"|gettext name="lpfwidth" value=$config.lpfwidth size=5}
{control type="text" label="Width of main image"|gettext name="piwidth" value=$config.piwidth|default:100 size=5}
{control type="text" name="thumb" label="Thumbnail Box Size"|gettext value=$config.thumb|default:100 size=5}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/core/views/expHTMLEditor/edit.tpl
Expand Up @@ -30,7 +30,7 @@
{control type=hidden name=id value=$record->id}
{control type=text name=name label="Configuration Name"|gettext value=$record->name}
{control type="checkbox" postfalse=1 name=active label="Make this Configuration Active?"|gettext checked=$record->active value=1}
{control type=dropdown name=skin label="Toolbar Skin"|gettext items="Kama, Office 2003, Version 2" values="kama,office2003,v2" value=$record->skin}
{control type=dropdown name=skin label="Toolbar Skin"|gettext items="Kama, Office 2003, Version 2"|gettext values="kama,office2003,v2" value=$record->skin}
{control type="checkbox" postfalse=1 name=scayt_on label="Autostart SpellCheck"|gettext checked=$record->scayt_on value=1}
{control type="checkbox" postfalse=1 name=paste_word label="Allow Formatted Pasting from MS Word"|gettext checked=$record->paste_word value=1}
{control type=textarea cols=80 rows=20 name=data label="Toolbar Button Configuration"|gettext value=$record->data}
Expand Down
Expand Up @@ -24,23 +24,23 @@
</ul>
<div class="yui-content">
<div id="tab1">
{control type="text" name="username" label="API Login ID" value=$calculator->configdata.username}
{control type="text" name="transaction_key" label="Transaction Key" value=$calculator->configdata.transaction_key}
{control type="checkbox" name="testmode" label="Enable Test Mode?" value=1 checked=$calculator->configdata.testmode}
{control type="radiogroup" name="process_mode" label="Processing Mode" items="Authorize and Capture, Authorize Only" values="0,1" default=$calculator->configdata.process_mode}
{control type="text" name="username" label="API Login ID"|gettext value=$calculator->configdata.username}
{control type="text" name="transaction_key" label="Transaction Key"|gettext value=$calculator->configdata.transaction_key}
{control type="checkbox" name="testmode" label="Enable Test Mode?"|gettext value=1 checked=$calculator->configdata.testmode}
{control type="radiogroup" name="process_mode" label="Processing Mode"|gettext items="Authorize and Capture, Authorize Only"|gettext values="0,1" default=$calculator->configdata.process_mode}
</div>
<div id="tab2">
{control type="checkbox" name="accepted_cards[]" label="Master Card" value="MasterCard" checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="Visa" value="VisaCard" checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="American Express" value="AmExCard" checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="Discover Card" value="DiscoverCard" checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="Master Card" value="MasterCard"|gettext checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="Visa" value="VisaCard"|gettext checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="American Express" value="AmExCard"|gettext checked=$calculator->configdata.accepted_cards}
{control type="checkbox" name="accepted_cards[]" label="Discover Card" value="DiscoverCard"|gettext checked=$calculator->configdata.accepted_cards}
</div>
<div id="tab3">
{control type="checkbox" name="email_customer" label="Send customer an email confirmation?" value=1 checked=$calculator->configdata.email_customer}
{control type="checkbox" name="email_customer" label="Send customer an email confirmation?"|gettext value=1 checked=$calculator->configdata.email_customer}
</div>
<!--div id="tab4">
{control type="checkbox" name="email_admin" label="Send a notification that a new order was received?" value=1 checked=$calculator->configdata.email_admin}
{control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)" value=$calculator->configdata.notification_addy}
{control type="checkbox" name="email_admin" label="Send a notification that a new order was received?"|gettext value=1 checked=$calculator->configdata.email_admin}
{control type="text" name="notification_addy" label="Email addresses to send notifications to (comma separated list of email addresses)"|gettext value=$calculator->configdata.notification_addy}
</div-->
</div>
</div>
Expand Down

0 comments on commit 853926f

Please sign in to comment.