Skip to content

Commit

Permalink
Adjusted branding in adminhtml.xmls and system.xmls (OpenMage#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tmewes
tmewes authored Sep 5, 2024
1 parent 3ba8ec5 commit c06674e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion app/code/core/Mage/Api/etc/adminhtml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<config>
<children>
<api translate="title" module="api">
<title>Magento Core API</title>
<title>Maho Core API</title>
</api>
</children>
</config>
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Api/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<config>
<sections>
<api translate="label" module="api">
<label>Magento Core API</label>
<label>Maho Core API</label>
<tab>service</tab>
<sort_order>101</sort_order>
<show_in_default>1</show_in_default>
Expand Down
14 changes: 7 additions & 7 deletions app/code/core/Mage/Core/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>0</show_in_store>
<comment>Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/</comment>
<comment>Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/maho/</comment>
</custom>
<use_custom_path translate="label">
<label>Use Custom Admin Path</label>
Expand Down Expand Up @@ -1217,18 +1217,18 @@
<show_in_store>0</show_in_store>
</session_cookie_lifetime>
<domain_policy_backend translate="label comment">
<label>Allow Magento Backend to run in frame</label>
<label>Allow Maho Backend to run in frame</label>
<frontend_type>select</frontend_type>
<comment>Enabling ability to run Magento in a frame is not recommended for security reasons.</comment>
<comment>Enabling ability to run Maho in a frame is not recommended for security reasons.</comment>
<source_model>adminhtml/system_config_source_security_domainpolicy</source_model>
<sort_order>4</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>0</show_in_store>
</domain_policy_backend>
<domain_policy_frontend translate="label comment">
<label>Allow Magento Frontend to run in frame</label>
<comment>Enabling ability to run Magento in a frame is not recommended for security reasons.</comment>
<label>Allow Maho Frontend to run in frame</label>
<comment>Enabling ability to run Maho in a frame is not recommended for security reasons.</comment>
<frontend_type>select</frontend_type>
<sort_order>5</sort_order>
<source_model>adminhtml/system_config_source_security_domainpolicy</source_model>
Expand Down Expand Up @@ -1402,7 +1402,7 @@
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<comment>Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/</comment>
<comment>Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/maho/</comment>
<validate>required-entry</validate>
</base_url>
<base_link_url translate="label comment">
Expand All @@ -1412,7 +1412,7 @@
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<comment>Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/</comment>
<comment>Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/maho/</comment>
<validate>required-entry</validate>
</base_link_url>
<base_skin_url translate="label">
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Paypal/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@
<label>Transfer Shipping Options</label>
<config_path>payment/paypal_express/transfer_shipping_options</config_path>
<tooltip>If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.</tooltip>
<comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
<comment>Notice that PayPal can handle up to 10 shipping options. That is why Maho will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>50</sort_order>
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Usa/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@
</specificerrmsg>
<mode_xml translate="label comment">
<label>Mode</label>
<comment>Enables/Disables SSL verification of Magento server by UPS.</comment>
<comment>Enables/Disables SSL verification of Maho server by UPS.</comment>
<frontend_type>select</frontend_type>
<source_model>usa/shipping_carrier_abstract_source_mode</source_model>
<sort_order>30</sort_order>
Expand Down

0 comments on commit c06674e

Please sign in to comment.