";
p.addProperty(txt);
@@ -63,7 +64,23 @@ namespace umbraco.settings
}
- if (!IsPostBack)
+ keyNameBox = new TextBox
+ {
+ ID = "editname-" + currentItem.id,
+ CssClass = "umbEditorTextField",
+ Text = currentItem.key
+ };
+
+ var txtChangeKey = new Literal
+ {
+ Text = "
" +
+ "
Change the key of the dictionary item. Carefull :)
"
+ };
+
+ p.addProperty(txtChangeKey);
+ p.addProperty(keyNameBox);
+
+ if (!IsPostBack)
{
var path = BuildPath(currentItem);
ClientTools
@@ -71,7 +88,6 @@ namespace umbraco.settings
.SyncTree(path, false);
}
-
Panel1.Controls.Add(p);
}
@@ -92,8 +108,21 @@ namespace umbraco.settings
currentItem.setValue(int.Parse(t.ID),t.Text);
}
}
+
+ var newKey = keyNameBox.Text;
+ if (string.IsNullOrWhiteSpace(newKey) == false && newKey != currentItem.key)
+ {
+ currentItem.setKey(newKey);
+
+ Panel1.title.InnerHtml = ui.Text("editdictionary") + ": " + currentItem.key;
+
+ var path = BuildPath(currentItem);
+ ClientTools.SyncTree(path, true);
+ }
+
ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "dictionaryItemSaved"), "");
}
+
#region Web Form Designer generated code
override protected void OnInit(EventArgs e)
{
diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs
index 8e76122175..206965168e 100644
--- a/src/umbraco.cms/businesslogic/Dictionary.cs
+++ b/src/umbraco.cms/businesslogic/Dictionary.cs
@@ -169,6 +169,12 @@ namespace umbraco.cms.businesslogic
}
}
+ public void setKey(string value)
+ {
+ key = value;
+ Save();
+ }
+
public string Value(int languageId)
{
if (languageId == 0)
From 330cd7a4092b1b81325bb550ec7372c16999a1c5 Mon Sep 17 00:00:00 2001
From: Mads Krohn
Date: Tue, 16 Feb 2016 00:06:56 +0100
Subject: [PATCH 006/668] Check if the new key already exists. Added error
message. Enhanced error handling logic.
---
.../settings/EditDictionaryItem.aspx.cs | 46 +++++++++++++------
1 file changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
index ca07004f44..b0dd94c869 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
@@ -8,6 +8,7 @@ using System.Web.SessionState;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
+using umbraco.cms.businesslogic;
using umbraco.cms.presentation.Trees;
using Umbraco.Core;
using Umbraco.Core.IO;
@@ -25,7 +26,8 @@ namespace umbraco.settings
protected uicontrols.TabView tbv = new uicontrols.TabView();
private System.Collections.ArrayList languageFields = new System.Collections.ArrayList();
private cms.businesslogic.Dictionary.DictionaryItem currentItem;
- protected TextBox keyNameBox;
+ protected TextBox boxChangeKey;
+ protected Label labelChangeKey;
protected void Page_Load(object sender, System.EventArgs e)
{
@@ -64,21 +66,26 @@ namespace umbraco.settings
}
- keyNameBox = new TextBox
+ boxChangeKey = new TextBox
{
- ID = "editname-" + currentItem.id,
+ ID = "changeKey-" + currentItem.id,
CssClass = "umbEditorTextField",
Text = currentItem.key
};
- var txtChangeKey = new Literal
+ labelChangeKey = new Label
+ {
+ ID = "changeKeyLabel",
+ CssClass = "text-error"
+ };
+
+ p.addProperty(new Literal
{
Text = "
" +
"
Change the key of the dictionary item. Carefull :)
"
- };
-
- p.addProperty(txtChangeKey);
- p.addProperty(keyNameBox);
+ });
+ p.addProperty(boxChangeKey);
+ p.addProperty(labelChangeKey);
if (!IsPostBack)
{
@@ -109,15 +116,28 @@ namespace umbraco.settings
}
}
- var newKey = keyNameBox.Text;
+ labelChangeKey.Text = "";
+ var newKey = boxChangeKey.Text;
if (string.IsNullOrWhiteSpace(newKey) == false && newKey != currentItem.key)
{
- currentItem.setKey(newKey);
+ // key already exists, save but inform
+ if (Dictionary.DictionaryItem.hasKey(newKey) == true)
+ {
+ labelChangeKey.Text = "The key '" + newKey + "' already exists, sorry..";
+ boxChangeKey.Text = currentItem.key; // reset the key
+ }
+ else
+ {
+ // set the new key
+ currentItem.setKey(newKey);
- Panel1.title.InnerHtml = ui.Text("editdictionary") + ": " + currentItem.key;
+ // update the title with the new key
+ Panel1.title.InnerHtml = ui.Text("editdictionary") + ": " + newKey;
- var path = BuildPath(currentItem);
- ClientTools.SyncTree(path, true);
+ // sync the content tree
+ var path = BuildPath(currentItem);
+ ClientTools.SyncTree(path, true);
+ }
}
ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "dictionaryItemSaved"), "");
From ce897509bae64ddc120fb6c720c1ed77cf077c1b Mon Sep 17 00:00:00 2001
From: Mads Krohn
Date: Tue, 16 Feb 2016 10:44:43 +0100
Subject: [PATCH 007/668] added localization
---
src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 6 ++++++
src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 6 ++++++
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 6 ++++++
.../umbraco/settings/EditDictionaryItem.aspx.cs | 14 ++++++++------
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 446796dd88..f90d3a5ec6 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -236,6 +236,12 @@
Rediger de forskellige sprogversioner for ordbogselementet '%0%' herunder. Du tilføjer flere sprog under 'sprog' i menuen til venstre Kulturnavn
+ Her kan du ændre nøglen på ordbogselementet.
+
+
+ Indtast dit brugernavn
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index b14b101af7..c953e899cc 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -284,6 +284,12 @@
Edit the different language versions for the dictionary item '%0%' below You can add additional languages under the 'languages' in the menu on the left
]]>
Culture Name
+ Here you can change the key of the dictionary item.
+
+
+ Enter your username
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 1cc40abd1d..012d7074e7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -285,6 +285,12 @@
Edit the different language versions for the dictionary item '%0%' below You can add additional languages under the 'languages' in the menu on the left
]]>
Culture Name
+ Here you can change the key of the dictionary item.
+
+
+ Enter your username
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
index b0dd94c869..c66a6ca37f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
@@ -8,6 +8,7 @@ using System.Web.SessionState;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
+using umbraco.BusinessLogic;
using umbraco.cms.businesslogic;
using umbraco.cms.presentation.Trees;
using Umbraco.Core;
@@ -28,10 +29,12 @@ namespace umbraco.settings
private cms.businesslogic.Dictionary.DictionaryItem currentItem;
protected TextBox boxChangeKey;
protected Label labelChangeKey;
+ protected User currentUser;
protected void Page_Load(object sender, System.EventArgs e)
{
currentItem = new cms.businesslogic.Dictionary.DictionaryItem(int.Parse(Request.QueryString["id"]));
+ currentUser = getUser();
// Put user code to initialize the page here
Panel1.hasMenu = true;
@@ -47,7 +50,7 @@ namespace umbraco.settings
uicontrols.Pane p = new uicontrols.Pane();
Literal txt = new Literal();
- txt.Text = "
"
});
p.addProperty(boxChangeKey);
p.addProperty(labelChangeKey);
From 227e7a9c70d7c2e3521c0bc55f83c673898b5566 Mon Sep 17 00:00:00 2001
From: Simone Chiaretta
Date: Tue, 8 Mar 2016 11:21:21 +0100
Subject: [PATCH 009/668] [U4-8128] Always rejecting promise even with server
error
Updated postSaveContent and resourcePromise to always reject the promise (thus always calling callers error handler) even when the error is 500 server error
---
.../services/umbrequesthelper.service.js | 33 +++++++++----------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index ccdd283ea6..a3d1e5b0c6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -170,16 +170,14 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
}
}
- else {
- //return an error object including the error message for UI
- deferred.reject({
- errorMsg: result.errorMsg,
- data: result.data,
- status: result.status
- });
+ //return an error object including the error message for UI
+ deferred.reject({
+ errorMsg: result.errorMsg,
+ data: result.data,
+ status: result.status
+ });
- }
});
@@ -266,15 +264,14 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
}
}
- else {
-
- //return an error object including the error message for UI
- deferred.reject({
- errorMsg: 'An error occurred',
- data: data,
- status: status
- });
- }
+
+ //return an error object including the error message for UI
+ deferred.reject({
+ errorMsg: 'An error occurred',
+ data: data,
+ status: status
+ });
+
});
@@ -337,4 +334,4 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
}
};
}
-angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);
\ No newline at end of file
+angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);
From c10534a064d8fd2806f3c913ef0f2a1635665dad Mon Sep 17 00:00:00 2001
From: Alexander Bryukhov
Date: Thu, 14 Apr 2016 23:31:24 +0600
Subject: [PATCH 010/668] Update UI language ru.xml
Missing keys & some typos found
---
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index fbf0e0adf2..2fd54be962 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -215,8 +215,10 @@
ДА, удалить
- была перемещена внутрь
+ перемещены внутрь
+ скопированы внутрьВыбрать папку для перемещения
+ Выбрать папку для копированияв структуре дереваВсе типы документов
@@ -328,7 +330,7 @@
Провайдеры аутентификацииПодробное сообщение об ошибкеТрассировка стека
- Inner Exception
+ Внутренняя ошибкаСвязатьРазорвать связь
@@ -725,6 +727,7 @@
Нажмите, чтобы загрузить
+ Невозможна загрузка этого файла, этот тип файлов не разрешен для загрузкиПеретащите файлы сюда...Ссылка на файлили нажмите сюда, чтобы выбрать файлы
@@ -1219,6 +1222,6 @@
Валидация числового значенияВалидация по формату Url...или указать свои правила валидации
- Обязательно к заполению
+ Обязательно к заполнению
From b607ba52f41c472b3f06b9ad239271730911b79e Mon Sep 17 00:00:00 2001
From: Dynacy
Date: Fri, 22 Apr 2016 12:26:26 +0300
Subject: [PATCH 011/668] Create tr.xml
Turkish Language
---
src/Umbraco.Web.UI/umbraco/config/lang/tr.xml | 1073 +++++++++++++++++
1 file changed, 1073 insertions(+)
create mode 100644 src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
new file mode 100644
index 0000000000..8adcb89801
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
@@ -0,0 +1,1073 @@
+
+
+
+ Umbraco
+ http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files
+
+
+ Kültür ve Alanadları
+ Denetim
+ Nodları Görüntüle
+ Döküman Tipini Değiştir
+ Kopyala
+ Oluştur
+ Paket Oluştur
+ Sil
+ Devredışı Bırak
+ Çöp Kutusunu Boşalt
+ Döküman Tipini Dışarı Çıkar
+ Döküman Tipini İçeri Aktar
+ İçeri Paket Aktar
+ Kanvasda Düzenle
+ Çıkış
+ Taşı
+ Bildiri
+ Herkes Ulaşsın
+ Yayınla
+ Yayınlama
+ Nodları Yenile
+ Bütün Siteyi Tekrar Yayınla
+ Onar
+ İzinler
+ Geri Al
+ Yayınlamak İçin Gönder
+ Çeviri İçin Gönder
+ Sırala
+ Yayına Gönder
+ Çeviri
+ Güncelleme
+ Varsayılan Değer
+
+
+ İzin Reddedildi
+ Yeni Alanadı Ekle
+ Kaldır
+ Hatalı Nod
+ Hatalı Alanadı
+ Alanadı önceden atanmış.
+ Dil
+ Alanadı
+ Yeni alanadı '%0%' oluşturuldu
+ Alanadı '%0%' silindi
+ Alanadı '%0%' önceden atanmış
+ Alanadı '%0%' güncellendi
+ Geçerli Alanadlarını Düzenle
+
+ Miras Al
+ Dil Değiştir
+ or inherit culture from parent nodes. Will also apply
+ to the current node, unless a domain below applies too.]]>
+ Alanadları
+
+
+ Görüntüleniyor
+
+
+ Seç
+ Geçerli dosyaları seç
+ Başka Birşey Yapın
+ Kalın
+ Paragraf İşaretini Kaldır
+ Insert form field
+ Insert graphic headline
+ Edit Html
+ Indent Paragraph
+ Italic
+ Center
+ Justify Left
+ Justify Right
+ Insert Link
+ Insert local link (anchor)
+ Bullet List
+ Numeric List
+ Insert macro
+ Insert picture
+ Edit relations
+ Return to list
+ Save
+ Save and publish
+ Save and send for approval
+ Preview
+ Preview is disabled because there's no template assigned
+ Choose style
+ Show styles
+ Insert table
+
+
+ To change the document type for the selected content, first select from the list of valid types for this location.
+ Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.
+ The content has been re-published.
+ Current Property
+ Current type
+ The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.
+ Document Type Changed
+ Map Properties
+ Map to Property
+ New Template
+ New Type
+ none
+ Content
+ Select New Document Type
+ The document type of the selected content has been successfully changed to [new type] and the following properties mapped:
+ to
+ Could not complete property mapping as one or more properties have more than one mapping defined.
+ Only alternate types valid for the current location are displayed.
+
+
+ Is Published
+ About this page
+ Alias
+ (how would you describe the picture over the phone)
+ Alternative Links
+ Click to edit this item
+ Created by
+ Original author
+ Updated by
+ Created
+ Date/time this document was created
+ Document Type
+ Editing
+ Remove at
+ This item has been changed after publication
+ This item is not published
+ Last published
+ There are no items to show in the list.
+ Media Type
+ Link to media item(s)
+ Member Group
+ Role
+ Member Type
+ No date chosen
+ Page Title
+ Properties
+ This document is published but is not visible because the parent '%0%' is unpublished
+ Oops: this document is published but is not in the cache (internal error)
+ Publish
+ Publication Status
+ Publish at
+ Unpublish at
+ Clear Date
+ Sortorder is updated
+ To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting
+ Statistics
+ Title (optional)
+ Alternative text (optional)
+ Type
+ Unpublish
+ Last edited
+ Date/time this document was edited
+ Remove file(s)
+ Link to document
+ Member of group(s)
+ Not a member of group(s)
+ Child items
+ Target
+
+
+ Click to upload
+ Drop your files here...
+ Link to media
+
+
+ Create a new member
+ All Members
+
+
+ Where do you want to create the new %0%
+ Create an item under
+ Choose a type and a title
+ "document types".]]>
+ "media types".]]>
+
+
+ Browse your website
+ - Hide
+ If Umbraco isn't opening, you might need to allow popups from this site
+ has opened in a new window
+ Restart
+ Visit
+ Welcome
+
+
+ Name
+ Manage hostnames
+ Close this window
+ Are you sure you want to delete
+ Are you sure you want to disable
+ Please check this box to confirm deletion of %0% item(s)
+ Are you sure?
+ Are you sure?
+ Cut
+ Edit Dictionary Item
+ Edit Language
+ Insert local link
+ Insert character
+ Insert graphic headline
+ Insert picture
+ Insert link
+ Click to add a Macro
+ Insert table
+ Last Edited
+ Link
+ Internal link:
+ When using local links, insert "#" in front of link
+ Open in new window?
+ Macro Settings
+ This macro does not contain any properties you can edit
+ Paste
+ Edit Permissions for
+ The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place
+ The recycle bin is now empty
+ When items are deleted from the recycle bin, they will be gone forever
+ regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]>
+ Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url'
+ Remove Macro
+ Required Field
+ Site is reindexed
+ The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished
+ The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.
+ Number of columns
+ Number of rows
+ Set a placeholder id by setting an ID on your placeholder you can inject content into this template from child templates,
+ by referring this ID using a <asp:content /> element.]]>
+ Select a placeholder id from the list below. You can only
+ choose Id's from the current template's master.]]>
+ Click on the image to see full size
+ Pick item
+ View Cache Item
+
+
+ %0%' below You can add additional languages under the 'languages' in the menu on the left
+ ]]>
+ Culture Name
+
+
+ Enter your username
+ Enter your password
+ Name the %0%...
+ Enter a name...
+ Type to search...
+ Type to filter...
+ Type to add tags (press enter after each tag)...
+
+
+
+ Allow at root
+ Only Content Types with this checked can be created at the root level of Content and Media trees
+ Allowed child node types
+ Document Type Compositions
+ Create
+ Delete tab
+ Description
+ New tab
+ Tab
+ Thumbnail
+ Enable list view
+ Configures the content item to show a sortable & searchable list of its children, the children will not be shown in the tree
+ Current list view
+ The active list view data type
+ Create custom list view
+ Remove custom list view
+
+
+ Add prevalue
+ Database datatype
+ Property editor GUID
+ Property editor
+ Buttons
+ Enable advanced settings for
+ Enable context menu
+ Maximum default size of inserted images
+ Related stylesheets
+ Show label
+ Width and height
+
+
+ Your data has been saved, but before you can publish this page there are some errors you need to fix first:
+ The current membership provider does not support changing password (EnablePasswordRetrieval need to be true)
+ %0% already exists
+ There were errors:
+ There were errors:
+ The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)
+ %0% must be an integer
+ The %0% field in the %1% tab is mandatory
+ %0% is a mandatory field
+ %0% at %1% is not in a correct format
+ %0% is not in a correct format
+
+
+ The specified file type has been disallowed by the administrator
+ NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.
+ Please fill both alias and name on the new property type!
+ There is a problem with read/write access to a specific file or folder
+ Error loading Partial View script (file: %0%)
+ Error loading userControl '%0%'
+ Error loading customControl (Assembly: %0%, Type: '%1%')
+ Error loading MacroEngine script (file: %0%)
+ "Error parsing XSLT file: %0%
+ "Error reading XSLT file: %0%
+ Please enter a title
+ Please choose a type
+ You're about to make the picture larger than the original size. Are you sure that you want to proceed?
+ Error in python script
+ The python script has not been saved, because it contained error(s)
+ Startnode deleted, please contact your administrator
+ Please mark content before changing style
+ No active styles available
+ Please place cursor at the left of the two cells you wish to merge
+ You cannot split a cell that hasn't been merged.
+ Error in XSLT source
+ The XSLT has not been saved, because it contained error(s)
+ There is a configuration error with the data type used for this property, please check the data type
+
+
+ About
+ Action
+ Actions
+ Add
+ Alias
+ Are you sure?
+ Border
+ by
+ Cancel
+ Cell margin
+ Choose
+ Close
+ Close Window
+ Comment
+ Confirm
+ Constrain proportions
+ Continue
+ Copy
+ Create
+ Database
+ Date
+ Default
+ Delete
+ Deleted
+ Deleting...
+ Design
+ Dimensions
+ Down
+ Download
+ Edit
+ Edited
+ Elements
+ Email
+ Error
+ Find
+ Height
+ Help
+ Icon
+ Import
+ Inner margin
+ Insert
+ Install
+ Justify
+ Language
+ Layout
+ Loading
+ Locked
+ Login
+ Log off
+ Logout
+ Macro
+ Move
+ More
+ Name
+ New
+ Next
+ No
+ of
+ OK
+ Open
+ or
+ Password
+ Path
+ Placeholder ID
+ One moment please...
+ Previous
+ Properties
+ Email to receive form data
+ Recycle Bin
+ Remaining
+ Rename
+ Renew
+ Required
+ Retry
+ Permissions
+ Search
+ Server
+ Show
+ Show page on Send
+ Size
+ Sort
+ Type
+ Type to search...
+ Up
+ Update
+ Upgrade
+ Upload
+ Url
+ User
+ Username
+ Value
+ View
+ Welcome...
+ Width
+ Yes
+ Folder
+ Search results
+
+
+ Background color
+ Bold
+ Text color
+ Font
+ Text
+
+
+ Page
+
+
+ The installer cannot connect to the database.
+ Could not save the web.config file. Please modify the connection string manually.
+ Your database has been found and is identified as
+ Database configuration
+ install button to install the Umbraco %0% database
+ ]]>
+ Next to proceed.]]>
+ Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.
+
To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.
]]>
+
+ Please contact your ISP if necessary.
+ If you're installing on a local machine or server you might need information from your system administrator.]]>
+
+ Press the upgrade button to upgrade your database to Umbraco %0%
+
+ Don't worry - no content will be deleted and everything will continue working afterwards!
+
+ ]]>
+ Press Next to
+ proceed. ]]>
+ next to continue the configuration wizard]]>
+ The Default users' password needs to be changed!]]>
+ The Default user has been disabled or has no access to Umbraco!
No further actions needs to be taken. Click Next to proceed.]]>
+ The Default user's password has been successfully changed since the installation!
No further actions needs to be taken. Click Next to proceed.]]>
+ The password is changed!
+
+ Umbraco creates a default user with a login ('admin') and password ('default'). It's important that the password is
+ changed to something unique.
+
+
+ This step will check the default user's password and suggest if it needs to be changed.
+
+ ]]>
+ Get a great start, watch our introduction videos
+ By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.
+ Not installed yet.
+ Affected files and folders
+ More information on setting up permissions for Umbraco here
+ You need to grant ASP.NET modify permissions to the following files/folders
+ Your permission settings are almost perfect!
+ You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]>
+ How to Resolve
+ Click here to read the text version
+ video tutorial on setting up folder permissions for Umbraco or read the text version.]]>
+ Your permission settings might be an issue!
+
+ You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]>
+ Your permission settings are not ready for Umbraco!
+
+ In order to run Umbraco, you'll need to update your permission settings.]]>
+ Your permission settings are perfect!
+ You are ready to run Umbraco and install packages!]]>
+ Resolving folder issue
+ Follow this link for more information on problems with ASP.NET and creating folders
+ Setting up folder permissions
+
+ I want to start from scratch
+ learn how)
+ You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
+ ]]>
+ You've just set up a clean Umbraco platform. What do you want to do next?
+ Runway is installed
+
+ This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules
+ ]]>
+ Only recommended for experienced users
+ I want to start with a simple website
+
+ "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
+ but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
+ Runway offers an easy foundation based on best practices to get you started faster than ever.
+ If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages.
+
+
+ Included with Runway: Home page, Getting Started page, Installing Modules page.
+ Optional Modules: Top Navigation, Sitemap, Contact, Gallery.
+
+ ]]>
+ What is Runway
+ Step 1/5 Accept license
+ Step 2/5: Database configuration
+ Step 3/5: Validating File Permissions
+ Step 4/5: Check Umbraco security
+ Step 5/5: Umbraco is ready to get you started
+ Thank you for choosing Umbraco
+ Browse your new site
+You installed Runway, so why not see how your new website looks.]]>
+ Further help and information
+Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]>
+ Umbraco %0% is installed and ready for use
+ /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]>
+ started instantly by clicking the "Launch Umbraco" button below. If you are new to Umbraco,
+you can find plenty of resources on our getting started pages.]]>
+ Launch Umbraco
+To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]>
+ Connection to database failed.
+ Umbraco Version 3
+ Umbraco Version 4
+ Watch
+ Umbraco %0% for a fresh install or upgrading from version 3.0.
+
]]>
+ [%0%] Notification about %1% performed on %2%
+ Notifications
+
+
+
+ button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
+ ]]>
+ Author
+ Demonstration
+ Documentation
+ Package meta data
+ Package name
+ Package doesn't contain any items
+
+ You can safely remove this from the system by clicking "uninstall package" below.]]>
+ No upgrades available
+ Package options
+ Package readme
+ Package repository
+ Confirm uninstall
+ Package was uninstalled
+ The package was successfully uninstalled
+ Uninstall package
+
+ Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
+ so uninstall with caution. If in doubt, contact the package author.]]>
+ Download update from the repository
+ Upgrade package
+ Upgrade instructions
+ There's an upgrade available for this package. You can download it directly from the Umbraco package repository.
+ Package version
+ Package version history
+ View package website
+
+
+ Paste with full formatting (Not recommended)
+ The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web.
+ Paste as raw text without any formatting at all
+ Paste, but remove formatting (Recommended)
+
+
+ Role based protection
+ using Umbraco's member groups.]]>
+ role-based authentication.]]>
+ Error Page
+ Used when people are logged on, but do not have access
+ Choose how to restrict access to this page
+ %0% is now protected
+ Protection removed from %0%
+ Login Page
+ Choose the page that contains the login form
+ Remove Protection
+ Select the pages that contain login form and error messages
+ Pick the roles who have access to this page
+ Set the login and password for this page
+ Single user protection
+ If you just want to setup simple protection using a single login and password
+
+
+
+
+
+
+
+
+
+ Include unpublished child pages
+ Publishing in progress - please wait...
+ %0% out of %1% pages have been published...
+ %0% has been published
+ %0% and subpages have been published
+ Publish %0% and all its subpages
+ ok to publish %0% and thereby making its content publicly available.
+ You can publish this page and all it's sub-pages by checking publish all children below.
+ ]]>
+
+
+ You have not configured any approved colors
+
+
+ enter external link
+ choose internal page
+ Caption
+ Link
+ Open in new window
+ enter the display caption
+ Enter the link
+
+
+ Reset
+
+
+ Current version
+ Red text will not be shown in the selected version. , green means added]]>
+ Document has been rolled back
+ This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view
+ Rollback to
+ Select version
+ View
+
+
+ Edit script file
+
+
+ Concierge
+ Content
+ Courier
+ Developer
+ Umbraco Configuration Wizard
+ Media
+ Members
+ Newsletters
+ Settings
+ Statistics
+ Translation
+ Users
+ Help
+ Forms
+ Analytics
+
+
+ go to
+ Help topics for
+ Video chapters for
+ The best Umbraco video tutorials
+
+
+ Default template
+ Dictionary Key
+ To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)
+ New Tab Title
+ Node type
+ Type
+ Stylesheet
+ Script
+ Stylesheet property
+ Tab
+ Tab Title
+ Tabs
+ Master Content Type enabled
+ This Content Type uses
+ as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself
+ No properties defined on this tab. Click on the "add a new property" link at the top to create a new property.
+ Master Document Type
+ Create matching template
+
+
+ Sorting complete.
+ Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items
+ Do not close this window during sorting]]>
+
+
+ Failed
+ Insufficient user permissions, could not complete the operation
+ Cancelled
+ Operation was cancelled by a 3rd party add-in
+ Publishing was cancelled by a 3rd party add-in
+ Property type already exists
+ Property type created
+ DataType: %1%]]>
+ Propertytype deleted
+ Document Type saved
+ Tab created
+ Tab deleted
+ Tab with id: %0% deleted
+ Stylesheet not saved
+ Stylesheet saved
+ Stylesheet saved without any errors
+ Datatype saved
+ Dictionary item saved
+ Publishing failed because the parent page isn't published
+ Content published
+ and visible at the website
+ Content saved
+ Remember to publish to make changes visible
+ Sent For Approval
+ Changes have been sent for approval
+ Media saved
+ Media saved without any errors
+ Member saved
+ Stylesheet Property Saved
+ Stylesheet saved
+ Template saved
+ Error saving user (check log)
+ User Saved
+ User type saved
+ File not saved
+ file could not be saved. Please check file permissions
+ File saved
+ File saved without any errors
+ Language saved
+ Python script not saved
+ Python script could not be saved due to error
+ Python script saved
+ No errors in python script
+ Template not saved
+ Please make sure that you do not have 2 templates with the same alias
+ Template saved
+ Template saved without any errors!
+ XSLT not saved
+ XSLT contained an error
+ XSLT could not be saved, check file permissions
+ XSLT saved
+ No errors in XSLT
+ Content unpublished
+ Partial view saved
+ Partial view saved without any errors!
+ Partial view not saved
+ An error occurred saving the file.
+ Script view saved
+ Script view saved without any errors!
+ Script view not saved
+ An error occurred saving the file.
+ An error occurred saving the file.
+
+
+ Uses CSS syntax ex: h1, .redHeader, .blueTex
+ Edit stylesheet
+ Edit stylesheet property
+ Name to identify the style property in the rich text editor
+ Preview
+ Styles
+
+
+ Edit template
+ Insert content area
+ Insert content area placeholder
+ Insert dictionary item
+ Insert Macro
+ Insert Umbraco page field
+ Master template
+ Quick Guide to Umbraco template tags
+ Template
+
+
+ Insert control
+ Choose a layout for this section
+ below and add your first element]]>
+
+ Click to embed
+ Click to insert image
+ Image caption...
+ Write here...
+ Grid layouts
+ Layouts are the overall work area for the grid editor, usually you only need one or two different layouts
+ Add grid layout
+ Adjust the layout by setting column widths and adding additional sections
+
+ Row configurations
+ Rows are predefined cells arranged horizontally
+ Add row configuration
+ Adjust the row by setting cell widths and adding additional cells
+
+ Columns
+ Total combined number of columns in the grid layout
+
+ Settings
+ Configure what settings editors can change
+
+
+ Styles
+ Configure what styling editors can change
+
+ Settings will only save if the entered json configuration is valid
+
+ Allow all editors
+ Allow all row configurations
+
+
+ Alternative field
+ Alternative Text
+ Casing
+ Encoding
+ Choose field
+ Convert line breaks
+ Replaces line breaks with html-tag <br>
+ Custom Fields
+ Yes, Date only
+ Format as date
+ HTML encode
+ Will replace special characters by their HTML equivalent.
+ Will be inserted after the field value
+ Will be inserted before the field value
+ Lowercase
+ None
+ Insert after field
+ Insert before field
+ Recursive
+ Remove Paragraph tags
+ Will remove any <P> in the beginning and end of the text
+ Standard Fields
+ Uppercase
+ URL encode
+ Will format special characters in URLs
+ Will only be used when the field values above are empty
+ This field will only be used if the primary field is empty
+ Yes, with time. Separator:
+
+
+ Tasks assigned to you
+ assigned to you. To see a detailed view including comments, click on "Details" or just the page name.
+ You can also download the page as XML directly by clicking the "Download Xml" link.
+ To close a translation task, please go to the Details view and click the "Close" button.
+ ]]>
+ close task
+ Translation details
+ Download all translation tasks as XML
+ Download XML
+ Download XML DTD
+ Fields
+ Include subpages
+
+ [%0%] Translation task for %1%
+ No translator users found. Please create a translator user before you start sending content to translation
+ Tasks created by you
+ created by you. To see a detailed view including comments,
+ click on "Details" or just the page name. You can also download the page as XML directly by clicking the "Download Xml" link.
+ To close a translation task, please go to the Details view and click the "Close" button.
+ ]]>
+ The page '%0%' has been send to translation
+ Send the page '%0%' to translation
+ Assigned by
+ Task opened
+ Total words
+ Translate to
+ Translation completed.
+ You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages.
+ Translation failed, the XML file might be corrupt
+ Translation options
+ Translator
+ Upload translation XML
+
+
+ Cache Browser
+ Recycle Bin
+ Created packages
+ Data Types
+ Dictionary
+ Installed packages
+ Install skin
+ Install starter kit
+ Languages
+ Install local package
+ Macros
+ Media Types
+ Members
+ Member Groups
+ Roles
+ Member Types
+ Document Types
+ Packages
+ Packages
+ Python Files
+ Install from repository
+ Install Runway
+ Runway modules
+ Scripting Files
+ Scripts
+ Stylesheets
+ Templates
+ XSLT Files
+ Analytics
+
+
+ New update ready
+ %0% is ready, click here for download
+ No connection to server
+ Error checking for update. Please review trace-stack for further information
+
+
+ Administrator
+ Category field
+ Change Your Password
+ Change Your Password
+ Confirm new password
+ You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button
+ Content Channel
+ Description field
+ Disable User
+ Document Type
+ Editor
+ Excerpt field
+ Language
+ Login
+ Start Node in Media Library
+ Sections
+ Disable Umbraco Access
+ Password
+ Reset password
+ Your password has been changed!
+ Please confirm the new password
+ Enter your new password
+ Your new password cannot be blank!
+ Current password
+ Invalid current password
+ There was a difference between the new password and the confirmed password. Please try again!
+ The confirmed password doesn't match the new password!
+ Replace child node permissions
+ You are currently modifying permissions for the pages:
+ Select pages to modify their permissions
+ Search all children
+ Start Node in Content
+ Name
+ User permissions
+ User type
+ User types
+ Writer
+ Translator
+ Change
+ Your profile
+ Your recent history
+ Session expires in
+
+
From ff5714196c91874d869a19b51a15648b098b7f8b Mon Sep 17 00:00:00 2001
From: Dynacy
Date: Fri, 22 Apr 2016 12:34:03 +0300
Subject: [PATCH 012/668] Update tr.xml
---
src/Umbraco.Web.UI/umbraco/config/lang/tr.xml | 1149 +++++++++--------
1 file changed, 609 insertions(+), 540 deletions(-)
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
index 8adcb89801..6452af023b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
@@ -1,470 +1,489 @@
-
+Umbraco
- http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files
+ http://kayadata.com
- Kültür ve Alanadları
- Denetim
- Nodları Görüntüle
- Döküman Tipini Değiştir
- Kopyala
+ Kültür ve Hostnames
+ Denetim Trail
+ Düğüm Araçtır
+ Belge Türü Değiştir
+ KopyaOluşturPaket OluşturSil
- Devredışı Bırak
- Çöp Kutusunu Boşalt
- Döküman Tipini Dışarı Çıkar
- Döküman Tipini İçeri Aktar
- İçeri Paket Aktar
- Kanvasda Düzenle
+ Devre Dışı Bırak
+ Geri Dönüşümü Boşat
+ Belge Türü Çıkart
+ Belge Türü Al
+ Paket Ekle
+ Tuval DüzeleÇıkışTaşı
- Bildiri
- Herkes Ulaşsın
- Yayınla
- Yayınlama
- Nodları Yenile
- Bütün Siteyi Tekrar Yayınla
- Onar
+ Bildirimler
+ Genel Erişim
+ Yayımla
+ Yayından Kaldır
+ Yeniden Yükle
+ Siteleri Yeniden Yayınla
+ Düzeltİzinler
- Geri Al
- Yayınlamak İçin Gönder
- Çeviri İçin Gönder
+ Rollback
+ Yayın için Gönder
+ Çeviri GönderSıralaYayına Gönder
- Çeviri
- Güncelleme
+ Çevir
+ GüncelleVarsayılan Değer
- İzin Reddedildi
- Yeni Alanadı Ekle
- Kaldır
- Hatalı Nod
- Hatalı Alanadı
- Alanadı önceden atanmış.
+ İzin reddedildi.
+ Yeni Domain ekle
+ kaldır
+ Geçersiz node.
+ Geçersiz domain biçimi.
+ Domain zaten eklenmiş.Dil
- Alanadı
- Yeni alanadı '%0%' oluşturuldu
- Alanadı '%0%' silindi
- Alanadı '%0%' önceden atanmış
- Alanadı '%0%' güncellendi
- Geçerli Alanadlarını Düzenle
-
+ Domain
+ Yeni domain '%0%' oluşturuldu
+ Domain '%0%' silindi
+ Domain '%0%' zaten atanmış
+ Domain '%0%' güncellendi
+ Geçerli domain düzenle
+
+ etki /> bir düzey yollar desteklenir
+ Miras Al
- Dil Değiştir
- or inherit culture from parent nodes. Will also apply
- to the current node, unless a domain below applies too.]]>
- Alanadları
+ Kültür
+
+ veya üst düğümleri kültürünü devralır. Ayrıca geçerli olacaktır
+ Geçerli düğümün , bir etki altında çok uygulanmadığı sürece .]]>
+
+ DomainlerGörüntüleniyorSeç
- Geçerli dosyaları seç
- Başka Birşey Yapın
+ Geçerli klasörü seçin
+ Başka birşey yapınKalın
- Paragraf İşaretini Kaldır
- Insert form field
- Insert graphic headline
- Edit Html
- Indent Paragraph
- Italic
- Center
- Justify Left
- Justify Right
- Insert Link
- Insert local link (anchor)
- Bullet List
- Numeric List
- Insert macro
- Insert picture
- Edit relations
- Return to list
- Save
- Save and publish
- Save and send for approval
- Preview
- Preview is disabled because there's no template assigned
- Choose style
- Show styles
- Insert table
+ Paragraf girinti iptal
+ Form alanı ekle
+ Grafik başlık ekle
+ Html Düzenle
+ Paragraf girintisi
+ Yatık
+ Ortalı
+ Sola Yasla
+ Sağa Yasla
+ Link ekle
+ Yerel bağlantı ekle
+ Bulet listesi
+ Sayısal Liste
+ Macro ekle
+ Resim ekle
+ Düzenleme ilişkileri
+ Listeye Dön
+ Kaydet
+ Kaydet ve Yayınla
+ Kaydet ve Onay için gönder
+ Önizle
+ Önizleme kapalı, Atanmış şablon yok
+ Stili seçin
+ Stilleri Göster
+ Tablo Ekle
- To change the document type for the selected content, first select from the list of valid types for this location.
- Then confirm and/or amend the mapping of properties from the current type to the new, and click Save.
- The content has been re-published.
- Current Property
- Current type
- The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.
- Document Type Changed
- Map Properties
- Map to Property
- New Template
- New Type
- none
- Content
- Select New Document Type
- The document type of the selected content has been successfully changed to [new type] and the following properties mapped:
- to
- Could not complete property mapping as one or more properties have more than one mapping defined.
- Only alternate types valid for the current location are displayed.
+ Seçilen içerik için belge türünü değiştirmek için , öncelikle bu konum için geçerli türleri listesinden seçim yapın.
+ Ardından onaylamak ve / veya yeni akım tip özellikleri haritalama değişiklik ve Kaydet'i tıklatın .
+ İçerik yeniden yayımlanmıştır .
+ Güncel Mülkiyet
+ Güncel tip
+ Bu konum için geçerli hiçbir alternatifi olduğu gibi belge türü , değiştirilemez . Seçilen içerik öğesinin ebeveyn altında izin verilir ve mevcut tüm alt içerik öğeleri altında oluşturulacak izin eğer bir alternatif geçerli olacaktır .
+ Belge Türü değiştirildi
+ harita Özellikleri
+ Mülkiyet Harita
+ Yeni Şablon
+ Yeni Tip
+ Hiçbiri
+ İçerik
+ Yeni Belge Tipi Seçiniz
+ Seçilen içeriğin belge türü başarıyla [ yeni tip ] değişti ve aşağıdaki özellikleri eşleştirilmiş edilmiştir :
+ için
+ Bir veya daha fazla özellikleri olarak mülkiyet haritalama tamamlayamadı birden fazla eşleme tanımlanmış var.
+ Bulunduğunuz yerin için geçerli Sadece alternatif türleri görüntülenir.
- Is Published
- About this page
- Alias
- (how would you describe the picture over the phone)
- Alternative Links
- Click to edit this item
- Created by
- Original author
- Updated by
- Created
- Date/time this document was created
- Document Type
- Editing
- Remove at
- This item has been changed after publication
- This item is not published
- Last published
- There are no items to show in the list.
- Media Type
- Link to media item(s)
- Member Group
- Role
- Member Type
- No date chosen
- Page Title
- Properties
- This document is published but is not visible because the parent '%0%' is unpublished
- Oops: this document is published but is not in the cache (internal error)
- Publish
- Publication Status
- Publish at
- Unpublish at
- Clear Date
- Sortorder is updated
- To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting
- Statistics
- Title (optional)
- Alternative text (optional)
- Type
- Unpublish
- Last edited
- Date/time this document was edited
- Remove file(s)
- Link to document
- Member of group(s)
- Not a member of group(s)
- Child items
- Target
+ Yayımlandı
+ Bu sayfa hakkında
+ takma ad
+ ( nasıl telefon üzerinden resim anlatırsınız )
+ Alternatif Linkler
+ Bu öğeyi düzenlemek için tıklayın
+ Tarafından yaratıldı
+ orijinal yazar
+ tarafından güncellendi
+ oluşturuldu
+ Bu belgenin oluşturulduğu tarih / zaman
+ Belge Türü
+ kurgu
+ en kaldır
+ Bu madde yayınlanmasından sonra değiştirildi
+ Bu öğe yayınlanmadı
+ Son yayınlanan
+ Listede gösterilecek öğe yok.
+ Medya Türü
+ Medya öğesinin bağlantı ( lar)
+ Üye Grubu
+ rol
+ Üye Türü
+ Hiçbir tarih seçildi
+ Sayfa başlığı
+ Özellikler
+ Ebeveyn ' %0% ' yayımlanmamış olduğu için bu belge yayınladı ama görünür değildir
+ Hata : Bu belge yayınlandı ancak önbellek ( iç hata ) değil
+ yayınlamak
+ Yayın Durum
+ en Yayınla
+ en yayından
+ temizle tarihi
+ Sıralama güncellenir
+ Düğümlerini sıralamak için, sadece düğümleri sürükleyin veya sütun başlıkları birini tıklatın . Seçerken " shift " veya " kontrol " tuşunu basılı tutarak birden fazla düğüm seçebilirsiniz
+ istatistik
+ Başlık (isteğe bağlı)
+ Alternatif metin (isteğe bağlı)
+ tip
+ Yayından
+ Son düzenleme
+ Bu belgenin düzenlendiği tarih / zaman
+ Dosya(ları) kaldırın
+ Belgeye Bağlantı
+ Grubun Üyesi(leri)
+ Grubun bir üyesi değil
+ Çocuk öğeleri
+ hedef
- Click to upload
- Drop your files here...
- Link to media
-
-
- Create a new member
- All Members
+ Yüklemek için tıklayın
+ Burada açılan dosyaları ...
+ Medya Linki
- Where do you want to create the new %0%
- Create an item under
- Choose a type and a title
- "document types".]]>
- "media types".]]>
+ Nerede yeni %0% yaratmak istiyorsun
+ Altında bir öğe oluşturun
+ Bir tür ve bir başlık seçin
+ "belge türleri".]]>
+ "ortam türleri".]]>
- Browse your website
- - Hide
- If Umbraco isn't opening, you might need to allow popups from this site
- has opened in a new window
- Restart
- Visit
- Welcome
+ Web sitenizi tarayın
+ - gizle
+ CMS açılış değilse , bu siteden pop-up izin gerekebilir
+ Yeni bir pencere açtı
+ Tekrar başlat
+ ziyaret
+ hoşgeldiniz
- Name
- Manage hostnames
- Close this window
- Are you sure you want to delete
- Are you sure you want to disable
- Please check this box to confirm deletion of %0% item(s)
- Are you sure?
- Are you sure?
- Cut
- Edit Dictionary Item
- Edit Language
- Insert local link
- Insert character
- Insert graphic headline
- Insert picture
- Insert link
- Click to add a Macro
- Insert table
- Last Edited
- Link
- Internal link:
- When using local links, insert "#" in front of link
- Open in new window?
- Macro Settings
- This macro does not contain any properties you can edit
- Paste
- Edit Permissions for
- The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place
- The recycle bin is now empty
- When items are deleted from the recycle bin, they will be gone forever
- regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]>
- Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url'
- Remove Macro
- Required Field
- Site is reindexed
- The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished
- The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished.
- Number of columns
- Number of rows
- Set a placeholder id by setting an ID on your placeholder you can inject content into this template from child templates,
- by referring this ID using a <asp:content /> element.]]>
- Select a placeholder id from the list below. You can only
- choose Id's from the current template's master.]]>
- Click on the image to see full size
- Pick item
- View Cache Item
+ isim
+ konak yönetin
+ Bu pencereyi kapatın
+ Silmek istediğine emin misin
+ Eğer devre dışı bırakmak istediğinizden emin misiniz
+ %0% öğe(lerin) silinmesi onaylamak için bu kutuyu kontrol edin
+ Emin misiniz?
+ Emin misiniz?
+ Kes
+ Düzenleme Sözlük Öğe
+ Dil Düzenleme
+ Yerel bağlantı ekleme
+ Karakter Ekle
+ Grafik başlığı ekleyin
+ Resim ekle
+ Link Ekle
+ Bir makro eklemek için tıklayın
+ Tablo Ekle
+ Son DÜzenleme
+ Bağlantı
+ İç Bağlantı:
+ Yerel bağlantıları kullanırken, bağlantının önündeki "# " insert
+ Yeni pencerede aç
+ Makro ayarları
+ Düzenleyebileceğiniz Bu makro herhangi bir özellikleri içermiyor
+ Yapıştır
+ İzinleri düzenle
+ Geri dönüşüm kutusu öğeleri şimdi siliniyor. Bu işlem gerçekleşirken bu pencereyi kapatın etmeyiniz
+ Geri dönüşüm kutusu artık boş
+ Öğeleri geri dönüşüm kutusu silindiğinde, onlar sonsuza kadar gitmiş olacak
+ regexlib.com's webcoder şu anda üzerinde hiçbir kontrole sahip bazı sorunları, yaşanıyor. Bu rahatsızlıktan dolayı çok üzgünüz.]]>
+ Bir düzenli ifade arama form alanına doğrulama ekleyin. Örnek: 'E-posta', zip code 'url'
+ Makro kaldır
+ Gerekli alan
+ Site yeniden indekslendi
+ Web sitesi yenilendi önbelleği olmuştur. Tüm içerik güncel artık yayımlamak. Tüm yayınlanmamış içeriği hala yayınlanmamış olmakla birlikte
+ Web sitesi önbelleği yenilenir olacaktır. Yayınlanmamış içerik yayınlanmamış kalacak ise tüm yayınlanan içerik, güncellenecektir.
+ Sütün sayısı
+ Satır sayısı
+
+ Yer tutucu kimliği ayarla senin tutucu bir kimlik ayarlayarak Çocuğunuz şablonları bu şablon içine içerik enjekte edebilir,
+ Bir kullanarak bu kimliği bakarak <asp:content /> element.]]>
+
+
+ Yer tutucu kimliği seçin Aşağıdaki listeden. You can sadece
+ Geçerli şablonun ustadan kimliği sitesinin seçin.]]>
+
+ Tam boyutta görmek için resmin üzerine tıklayın
+ öğeyi seçin
+ Görünüm Önbellek Öğe
- %0%' below You can add additional languages under the 'languages' in the menu on the left
- ]]>
- Culture Name
+
+ %0%' aşağıda Sol taraftaki menüden 'diller' başlığı altında ek dil ekleyebilirsiniz
+ ]]>
+
+ Kültür adı
- Enter your username
- Enter your password
- Name the %0%...
- Enter a name...
- Type to search...
- Type to filter...
- Type to add tags (press enter after each tag)...
+ Kullanıcı adınızı giriniz
+ Parolanızı giriniz
+ Ad %0%...
+ Adınızı girin...
+ Aramak için yazın...
+ Filtrelemek için yazın...
+ (Basın, her etiketinden sonra girin) etiket eklemek için yazın ...
-
- Allow at root
- Only Content Types with this checked can be created at the root level of Content and Media trees
- Allowed child node types
- Document Type Compositions
- Create
- Delete tab
- Description
- New tab
- Tab
- Thumbnail
- Enable list view
- Configures the content item to show a sortable & searchable list of its children, the children will not be shown in the tree
- Current list view
- The active list view data type
- Create custom list view
- Remove custom list view
+ Root'a izin ver
+ Bu Sadece İçerik Türleri İçerik ve Medya ağaçların kök düzeyinde oluşturulabilir kontrol
+ İzin alt düğüm çeşitleri
+ Belge Türü kompozisyonlar
+ Oluştur
+ Sekmesini sil
+ Tanım
+ Yeni sekme
+ Sekme
+ Küçük resim
+ Lüste görünümü etkinleştir
+ Bir sıralanabilir & göstermek için içerik öğesini yapılandırır; kendi çocuklarının aranabilir liste, çocuk ağacında gösterilen olmayacak
+ Liste görünümü
+ Etkin liste görünümü veri türü
+ Özel liste görünüm oluşturun
+ Özel liste görünümü kaldır
- Add prevalue
- Database datatype
- Property editor GUID
- Property editor
- Buttons
- Enable advanced settings for
- Enable context menu
- Maximum default size of inserted images
- Related stylesheets
- Show label
- Width and height
+ Ön değer ekle
+ Veritabanı veritürü
+ Mülkiyet editörü GUID
+ Mülkiyet editörü
+ Düğmeler
+ Gelişmiş ayarları etkinleştir...
+ Bağlam menüsünü etkinleştir
+ Eklenen görüntülerin maksimum varsayılan boyutu
+ İlgili stil
+ Etiketi göster
+ Yükseklik ve Genişlik
- Your data has been saved, but before you can publish this page there are some errors you need to fix first:
- The current membership provider does not support changing password (EnablePasswordRetrieval need to be true)
- %0% already exists
- There were errors:
- There were errors:
- The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s)
- %0% must be an integer
- The %0% field in the %1% tab is mandatory
- %0% is a mandatory field
- %0% at %1% is not in a correct format
- %0% is not in a correct format
+ Verileriniz kaydedildi, ancak bu sayfayı yayınlamak için önce ilk düzeltmek için gereken bazı hatalar vardır:
+ Geçerli üyelik sağlayıcısı değişen şifreyi desteklemiyor (EnablePasswordRetrieval doğru olması gerekir)
+ %0% zaten var
+ Hatalar vardı:
+ Hatalar vardı:
+ Şifre %0% karakter uzunluğunda en az olması ve en az %1% non-alfa sayısal karakter (ler) içermelidir
+ %0% bir tamsayı olmalıdır
+ %1% sekmesinde %0% alan zorunludur
+ %0% zorunlu bir alandır
+ %0% - %1% bir doğru biçimde değil
+ %0% Bir doğru biçimde değil
- The specified file type has been disallowed by the administrator
- NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.
- Please fill both alias and name on the new property type!
- There is a problem with read/write access to a specific file or folder
- Error loading Partial View script (file: %0%)
+ Belirtilen dosya türü yönetici tarafından izin verilmeyen olmuştur
+ NOT! CodeMirror yapılandırma tarafından etkin olsa bile yeterince kararlı değil, çünkü Internet Explorer'da devre dışı bırakılır.
+ Yeni özellik tipine takma adını ve hem de doldurunuz!
+ Belirli bir dosya veya klasör için okuma / yazma erişimi olan bir sorun var
+ Error loading Partial View script (Dosya: %0%)Error loading userControl '%0%'Error loading customControl (Assembly: %0%, Type: '%1%')
- Error loading MacroEngine script (file: %0%)
+ Error loading MacroEngine script (Dosya: %0%)"Error parsing XSLT file: %0%
- "Error reading XSLT file: %0%
- Please enter a title
- Please choose a type
- You're about to make the picture larger than the original size. Are you sure that you want to proceed?
- Error in python script
- The python script has not been saved, because it contained error(s)
- Startnode deleted, please contact your administrator
- Please mark content before changing style
- No active styles available
- Please place cursor at the left of the two cells you wish to merge
- You cannot split a cell that hasn't been merged.
- Error in XSLT source
- The XSLT has not been saved, because it contained error(s)
- There is a configuration error with the data type used for this property, please check the data type
+ "Error reading XSLT file: %0%
+ Lütfen bir başlık girin
+ Lütfen bir tür seçin
+ Orijinal boyutundan daha resmi büyütmek üzereyiz. Devam etmek istediğinizden emin misiniz?
+ Python komut dosyası hatası
+ O hatayı içerdiği için python komut dosyası, kaydedilmemiş (ler)
+ Silinen düğüm başlatın, lütfen yöneticinize başvurun
+ Tarzı değiştirmeden önce içerik işaretleyiniz
+ Henüz aktif stilleri
+ Birleştirmek istediğiniz iki hücre solundaki imleci Lütfen
+ Sen birleştirilmiş henüz bir hücreyi bölemezsiniz.
+ XSLT kaynak hatae
+ O hatayı içerdiği XSLT, kaydedilmemiş (ler))
+ Bu özellik için kullanılan veri türüne sahip bir yapılandırma hatası var, veri türünü kontrol edin
- About
- Action
- Actions
- Add
- Alias
- Are you sure?
- Border
- by
- Cancel
- Cell margin
- Choose
- Close
- Close Window
- Comment
- Confirm
- Constrain proportions
- Continue
- Copy
- Create
- Database
- Date
- Default
- Delete
- Deleted
- Deleting...
- Design
- Dimensions
- Down
- Download
- Edit
- Edited
- Elements
- Email
- Error
- Find
- Height
- Help
- Icon
- Import
- Inner margin
- Insert
- Install
- Justify
- Language
- Layout
- Loading
- Locked
- Login
- Log off
- Logout
- Macro
- Move
- More
- Name
- New
- Next
- No
- of
- OK
- Open
- or
- Password
- Path
- Placeholder ID
- One moment please...
- Previous
- Properties
- Email to receive form data
- Recycle Bin
- Remaining
- Rename
- Renew
- Required
- Retry
- Permissions
- Search
- Server
- Show
- Show page on Send
- Size
- Sort
- Type
- Type to search...
- Up
- Update
- Upgrade
- Upload
- Url
- User
- Username
- Value
- View
- Welcome...
- Width
- Yes
- Folder
- Search results
+ Hakkında
+ Eylem
+ Eylemler
+ Ekle
+ Takma ad
+ Emin misiniz?
+ Sınır
+ tarafında
+ İptal
+ hücre marjı
+ Seçim
+ Kapat
+ Pencereyi kapat
+ Açıklama
+ Onayla
+ oranları sınırlamak
+ Devam et
+ Kopyala
+ Oluştur
+ Veritabanı
+ Tarih
+ Standart
+ Sil
+ Silindi
+ Siliniyor...
+ Dizayn
+ Boyutlar
+ Aşağı
+ İndir
+ Düzenle
+ Düzenlendi
+ Elemanları
+ E-Posta
+ Hata
+ Bul
+ Yükseklik
+ Yardım
+ İkon
+ İthalat
+ İç Marj
+ Ekle
+ Kur
+ Satır Uzunluğu
+ Dil
+ Düzen
+ Yükleniyor
+ Kilitli
+ Giriş yap
+ Oturum Kapat
+ Çıkış yap
+ Makro
+ Taşı
+ Daha
+ Ad
+ Yeni
+ Sonraki
+ Hayır
+ arasında
+ TAMAM
+ Aç
+ veya
+ Parola
+ Yol
+ Yer tutucu ID
+ Bir dakika lütfen...
+ Önceki
+ Özellikler
+ Form verilerini almak için e-posta
+ Geridönüşüm kutusu
+ Kalan
+ Adını Değiştir
+ Yenile
+ Gerekli
+ Tekrar dene
+ İzinler
+ Arama
+ Sunucu
+ Göster
+ Gönder sayfasını göster
+ Boyut
+ Sırala
+ Tip
+ Aramak için yazın...
+ Yukarı
+ Güncelle
+ Yükselt
+ Yükle
+ URL
+ Kullanıcı
+ Kullanıcı adı
+ Değer
+ Görünüm
+ Hoşgeldiniz...
+ Genişlik
+ Evet
+ Klasör
+ Arama Sonuçları
- Background color
- Bold
- Text color
- Font
- Text
+ Arka plan rengi
+ Kalın
+ Metin Rengi
+ Yazı
+ Metin
- Page
+ Sayfa
- The installer cannot connect to the database.
- Could not save the web.config file. Please modify the connection string manually.
- Your database has been found and is identified as
- Database configuration
- install button to install the Umbraco %0% database
- ]]>
- Next to proceed.]]>
- Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.
-
To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.
+ Yükleyici veritabanına bağlanamıyor.
+ Web.config dosyasını kaydedilemedi. El bağlantı dizesini değiştirin lütfen.
+ Web.config dosyasını kaydedilemedi. El bağlantı dizesini değiştirin lütfen....
+ Veritabanı yapılandırması
+
+ Kurulum için dğümeye basın %0% veritabanı
+ ]]>
+
+ Sonraki Devam için.]]>
+
+ Veritabanı bulunamadı! "Web.config" nin "bağlantı dizesinde" bilgi dosyası doğru olup olmadığını kontrol edin.
+
Devam etmek için, (Visual Studio veya sevdiğiniz metin editörü kullanarak) "web.config" dosyasını düzenlemek lütfen, altına gidin "UmbracoDbDSN" adlı anahtarı veritabanınız için bağlantı dizesini eklemek ve dosyayı kaydedin.
]]>
-
- Please contact your ISP if necessary.
- If you're installing on a local machine or server you might need information from your system administrator.]]>
- Tekrar dene.
+
+
+ Burada düzenleme web.config Hakkında Daha Fazla Bilgi.]]>
+
+
+
+ Gerekirse ISS'nize irtibata geçiniz.
+ Eğer yerel makine veya sunucu üzerinde yükleme ediyorsanız, sistem yöneticinizden bilgi gerekebilir.]]>
+
+
+
- Press the upgrade button to upgrade your database to Umbraco %0%
+ CMS %0% için veritabanını yükseltme için yükseltme düğmesine basın
+
- Don't worry - no content will be deleted and everything will continue working afterwards!
+ Merak etmeyin - hiçbir içerik silinmeyecek ve her şey sonradan çalışmaya devam edecektir!
- ]]>
- Press Next to
- proceed. ]]>
+ ]]>
+
+
+ Sonraki işlem. ]]>
+ next to continue the configuration wizard]]>The Default users' password needs to be changed!]]>The Default user has been disabled or has no access to Umbraco!
No further actions needs to be taken. Click Next to proceed.]]>
The Default user's password has been successfully changed since the installation!
No further actions needs to be taken. Click Next to proceed.]]>
The password is changed!
-
+
Umbraco creates a default user with a login ('admin') and password ('default'). It's important that the password is
changed to something unique.
@@ -472,48 +491,64 @@
This step will check the default user's password and suggest if it needs to be changed.
- ]]>
+ ]]>
+
Get a great start, watch our introduction videosBy clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI.Not installed yet.Affected files and foldersMore information on setting up permissions for Umbraco hereYou need to grant ASP.NET modify permissions to the following files/folders
- Your permission settings are almost perfect!
- You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]>
+
+ Your permission settings are almost perfect!
+ You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]>
+ How to ResolveClick here to read the text versionvideo tutorial on setting up folder permissions for Umbraco or read the text version.]]>
- Your permission settings might be an issue!
+
+ Your permission settings might be an issue!
- You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]>
- Your permission settings are not ready for Umbraco!
+ You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]>
+
+
+ Your permission settings are not ready for Umbraco!
- In order to run Umbraco, you'll need to update your permission settings.]]>
- Your permission settings are perfect!
- You are ready to run Umbraco and install packages!]]>
+ In order to run Umbraco, you'll need to update your permission settings.]]>
+
+
+ Your permission settings are perfect!
+ You are ready to run Umbraco and install packages!]]>
+ Resolving folder issueFollow this link for more information on problems with ASP.NET and creating foldersSetting up folder permissions
-
+
- I want to start from scratch
-
+
+ Baştan başlamak istiyorum
+
+ learn how)
You can still choose to install Runway later on. Please go to the Developer section and choose Packages.
- ]]>
+ ]]>
+
You've just set up a clean Umbraco platform. What do you want to do next?Runway is installed
-
+
This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules
- ]]>
+ ]]>
+
Only recommended for experienced usersI want to start with a simple website
-
+
"Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically,
but you can easily edit, extend or remove it. It's not necessary and you can perfectly use Umbraco without it. However,
@@ -524,7 +559,8 @@
Included with Runway: Home page, Getting Started page, Installing Modules page. Optional Modules: Top Navigation, Sitemap, Contact, Gallery.
- ]]>
+ ]]>
+
What is RunwayStep 1/5 Accept licenseStep 2/5: Database configuration
@@ -532,49 +568,61 @@
Step 4/5: Check Umbraco securityStep 5/5: Umbraco is ready to get you startedThank you for choosing Umbraco
- Browse your new site
-You installed Runway, so why not see how your new website looks.]]>
- Further help and information
-Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]>
+
+ Browse your new site
+You installed Runway, so why not see how your new website looks.]]>
+
+
+ Further help and information
+Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the Umbraco terminology]]>
+ Umbraco %0% is installed and ready for use
- /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]>
- started instantly by clicking the "Launch Umbraco" button below. If you are new to Umbraco,
-you can find plenty of resources on our getting started pages.]]>
- Launch Umbraco
-To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]>
+
+ /web.config file and update the AppSetting key UmbracoConfigurationStatus in the bottom to the value of '%0%'.]]>
+
+
+ started instantly by clicking the "Launch Umbraco" button below. If you are new to Umbraco,
+you can find plenty of resources on our getting started pages.]]>
+
+
+ Launch Umbraco
+To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]>
+ Connection to database failed.Umbraco Version 3Umbraco Version 4Watch
- Umbraco %0% for a fresh install or upgrading from version 3.0.
+
+ Umbraco %0% for a fresh install or upgrading from version 3.0.
This is an automated mail to inform you that the task '%1%'
has been performed on the page '%2%'
@@ -631,23 +682,28 @@ To manage your website, simply open the Umbraco back office and start adding con
Have a nice day!
Cheers from the Umbraco robot
-
]]>
+ ]]>
+
[%0%] Notification about %1% performed on %2%Notifications
-
+
button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
- ]]>
+ ]]>
+
AuthorDemonstrationDocumentationPackage meta dataPackage namePackage doesn't contain any items
-
- You can safely remove this from the system by clicking "uninstall package" below.]]>
+
+
+ You can safely remove this from the system by clicking "uninstall package" below.]]>
+ No upgrades availablePackage optionsPackage readme
@@ -656,9 +712,11 @@ To manage your website, simply open the Umbraco back office and start adding con
Package was uninstalledThe package was successfully uninstalledUninstall package
-
+
+
Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability,
- so uninstall with caution. If in doubt, contact the package author.]]>
+ so uninstall with caution. If in doubt, contact the package author.]]>
+ Download update from the repositoryUpgrade packageUpgrade instructions
@@ -697,38 +755,43 @@ To manage your website, simply open the Umbraco back office and start adding con
%0% could not be published because the item is scheduled for release.
]]>
-
-
+
-
+
+
+
-
+
+
+
+ ]]>
+
Include unpublished child pagesPublishing in progress - please wait...%0% out of %1% pages have been published...%0% has been published%0% and subpages have been publishedPublish %0% and all its subpages
- ok to publish %0% and thereby making its content publicly available.
+
+ ok to publish %0% and thereby making its content publicly available.
You can publish this page and all it's sub-pages by checking publish all children below.
- ]]>
+ ]]>
+
- You have not configured any approved colors
+ You have not configured any approved coloursenter external linkchoose internal pageCaptionLink
- Open in new window
- enter the display caption
+ New window
+ Enter a new captionEnter the link
@@ -744,34 +807,34 @@ To manage your website, simply open the Umbraco back office and start adding con
View
- Edit script file
+ Düzenleme komut dosyası
- Concierge
- Content
- Courier
- Developer
- Umbraco Configuration Wizard
- Media
- Members
- Newsletters
- Settings
- Statistics
- Translation
- Users
- Help
- Forms
+ Kapıcı
+ İçerik
+ Kurya
+ Geliştirici
+ CMS Yapılandırma Sihirbazı
+ Medya
+ Üyeler
+ Haber Bültenleri
+ Ayarlar
+ İstatistik
+ Çeviri
+ Kullanıcılar
+ Yardım
+ FormlarAnalytics
- go to
+ gitHelp topics forVideo chapters for
- The best Umbraco video tutorials
+ Kayadata
- Default template
- Dictionary Key
+ Varsayılan şablonu
+ Sözlük KeyTo import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen)New Tab TitleNode type
@@ -795,11 +858,11 @@ To manage your website, simply open the Umbraco back office and start adding con
Do not close this window during sorting]]>
- Failed
- Insufficient user permissions, could not complete the operation
- Cancelled
- Operation was cancelled by a 3rd party add-in
- Publishing was cancelled by a 3rd party add-in
+ Hata
+ Kullanıcı izniniz yeterli olmadığı için, işleminiz gerçekleştirilmedi.
+ İptal Edildi
+ İşleminiz 3.Parti yazılım tarafından iptal edildi.
+ Sayfa yayınlama 3.Parti yazılım tarafından iptal edildi.Property type already existsProperty type created DataType: %1%]]>
@@ -879,7 +942,7 @@ To manage your website, simply open the Umbraco back office and start adding con
Insert control
- Choose a layout for this section
+ Choose a layout for the page below and add your first element]]>Click to embed
@@ -943,10 +1006,12 @@ To manage your website, simply open the Umbraco back office and start adding con
Tasks assigned to you
- assigned to you. To see a detailed view including comments, click on "Details" or just the page name.
+
+ assigned to you. To see a detailed view including comments, click on "Details" or just the page name.
You can also download the page as XML directly by clicking the "Download Xml" link.
To close a translation task, please go to the Details view and click the "Close" button.
- ]]>
+ ]]>
+ close taskTranslation detailsDownload all translation tasks as XML
@@ -954,7 +1019,8 @@ To manage your website, simply open the Umbraco back office and start adding con
Download XML DTDFieldsInclude subpages
-
+
+ ]]>
+
[%0%] Translation task for %1%No translator users found. Please create a translator user before you start sending content to translationTasks created by you
- created by you. To see a detailed view including comments,
+
+ created by you. To see a detailed view including comments,
click on "Details" or just the page name. You can also download the page as XML directly by clicking the "Download Xml" link.
To close a translation task, please go to the Details view and click the "Close" button.
- ]]>
+ ]]>
+ The page '%0%' has been send to translationSend the page '%0%' to translationAssigned by
@@ -1027,47 +1096,47 @@ To manage your website, simply open the Umbraco back office and start adding con
Error checking for update. Please review trace-stack for further information
- Administrator
- Category field
- Change Your Password
- Change Your Password
- Confirm new password
- You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button
- Content Channel
- Description field
- Disable User
- Document Type
- Editor
- Excerpt field
- Language
- Login
- Start Node in Media Library
- Sections
- Disable Umbraco Access
- Password
- Reset password
- Your password has been changed!
- Please confirm the new password
- Enter your new password
- Your new password cannot be blank!
- Current password
- Invalid current password
- There was a difference between the new password and the confirmed password. Please try again!
- The confirmed password doesn't match the new password!
- Replace child node permissions
- You are currently modifying permissions for the pages:
- Select pages to modify their permissions
- Search all children
- Start Node in Content
- Name
- User permissions
- User type
- User types
- Writer
+ Yönetici
+ Kategori alanı
+ Şifreni değiştir
+ Şifreni değiştir
+ Yeni şifreyi onaylad
+ Aşağıdaki formu doldurarak CMS Geri Office'i erişmek için parolanızı değiştirmeniz ve ' Şifre Değiştir ' düğmesine tıklayabilirsiniz
+ İçerik Kanal
+ Açıklama alanı
+ Kullanıcıyı Devre Dışı Bırak
+ Belge Türü
+ editör
+ Alıntı alan
+ Dil
+ Kullanıcı adı
+ Medya Kütüphane düğüm başlatın
+ Bölümler
+ CMS Erişim devre dışı bırakma
+ Parola
+ Şifre sıfırlamak
+ Şifreniz değiştirildi!
+ Yeni parolayı onaylayın Lütfen
+ Yeni şifrenizi girin
+ Yeni şifre boş olamaz !
+ Mevcut Şifre
+ Geçersiz Geçerli şifre
+ Yeni şifre ile teyit şifre arasında bir fark yoktu. Lütfen tekrar deneyin!
+ Teyit şifre yeni bir şifre eşleşmiyor !
+ Alt düğümü izinlerini değiştirin
+ Şu anda sayfaları için izinleri değiştiriyorsunuz:
+ Onların izinlerini değiştirmek için sayfaları seçin
+ Tüm çocukların ara
+ içerikte Düğüm başlat
+ İsim
+ Kullanıcı izinleri
+ Kullanıcı türü
+ Kullanıcı tipleri
+ YazarTranslatorChange
- Your profile
- Your recent history
- Session expires in
+ Profiliniz
+ Son tarih
+ Oturum sona eriyor
From 89cd2f50d7beefb395c523d5fec40aca7a35b6c3 Mon Sep 17 00:00:00 2001
From: Alexander Bryukhov
Date: Sun, 24 Apr 2016 23:09:46 +0600
Subject: [PATCH 013/668] Update UI language ru.xml
New area and keys for unsaved changes dialog localization (PR #1234)
New keys for list view localization PR #1235
---
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 2fd54be962..1db34c7b7b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -66,6 +66,7 @@
Полужирный
+ Снять выборУменьшить отступВставить поле формыСгенерировать модели
@@ -91,9 +92,10 @@
Сохранить списокВыбратьВыбрать текущую папку
+ выбранныеПредварительный просмотрПредварительный просмотр запрещен, так как документу не сопоставлен шаблон
- Сделать что-нибудь еще
+ Другие действияВыбрать стильПоказать стилиВставить таблицу
@@ -185,7 +187,7 @@
КомпозицииВы не добавили ни одной вкладкиДобавить вкладку
- Добавитьеще вкладку
+ Добавить новую вкладкуУнаследован отДобавить свойствоОбязательная метка
@@ -245,7 +247,7 @@
"Типы документов".]]>"Типы медиа-материалов".]]>Выберите тип и заголовок
- Типу документа не сопоставлен шаблон
+ Тип документа без сопоставленного шаблонаОбзор сайта
@@ -853,6 +855,12 @@
Метка...Укажите описание...
+
+ Остаться
+ Отменить изменения
+ Есть несохраненные изменения
+ Вы уверены, что хотите уйти с этой страницы? - на ней имеются несохраненные изменения
+
Расширенный: Защита на основе ролей (групп) с использованием групп участников Umbraco.]]>
From 02ffaa9ee84ff125a031056874b052b9ad361dde Mon Sep 17 00:00:00 2001
From: Dennis Aaen
Date: Tue, 10 May 2016 20:33:03 +0200
Subject: [PATCH 014/668] Fixed issue: U4-8435 so the link is correct in
settingsdashboardintro dashboard
---
.../src/views/dashboard/settings/settingsdashboardintro.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
index fa9849022c..3a45776872 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
@@ -9,6 +9,6 @@
Download the Editors Manual for details on working with the Umbraco UI
Klik her for at nulstille din adgangskode eller kopier/indsæt denne URL i din browser:
%1%
]]>
+ Skrivebord
@@ -637,7 +644,7 @@
Intet element valgt, vælg et element i listen ovenfor før der klikkes 'fortsæt'Det nuværende element kan ikke lægges under denne pga. sin typeDet nuværende element kan ikke ligge under en af dens undersider
- Dette element må ikke findes på rodniveau
+ Dette element må ikke findes på rodniveauDenne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af under-dokumenterneRelater det kopierede element til originalen
From 695c69af7fbbbe49f51611ab90b136cc272567a2 Mon Sep 17 00:00:00 2001
From: bjarnef
Date: Sun, 22 May 2016 21:11:51 +0200
Subject: [PATCH 020/668] Updated indent
---
src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 33e9e4a4d2..d4b70939ae 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -644,9 +644,9 @@
Intet element valgt, vælg et element i listen ovenfor før der klikkes 'fortsæt'Det nuværende element kan ikke lægges under denne pga. sin typeDet nuværende element kan ikke ligge under en af dens undersider
- Dette element må ikke findes på rodniveau
+ Dette element må ikke findes på rodniveauDenne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af under-dokumenterne
- Relater det kopierede element til originalen
+ Relater det kopierede element til originalenRediger dine notificeringer for %0%
From b69580967e8b247893782541107305e28d071c63 Mon Sep 17 00:00:00 2001
From: Shannon
Date: Tue, 24 May 2016 16:12:54 +0200
Subject: [PATCH 021/668] Updates interceptor files with correct module usage -
creates new request interceptor to append a custom Time-Offset header
---
.../src/common/security/_module.js | 8 +-
.../src/common/security/requestinterceptor.js | 26 +++
.../src/common/security/retryqueue.js | 1 +
...{interceptor.js => securityinterceptor.js} | 188 +++++++++---------
4 files changed, 125 insertions(+), 98 deletions(-)
create mode 100644 src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js
rename src/Umbraco.Web.UI.Client/src/common/security/{interceptor.js => securityinterceptor.js} (96%)
diff --git a/src/Umbraco.Web.UI.Client/src/common/security/_module.js b/src/Umbraco.Web.UI.Client/src/common/security/_module.js
index 15a7663d9b..c8289c754e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/security/_module.js
+++ b/src/Umbraco.Web.UI.Client/src/common/security/_module.js
@@ -1,4 +1,4 @@
-// Based loosely around work by Witold Szczerba - https://github.com/witoldsz/angular-http-auth
-angular.module('umbraco.security', [
- 'umbraco.security.retryQueue',
- 'umbraco.security.interceptor']);
\ No newline at end of file
+//TODO: This is silly and unecessary to have a separate module for this
+angular.module('umbraco.security.retryQueue', []);
+angular.module('umbraco.security.interceptor', ['umbraco.security.retryQueue']);
+angular.module('umbraco.security', ['umbraco.security.retryQueue', 'umbraco.security.interceptor']);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js b/src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js
new file mode 100644
index 0000000000..8557ce1435
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js
@@ -0,0 +1,26 @@
+angular.module('umbraco.security.interceptor').factory("requestInterceptor",
+ ['$q', 'requestInterceptorFilter', function ($q, requestInterceptorFilter) {
+ var requestInterceptor = {
+ request: function (config) {
+
+ var filtered = _.find(requestInterceptorFilter(), function (val) {
+ return config.url.indexOf(val) > 0;
+ });
+ if (filtered) {
+ return config;
+ }
+
+ config.headers["Time-Offset"] = (new Date().getTimezoneOffset());
+ return config;
+ }
+ };
+
+ return requestInterceptor;
+ }
+ ])
+ // We have to add the interceptor to the queue as a string because the interceptor depends upon service instances that are not available in the config block.
+ .config([
+ '$httpProvider', function($httpProvider) {
+ $httpProvider.interceptors.push('requestInterceptor');
+ }
+ ]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/security/retryqueue.js b/src/Umbraco.Web.UI.Client/src/common/security/retryqueue.js
index e971719398..28d91dd610 100644
--- a/src/Umbraco.Web.UI.Client/src/common/security/retryqueue.js
+++ b/src/Umbraco.Web.UI.Client/src/common/security/retryqueue.js
@@ -1,3 +1,4 @@
+//TODO: This is silly and unecessary to have a separate module for this
angular.module('umbraco.security.retryQueue', [])
// This is a generic retry queue for security failures. Each item is expected to expose two functions: retry and cancel.
diff --git a/src/Umbraco.Web.UI.Client/src/common/security/interceptor.js b/src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/common/security/interceptor.js
rename to src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js
index 2b757707ba..b80754ef67 100644
--- a/src/Umbraco.Web.UI.Client/src/common/security/interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/security/securityinterceptor.js
@@ -1,95 +1,95 @@
-angular.module('umbraco.security.interceptor', ['umbraco.security.retryQueue'])
- // This http interceptor listens for authentication successes and failures
- .factory('securityInterceptor', ['$injector', 'securityRetryQueue', 'notificationsService', 'requestInterceptorFilter', function ($injector, queue, notifications, requestInterceptorFilter) {
- return function(promise) {
-
- return promise.then(
- function(originalResponse) {
- // Intercept successful requests
-
- //Here we'll check if our custom header is in the response which indicates how many seconds the user's session has before it
- //expires. Then we'll update the user in the user service accordingly.
- var headers = originalResponse.headers();
- if (headers["x-umb-user-seconds"]) {
- // We must use $injector to get the $http service to prevent circular dependency
- var userService = $injector.get('userService');
- userService.setUserTimeout(headers["x-umb-user-seconds"]);
- }
-
- return promise;
- }, function(originalResponse) {
- // Intercept failed requests
-
- //Here we'll check if we should ignore the error, this will be based on an original header set
- var headers = originalResponse.config ? originalResponse.config.headers : {};
- if (headers["x-umb-ignore-error"] === "ignore") {
- //exit/ignore
- return promise;
- }
- var filtered = _.find(requestInterceptorFilter(), function(val) {
- return originalResponse.config.url.indexOf(val) > 0;
- });
- if (filtered) {
- return promise;
- }
-
- //A 401 means that the user is not logged in
- if (originalResponse.status === 401) {
-
- // The request bounced because it was not authorized - add a new request to the retry queue
- promise = queue.pushRetryFn('unauthorized-server', function retryRequest() {
- // We must use $injector to get the $http service to prevent circular dependency
- return $injector.get('$http')(originalResponse.config);
- });
- }
- else if (originalResponse.status === 404) {
-
- //a 404 indicates that the request was not found - this could be due to a non existing url, or it could
- //be due to accessing a url with a parameter that doesn't exist, either way we should notifiy the user about it
-
- var errMsg = "The URL returned a 404 (not found): " + originalResponse.config.url.split('?')[0] + "";
- if (originalResponse.data && originalResponse.data.ExceptionMessage) {
- errMsg += " with error: " + originalResponse.data.ExceptionMessage + "";
- }
- if (originalResponse.config.data) {
- errMsg += " with data: " + angular.toJson(originalResponse.config.data) + " Contact your administrator for information.";
- }
-
- notifications.error(
- "Request error",
- errMsg);
-
- }
- else if (originalResponse.status === 403) {
- //if the status was a 403 it means the user didn't have permission to do what the request was trying to do.
- //How do we deal with this now, need to tell the user somehow that they don't have permission to do the thing that was
- //requested. We can either deal with this globally here, or we can deal with it globally for individual requests on the umbRequestHelper,
- // or completely custom for services calling resources.
-
- //http://issues.umbraco.org/issue/U4-2749
-
- //It was decided to just put these messages into the normal status messages.
-
- var msg = "Unauthorized access to URL: " + originalResponse.config.url.split('?')[0] + "";
- if (originalResponse.config.data) {
- msg += " with data: " + angular.toJson(originalResponse.config.data) + " Contact your administrator for information.";
- }
-
- notifications.error(
- "Authorization error",
- msg);
- }
-
- return promise;
- });
- };
- }])
-
- .value('requestInterceptorFilter', function() {
- return ["www.gravatar.com"];
- })
-
- // We have to add the interceptor to the queue as a string because the interceptor depends upon service instances that are not available in the config block.
- .config(['$httpProvider', function ($httpProvider) {
- $httpProvider.responseInterceptors.push('securityInterceptor');
+angular.module('umbraco.security.interceptor')
+ // This http interceptor listens for authentication successes and failures
+ .factory('securityInterceptor', ['$injector', 'securityRetryQueue', 'notificationsService', 'requestInterceptorFilter', function ($injector, queue, notifications, requestInterceptorFilter) {
+ return function(promise) {
+
+ return promise.then(
+ function(originalResponse) {
+ // Intercept successful requests
+
+ //Here we'll check if our custom header is in the response which indicates how many seconds the user's session has before it
+ //expires. Then we'll update the user in the user service accordingly.
+ var headers = originalResponse.headers();
+ if (headers["x-umb-user-seconds"]) {
+ // We must use $injector to get the $http service to prevent circular dependency
+ var userService = $injector.get('userService');
+ userService.setUserTimeout(headers["x-umb-user-seconds"]);
+ }
+
+ return promise;
+ }, function(originalResponse) {
+ // Intercept failed requests
+
+ //Here we'll check if we should ignore the error, this will be based on an original header set
+ var headers = originalResponse.config ? originalResponse.config.headers : {};
+ if (headers["x-umb-ignore-error"] === "ignore") {
+ //exit/ignore
+ return promise;
+ }
+ var filtered = _.find(requestInterceptorFilter(), function(val) {
+ return originalResponse.config.url.indexOf(val) > 0;
+ });
+ if (filtered) {
+ return promise;
+ }
+
+ //A 401 means that the user is not logged in
+ if (originalResponse.status === 401) {
+
+ // The request bounced because it was not authorized - add a new request to the retry queue
+ promise = queue.pushRetryFn('unauthorized-server', function retryRequest() {
+ // We must use $injector to get the $http service to prevent circular dependency
+ return $injector.get('$http')(originalResponse.config);
+ });
+ }
+ else if (originalResponse.status === 404) {
+
+ //a 404 indicates that the request was not found - this could be due to a non existing url, or it could
+ //be due to accessing a url with a parameter that doesn't exist, either way we should notifiy the user about it
+
+ var errMsg = "The URL returned a 404 (not found): " + originalResponse.config.url.split('?')[0] + "";
+ if (originalResponse.data && originalResponse.data.ExceptionMessage) {
+ errMsg += " with error: " + originalResponse.data.ExceptionMessage + "";
+ }
+ if (originalResponse.config.data) {
+ errMsg += " with data: " + angular.toJson(originalResponse.config.data) + " Contact your administrator for information.";
+ }
+
+ notifications.error(
+ "Request error",
+ errMsg);
+
+ }
+ else if (originalResponse.status === 403) {
+ //if the status was a 403 it means the user didn't have permission to do what the request was trying to do.
+ //How do we deal with this now, need to tell the user somehow that they don't have permission to do the thing that was
+ //requested. We can either deal with this globally here, or we can deal with it globally for individual requests on the umbRequestHelper,
+ // or completely custom for services calling resources.
+
+ //http://issues.umbraco.org/issue/U4-2749
+
+ //It was decided to just put these messages into the normal status messages.
+
+ var msg = "Unauthorized access to URL: " + originalResponse.config.url.split('?')[0] + "";
+ if (originalResponse.config.data) {
+ msg += " with data: " + angular.toJson(originalResponse.config.data) + " Contact your administrator for information.";
+ }
+
+ notifications.error(
+ "Authorization error",
+ msg);
+ }
+
+ return promise;
+ });
+ };
+ }])
+
+ .value('requestInterceptorFilter', function() {
+ return ["www.gravatar.com"];
+ })
+
+ // We have to add the interceptor to the queue as a string because the interceptor depends upon service instances that are not available in the config block.
+ .config(['$httpProvider', function ($httpProvider) {
+ $httpProvider.responseInterceptors.push('securityInterceptor');
}]);
\ No newline at end of file
From 1fc17e6f46db1c6f4114195e2558ceeb591e8dfa Mon Sep 17 00:00:00 2001
From: Jeroen Breuer
Date: Tue, 24 May 2016 17:04:39 +0200
Subject: [PATCH 022/668] Fix for U4-8510
---
.../ValueConverters/MultipleTextStringValueConverter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
index 39bcf85b12..a3b12a6688 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
//
//
- var sourceString = source.ToString();
+ var sourceString = source != null ? source.ToString() : null;
if (string.IsNullOrWhiteSpace(sourceString)) return Enumerable.Empty();
//SD: I have no idea why this logic is here, I'm pretty sure we've never saved the multiple txt string
From 2504586c267c114815f478a9fcf287f2eda65047 Mon Sep 17 00:00:00 2001
From: Shannon
Date: Wed, 25 May 2016 09:43:31 +0200
Subject: [PATCH 023/668] removes initial idea of performing conversion on the
server since this would be a breaking change, instead we can easily do this
on the client side - and this works much better. Have added pre-values to the
date/time picker to be able to enable offset times. This is enabled for the
publish-at pickers since those must be offset. When the datetime is offset,
it shows the server time in small text underneath the picker. Have added js
unit tests for the date conversions. Have updated the datepicker controller
to set the model date in a single place/method so it's consistent.
---
.../src/common/security/requestinterceptor.js | 26 -------
.../src/common/services/util.service.js | 38 ++++++++++
.../datepicker/datepicker.controller.js | 76 ++++++++++++-------
.../datepicker/datepicker.html | 3 +
.../test/config/karma.conf.js | 1 +
.../unit/common/services/date-helper.spec.js | 53 +++++++++++++
.../Editors/BackOfficeController.cs | 4 +
.../Editors/ContentControllerBase.cs | 5 +-
.../Models/Mapping/ContentModelMapper.cs | 12 ++-
.../PropertyEditors/DateTimePreValueEditor.cs | 10 +++
.../PropertyEditors/DateTimePropertyEditor.cs | 13 +++-
src/Umbraco.Web/Umbraco.Web.csproj | 1 +
.../WebApi/Binders/ContentItemBaseBinder.cs | 12 ++-
13 files changed, 190 insertions(+), 64 deletions(-)
delete mode 100644 src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js
create mode 100644 src/Umbraco.Web.UI.Client/test/unit/common/services/date-helper.spec.js
create mode 100644 src/Umbraco.Web/PropertyEditors/DateTimePreValueEditor.cs
diff --git a/src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js b/src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js
deleted file mode 100644
index 8557ce1435..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/security/requestinterceptor.js
+++ /dev/null
@@ -1,26 +0,0 @@
-angular.module('umbraco.security.interceptor').factory("requestInterceptor",
- ['$q', 'requestInterceptorFilter', function ($q, requestInterceptorFilter) {
- var requestInterceptor = {
- request: function (config) {
-
- var filtered = _.find(requestInterceptorFilter(), function (val) {
- return config.url.indexOf(val) > 0;
- });
- if (filtered) {
- return config;
- }
-
- config.headers["Time-Offset"] = (new Date().getTimezoneOffset());
- return config;
- }
- };
-
- return requestInterceptor;
- }
- ])
- // We have to add the interceptor to the queue as a string because the interceptor depends upon service instances that are not available in the config block.
- .config([
- '$httpProvider', function($httpProvider) {
- $httpProvider.interceptors.push('requestInterceptor');
- }
- ]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
index 9fbf2947af..2f06d4c393 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
@@ -1,5 +1,43 @@
/*Contains multiple services for various helper tasks */
+function dateHelper() {
+
+ return {
+
+ convertToServerStringTime: function(momentLocal, serverOffsetMinutes, format) {
+
+ //get the formatted offset time in HH:mm (server time offset is in minutes)
+ var formattedOffset = (serverOffsetMinutes > 0 ? "+" : "-") +
+ moment()
+ .startOf('day')
+ .minutes(Math.abs(serverOffsetMinutes))
+ .format('HH:mm');
+
+ var server = moment.utc(momentLocal).zone(formattedOffset);
+ return server.format(format ? format : "YYYY-MM-DD HH:mm:ss");
+ },
+
+ convertToLocalMomentTime: function (strVal, serverOffsetMinutes) {
+
+ //get the formatted offset time in HH:mm (server time offset is in minutes)
+ var formattedOffset = (serverOffsetMinutes > 0 ? "+" : "-") +
+ moment()
+ .startOf('day')
+ .minutes(Math.abs(serverOffsetMinutes))
+ .format('HH:mm');
+
+ //convert to the iso string format
+ var isoFormat = moment(strVal).format("YYYY-MM-DDTHH:mm:ss") + formattedOffset;
+
+ //create a moment with the iso format which will include the offset with the correct time
+ // then convert it to local time
+ return moment.parseZone(isoFormat).local();
+ }
+
+ };
+}
+angular.module('umbraco.services').factory('dateHelper', dateHelper);
+
function packageHelper(assetsService, treeService, eventsService, $templateCache) {
return {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index 693bd49ec6..95d0a1bdf6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -1,4 +1,4 @@
-function dateTimePickerController($scope, notificationsService, assetsService, angularHelper, userService, $element) {
+function dateTimePickerController($scope, notificationsService, assetsService, angularHelper, userService, $element, dateHelper) {
//setup the default config
var config = {
@@ -22,6 +22,8 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
$scope.model.config.format = $scope.model.config.pickTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
}
+
+
$scope.hasDatetimePickerValue = $scope.model.value ? true : false;
$scope.datetimePickerValue = null;
@@ -43,20 +45,46 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
if (e.date && e.date.isValid()) {
$scope.datePickerForm.datepicker.$setValidity("pickerError", true);
$scope.hasDatetimePickerValue = true;
- $scope.datetimePickerValue = e.date.format($scope.model.config.format);
- $scope.model.value = $scope.datetimePickerValue;
+ $scope.datetimePickerValue = e.date.format($scope.model.config.format);
}
else {
$scope.hasDatetimePickerValue = false;
$scope.datetimePickerValue = null;
}
-
+
+ setModelValue();
+
if (!$scope.model.config.pickTime) {
$element.find("div:first").datetimepicker("hide", 0);
}
});
}
+ //sets the scope model value accordingly - this is the value to be sent up to the server and depends on
+ // if the picker is configured to offset time. We always format the date/time in a specific format for sending
+ // to the server, this is different from the format used to display the date/time.
+ function setModelValue() {
+ if ($scope.hasDatetimePickerValue) {
+ var elementData = $element.find("div:first").data().DateTimePicker;
+ if ($scope.model.config.pickTime) {
+ //check if we are supposed to offset the time
+ if ($scope.model.value && $scope.model.config.offsetTime === "1" && Umbraco.Sys.ServerVariables.application.serverTimeOffset) {
+ $scope.model.value = dateHelper.convertToServerStringTime(elementData.getDate(), Umbraco.Sys.ServerVariables.application.serverTimeOffset);
+ $scope.serverTime = dateHelper.convertToServerStringTime(elementData.getDate(), Umbraco.Sys.ServerVariables.application.serverTimeOffset, "YYYY-MM-DD HH:mm:ss Z");
+ }
+ else {
+ $scope.model.value = elementData.getDate().format("YYYY-MM-DD HH:mm:ss");
+ }
+ }
+ else {
+ $scope.model.value = elementData.getDate().format("YYYY-MM-DD");
+ }
+ }
+ else {
+ $scope.model.value = null;
+ }
+ }
+
var picker = null;
$scope.clearDate = function() {
@@ -66,6 +94,8 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
$scope.datePickerForm.datepicker.$setValidity("pickerError", true);
}
+ $scope.serverTime = null;
+
//get the current user to see if we can localize this picker
userService.getCurrentUser().then(function (user) {
@@ -97,8 +127,17 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
});
if ($scope.hasDatetimePickerValue) {
- //assign value to plugin/picker
- var dateVal = $scope.model.value ? moment($scope.model.value, "YYYY-MM-DD HH:mm:ss") : moment();
+ var dateVal;
+ //check if we are supposed to offset the time
+ if ($scope.model.value && $scope.model.config.offsetTime === "1" && Umbraco.Sys.ServerVariables.application.serverTimeOffset) {
+ //get the local time offset from the server
+ dateVal = dateHelper.convertToLocalMomentTime($scope.model.value, Umbraco.Sys.ServerVariables.application.serverTimeOffset);
+ $scope.serverTime = dateHelper.convertToServerStringTime(dateVal, Umbraco.Sys.ServerVariables.application.serverTimeOffset, "YYYY-MM-DD HH:mm:ss Z");
+ }
+ else {
+ //create a normal moment , no offset required
+ var dateVal = $scope.model.value ? moment($scope.model.value, "YYYY-MM-DD HH:mm:ss") : moment();
+ }
element.datetimepicker("setValue", dateVal);
$scope.datetimePickerValue = dateVal.format($scope.model.config.format);
@@ -117,18 +156,7 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
- if ($scope.hasDatetimePickerValue) {
- var elementData = $element.find("div:first").data().DateTimePicker;
- if ($scope.model.config.pickTime) {
- $scope.model.value = elementData.getDate().format("YYYY-MM-DD HH:mm:ss");
- }
- else {
- $scope.model.value = elementData.getDate().format("YYYY-MM-DD");
- }
- }
- else {
- $scope.model.value = null;
- }
+ setModelValue();
});
//unbind doc click event!
$scope.$on('$destroy', function () {
@@ -142,17 +170,7 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
});
var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
- if ($scope.hasDatetimePickerValue) {
- if ($scope.model.config.pickTime) {
- $scope.model.value = $element.find("div:first").data().DateTimePicker.getDate().format("YYYY-MM-DD HH:mm:ss");
- }
- else {
- $scope.model.value = $element.find("div:first").data().DateTimePicker.getDate().format("YYYY-MM-DD");
- }
- }
- else {
- $scope.model.value = null;
- }
+ setModelValue();
});
//unbind doc click event!
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index e6d49e5c6c..c9b83cc8ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -18,6 +18,9 @@
{{datePickerForm.datepicker.errorMsg}}Invalid date
+
From 628ce5ea1fb9e7405a90ea593983a68951397c3f Mon Sep 17 00:00:00 2001
From: Shannon
Date: Thu, 26 May 2016 15:30:40 +0200
Subject: [PATCH 032/668] Backports some changes from v8 so that we can perform
a nice strongly typed query with paging - this is then used for the content
indexer to index content via the db for published content instead of the xml
cache system. This was already done in v8 but have no backported the logic
and fixed up the unit tests. When merging with v8 we will most likely just
keep all v8 stuff and discard these changes, but we'll need to compare just
in case. All tests pass and re-indexing is working as expected. Also updated
the paging count from 1000 to 5000 for reindexing.
---
.../Repositories/ContentRepository.cs | 20 +++---
.../Interfaces/IContentRepository.cs | 4 +-
.../Repositories/VersionableRepositoryBase.cs | 22 ++++++-
src/Umbraco.Core/Services/ContentService.cs | 46 +++++++++++++-
src/Umbraco.Core/Services/IContentService.cs | 16 +++++
.../Repositories/ContentRepositoryTest.cs | 8 ++-
.../LegacyExamineBackedMediaTests.cs | 20 +++---
.../UmbracoExamine/EventsTest.cs | 28 +++++----
.../UmbracoExamine/ExamineBaseTest.cs | 28 +++++----
.../UmbracoExamine/IndexInitializer.cs | 45 +++++++++++++-
src/Umbraco.Tests/UmbracoExamine/IndexTest.cs | 31 +++++-----
src/UmbracoExamine/BaseUmbracoIndexer.cs | 30 +++------
src/UmbracoExamine/UmbracoContentIndexer.cs | 62 ++++++++++---------
13 files changed, 239 insertions(+), 121 deletions(-)
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index 5f96cad114..1a1a7b00bf 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -771,22 +771,22 @@ namespace Umbraco.Core.Persistence.Repositories
/// Search text filter
/// An Enumerable list of objects
public IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords,
- string orderBy, Direction orderDirection, bool orderBySystemField, string filter = "")
+ string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null)
{
//NOTE: This uses the GetBaseQuery method but that does not take into account the required 'newest' field which is
// what we always require for a paged result, so we'll ensure it's included in the filter
-
- var args = new List